Merge pull request #525 from grafana/hedss-update-app

Updates the Mythical source.

Author: hedss

grafana/definitions/k6.json

@@ -4,9 +4,9 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@grafana/faro-web-sdk": "^1.19.0",
-    "@grafana/faro-web-tracing": "^1.19.0",
-    "axios": "^1.13.2",
+    "@grafana/faro-web-sdk": "^2.9.0",
+    "@grafana/faro-web-tracing": "^2.9.0",
+    "axios": "^1.18.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },

grafana/definitions/mlt-erroring-endpoints.json

@@ -11,17 +11,17 @@
   "license": "ISC",
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.69.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.79.0",
     "@opentelemetry/core": "^2.2.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.211.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.221.0",
     "@opentelemetry/instrumentation": "^0.211.0",
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/sdk-trace-node": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.38.0",
     "@pyroscope/nodejs": "^0.4.8",
     "amqplib": "^0.10.9",
-    "axios": "^1.13.2",
+    "axios": "^1.18.0",
     "express": "^5.2.1",
     "prom-client": "github:voltbit/prom-client#add-openmetrics-support"
   }

grafana/definitions/mlt.json

@@ -60,26 +60,29 @@ const makeRequest = async (tracingObj, sendMessage, logEntry) => {
         return date.toISOString();
     }
 
+    let serverHostPort = "mythical-server:4000"
+    // check env var for override
+    if (process.env.MYTHICAL_SERVER_HOST_PORT) {
+        serverHostPort = process.env.MYTHICAL_SERVER_HOST_PORT
+    }
+
     // Create a new span, link to previous request to show how linking between traces works.
     const requestSpan = tracer.startSpan('requester', {
         kind: api.SpanKind.CLIENT,
         links: (previousReqSpanContext) ? [{ context: previousReqSpanContext }] : undefined,
     });
+
     requestSpan.setAttribute(spanTag, endpoint);
-    requestSpan.setAttribute(`http.target`, '/' + endpoint);
-    requestSpan.setAttribute(`http.method`, type);
+    requestSpan.setAttribute(`url.full`, `http://${serverHostPort}/${endpoint}`);
+    requestSpan.setAttribute(`url.path`, '/' + endpoint);
+    requestSpan.setAttribute(`http.request.method`, type);
     requestSpan.setAttribute('service.version', (Math.floor(Math.random() * 100)) < 50 ? '1.9.2' : '2.0.0');
     previousReqSpanContext = requestSpan.spanContext();
     const { traceId } = requestSpan.spanContext();
 
     // Increment the danger level on the gauge
     dangerGauge.inc(dangerLevel);
 
-    let serverHostPort = "mythical-server:4000"
-    // check env var for override
-    if (process.env.MYTHICAL_SERVER_HOST_PORT) {
-        serverHostPort = process.env.MYTHICAL_SERVER_HOST_PORT
-    }
 
     // Create a new context for this request
     api.context.with(api.trace.setSpan(api.context.active(), requestSpan), async () => {
@@ -98,7 +101,7 @@ const makeRequest = async (tracingObj, sendMessage, logEntry) => {
                     job: `${servicePrefix}-requester`,
                     endpointLabel: spanTag,
                     endpoint,
-                    message: `traceID=${traceId} http.method=GET endpoint=${endpoint} loggedtime=${timeshift()} status=SUCCESS`,
+                    message: `traceID=${traceId} http.request.method=GET endpoint=${endpoint} loggedtime=${timeshift()} status=SUCCESS`,
                 });
                 names = result.data;
 
@@ -117,7 +120,7 @@ const makeRequest = async (tracingObj, sendMessage, logEntry) => {
                             job: `${servicePrefix}-requester`,
                             endpointLabel: spanTag,
                             endpoint,
-                            message: `traceID=${traceId} http.method=DELETE endpoint=${endpoint} loggedtime=${timeshift()} status=SUCCESS`,
+                            message: `traceID=${traceId} http.request.method=DELETE endpoint=${endpoint} loggedtime=${timeshift()} status=SUCCESS`,
                         });
                     }
                 }
@@ -128,7 +131,7 @@ const makeRequest = async (tracingObj, sendMessage, logEntry) => {
                     job: `${servicePrefix}-requester`,
                     endpointLabel: spanTag,
                     endpoint,
-                    message: `traceID=${traceId} http.method=DELETE endpoint=${endpoint} ` +
+                    message: `traceID=${traceId} http.request.method=DELETE endpoint=${endpoint} ` +
                         `name=${(names) ? names[0].name : 'unknown'} status=FAILURE loggedtime=${timeshift()}`,
                 });
                 error = true;
@@ -146,7 +149,7 @@ const makeRequest = async (tracingObj, sendMessage, logEntry) => {
                     job: `${servicePrefix}-requester`,
                     endpointLabel: spanTag,
                     endpoint,
-                    message: `traceID=${traceId} http.method=POST endpoint=${endpoint} loggedtime=${timeshift()} status=SUCCESS`,
+                    message: `traceID=${traceId} http.request.method=POST endpoint=${endpoint} loggedtime=${timeshift()} status=SUCCESS`,
                 });
             } catch (err) {
                 // The error condition is a little different here to using request. Axios throws a more generic error
@@ -158,20 +161,19 @@ const makeRequest = async (tracingObj, sendMessage, logEntry) => {
                     job: `${servicePrefix}-requester`,
                     endpointLabel: spanTag,
                     endpoint,
-                    message: `traceID=${traceId} http.method=POST endpoint=${endpoint} name=${randomName}` +
+                    message: `traceID=${traceId} http.request.method=POST endpoint=${endpoint} name=${randomName}` +
                         ` loggedtime=${timeshift()} status=FAILURE`,
                 });
                 error = true;
             }
-
         }
         logEntry({
             level: 'info',
             namespace: process.env.NAMESPACE,
             job: `${servicePrefix}-requester`,
             endpointLabel: spanTag,
             endpoint,
-            message: `traceID=${traceId} http.method=${type} endpoint=${endpoint} duration=${Date.now() - start}ms loggedtime=${timeshift()}`,
+            message: `traceID=${traceId} http.request.method=${type} endpoint=${endpoint} duration=${Date.now() - start}ms loggedtime=${timeshift()}`,
         });
 
         // Set the status code as OK and end the span