OpenTelemetry@SAP instrumentation

gregorwolf · Feb 12, 2024 · b636d98 · b636d98
1 parent 805594d
commit b636d98
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 44 deletions.
diff --git a/HTML5Module/package-lock.json b/HTML5Module/package-lock.json
diff --git a/HTML5Module/package.json b/HTML5Module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html5userapi-ui",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "description": "",
   "engines": {
     "node": "^20"

diff --git a/HTML5Module/webapp/index.html b/HTML5Module/webapp/index.html
@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>HTML5 User API for Cloud Foundry</title>
     <meta name="sap.allowlistService" content="/allowlist/service" />
+    <meta name="sap-ui-fesr" content="/fesr" />
     <script
       id="sap-ui-bootstrap"
       src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"

diff --git a/approuter/xs-app.json b/approuter/xs-app.json
@@ -14,6 +14,13 @@
       "target": "$1",
       "service": "sap-approuter-userapi"
     },
+    {
+      "source": "^/fesr$",
+      "target": "/fesr",
+      "destination": "html5userapi-srv",
+      "csrfProtection": false,
+      "authenticationType": "xsuaa"
+    },
     {
       "source": "^/api/(.*)$",
       "target": "/api/$1",

diff --git a/mta.yaml b/mta.yaml
@@ -1,16 +1,13 @@
 ID: html5userapi
-_schema-version: '2.1'
+_schema-version: "2.1"
 version: 0.2.2
 parameters:
   enable-parallel-deployments: true
 
 modules:
-
   - name: html5userapi-srv
     type: nodejs
     path: srv
-    build-parameters:
-      ignore: ["node_modules/"]
     parameters:
       memory: 256M
       disk-quota: 1024M
@@ -112,17 +109,17 @@ modules:
       - name: srv_api
         group: destinations
         properties:
-            forwardAuthToken: true
-            strictSSL: false
-            name: html5userapi-srv
-            url: ~{url}
+          forwardAuthToken: true
+          strictSSL: false
+          name: html5userapi-srv
+          url: ~{url}
       - name: srv_java_api
         group: destinations
         properties:
-            forwardAuthToken: true
-            strictSSL: false
-            name: html5userapi-srv-java
-            url: ~{url}
+          forwardAuthToken: true
+          strictSSL: false
+          name: html5userapi-srv-java
+          url: ~{url}
   - name: html5userapi-deployer
     type: com.sap.application.content
     path: .
@@ -150,40 +147,40 @@ modules:
   - name: html5userapi-destination-content
     type: com.sap.application.content
     requires:
-    - name: html5userapi-uaa
-      parameters:
-        service-key:
-          name: html5userapi-uaa-key
-    - name: html5userapi-repo-host
-      parameters:
-        service-key:
-          name: html5userapi-repo-host-key
-    - name: html5userapi-uaa-apiaccess
-      parameters:
-        service-key:
-          name: html5userapi-uaa-apiaccess-key
-    - name: html5userapi-destination-service
-      parameters:
-        content-target: true
-    - name: html5userapi-connectivity-service
+      - name: html5userapi-uaa
+        parameters:
+          service-key:
+            name: html5userapi-uaa-key
+      - name: html5userapi-repo-host
+        parameters:
+          service-key:
+            name: html5userapi-repo-host-key
+      - name: html5userapi-uaa-apiaccess
+        parameters:
+          service-key:
+            name: html5userapi-uaa-apiaccess-key
+      - name: html5userapi-destination-service
+        parameters:
+          content-target: true
+      - name: html5userapi-connectivity-service
     parameters:
       content:
         instance:
           existing_destinations_policy: update
           destinations:
-          - Name: html5userapi-repo-host
-            ServiceInstanceName: html5userapi-repo-host
-            ServiceKeyName: html5userapi-repo-host-key
-            sap.cloud.service: cloud.service
-          - Authentication: OAuth2UserTokenExchange
-            Name: html5userapi-uaa
-            ServiceInstanceName: html5userapi-uaa
-            ServiceKeyName: html5userapi-uaa-key
-            sap.cloud.service: cloud.service
-          - Authentication: OAuth2ClientCredentials
-            Name: html5userapi-uaa-apiaccess
-            ServiceInstanceName: html5userapi-uaa-apiaccess
-            ServiceKeyName: html5userapi-uaa-apiaccess-key
+            - Name: html5userapi-repo-host
+              ServiceInstanceName: html5userapi-repo-host
+              ServiceKeyName: html5userapi-repo-host-key
+              sap.cloud.service: cloud.service
+            - Authentication: OAuth2UserTokenExchange
+              Name: html5userapi-uaa
+              ServiceInstanceName: html5userapi-uaa
+              ServiceKeyName: html5userapi-uaa-key
+              sap.cloud.service: cloud.service
+            - Authentication: OAuth2ClientCredentials
+              Name: html5userapi-uaa-apiaccess
+              ServiceInstanceName: html5userapi-uaa-apiaccess
+              ServiceKeyName: html5userapi-uaa-apiaccess-key
     build-parameters:
       no-source: true
 

diff --git a/srv/express.js b/srv/express.js
@@ -1,5 +1,7 @@
 // load modules
 const express = require("express");
+const fesr = require("@sap/fesr-to-otel-js");
+
 // For authentication test
 const passport = require("passport");
 const xsenv = require("@sap/xsenv");
@@ -29,6 +31,7 @@ function getJWT(req) {
 (async () => {
   // create new app
   const app = express();
+  fesr.registerFesrEndpoint(app);
   // Authentication using JWT
   await app.use(passport.initialize());
   await app.use(passport.authenticate("JWT", { session: false }));

diff --git a/srv/package-lock.json b/srv/package-lock.json
diff --git a/srv/package.json b/srv/package.json
@@ -4,6 +4,7 @@
     "node": "^20"
   },
   "dependencies": {
+    "@sap/fesr-to-otel-js": "https://73555000100200018064.npmsrv.cdn.repositories.cloud.sap/@sap/fesr-to-otel-js/-/fesr-to-otel-js-1.5.3.tgz",
     "@sap-cloud-sdk/http-client": "^3.10.0",
     "@sap/xsenv": "^4.2.0",
     "@sap/xssec": "^3.6.1",