chore: fixes

Author: kirrg001

packages/core/src/tracing/opentelemetry-instrumentations/socket.io.js

@@ -36,7 +36,7 @@ exports.getKind = otelSpan => {
   return kind;
 };
 
-exports.transform = otelSpan => {
+exports.getOtelAttributes = otelSpan => {
   // NOTE: this adaption is needed to show the event name instead of a '/' for the endpoint name in the UI
   if (otelSpan.attributes && 'messaging.socket.io.event_name' in otelSpan.attributes) {
     if (isOnEvent(otelSpan)) {
@@ -46,5 +46,5 @@ exports.transform = otelSpan => {
     }
   }
 
-  return otelSpan;
+  return otelSpan.attributes;
 };

packages/core/src/tracing/opentelemetry-instrumentations/wrap.js

@@ -41,46 +41,57 @@ module.exports.init = (_config, cls) => {
     value.module = instrumentation;
   });
 
-  const transformToInstanaSpan = (otelSpan, kind, instrumentationModule, instrumentationName) => {
-    let traceId;
-    let parentSpanId;
+  const extractDataFromOtelSpan = (otelSpan, instrumentationModule) => {
+    const obj = {
+      kind: constants.EXIT
+    };
+
+    if (instrumentationModule.getKind) {
+      obj.kind = instrumentationModule.getKind(otelSpan);
+    }
 
     if (instrumentationModule.getTraceId) {
-      traceId = instrumentationModule.getTraceId(kind, otelSpan);
+      obj.traceId = instrumentationModule.getTraceId(obj.kind, otelSpan);
     }
 
     if (instrumentationModule.getParentId) {
-      parentSpanId = instrumentationModule.getParentId(kind, otelSpan);
+      obj.parentSpanId = instrumentationModule.getParentId(obj.kind, otelSpan);
     }
 
-    if (instrumentationModule.transform) {
-      otelSpan = instrumentationModule.transform(otelSpan);
-    }
+    return obj;
+  };
 
+  const transformToInstanaSpan = (otelSpan, data, instrumentationModule, instrumentationName) => {
     if (cls.tracingSuppressed()) {
       return;
     }
 
-    if (kind === constants.EXIT && cls.skipExitTracing()) {
+    if (data.kind === constants.EXIT && cls.skipExitTracing()) {
       return;
     }
 
     try {
       const createInstanaSpan = onEndCallback => {
+        const otelAttrs = instrumentationModule.getOtelAttributes
+          ? instrumentationModule.getOtelAttributes(otelSpan)
+          : otelSpan.attributes;
+
+        const otelResourceAttrs = otelSpan.resource.attributes;
+
         // NOTE: 'service.name' is "unknown" - probably because we don't setup otel completely.
         //       The removal fixes incorrect infrastructure correlation.
-        delete otelSpan.resource.attributes['service.name'];
+        delete otelResourceAttrs['service.name'];
 
-        const spanAttributes = traceId
+        const spanAttributes = data.traceId
           ? {
               spanName: 'otel',
-              kind: kind,
-              traceId: traceId,
-              parentSpanId: parentSpanId
+              kind: data.kind,
+              traceId: data.traceId,
+              parentSpanId: data.parentSpanId
             }
           : {
               spanName: 'otel',
-              kind: kind
+              kind: data.kind
             };
 
         const instanaSpan = cls.startSpan(spanAttributes);
@@ -92,8 +103,8 @@ module.exports.init = (_config, cls) => {
           // span.data.operation is mapped to endpoint for otel span plugin in BE.
           // We need to set the endpoint otherwise the ui will show unspecified
           operation,
-          tags: Object.assign({ name: otelSpan.name }, otelSpan.attributes),
-          resource: otelSpan.resource.attributes
+          tags: Object.assign({ name: otelSpan.name }, otelAttrs),
+          resource: otelResourceAttrs
         };
 
         otelSpan._instanaSpan = instanaSpan;
@@ -111,7 +122,7 @@ module.exports.init = (_config, cls) => {
       // For ENTRY spans, we need to keep the CLS context active for the duration of the span
       // so that async operations (like HTTP requests) can find the parent span.
       // For EXIT spans, we can use runAndReturn since they complete quickly.
-      if (kind === constants.ENTRY) {
+      if (data.kind === constants.ENTRY) {
         const clsContext = cls.ns.createContext();
         cls.ns.enter(clsContext);
 
@@ -163,21 +174,18 @@ module.exports.init = (_config, cls) => {
     const instrumentationName = otelSpan.instrumentationScope?.name || otelSpan.instrumentationLibrary?.name;
     const instrumentationModule = instrumentations[instrumentationName]?.module;
 
+    // CASE: we don't support this instrumentation
     if (!instrumentationModule) {
       return orig.apply(this, arguments);
     }
 
-    let kind = constants.EXIT;
-
-    if (instrumentationModule.getKind) {
-      kind = instrumentationModule.getKind(otelSpan);
-    }
+    const data = extractDataFromOtelSpan(otelSpan, instrumentationModule);
 
-    transformToInstanaSpan(otelSpan, kind, instrumentationModule, instrumentationName);
+    transformToInstanaSpan(otelSpan, data, instrumentationModule, instrumentationName);
     const originalCtx = orig.apply(this, arguments);
 
     if (otelSpan && otelSpan._instanaSpan) {
-      if (instrumentationModule.modifyContext && kind === constants.EXIT) {
+      if (instrumentationModule.modifyContext && data.kind === constants.EXIT) {
         return instrumentationModule.modifyContext(api, otelSpan, otelSpan._instanaSpan, originalCtx);
       }
     }