chore: fixes

Author: kirrg001

packages/collector/test/tracing/opentelemetry/test.js

@@ -1018,7 +1018,7 @@ mochaSuiteFn('opentelemetry tests', function () {
 function checkTelemetryResourceAttrs(span) {
   expect(span.data.resource['telemetry.sdk.language']).to.eql('nodejs');
   expect(span.data.resource['telemetry.sdk.name']).to.eql('opentelemetry');
-  expect(span.data.resource['telemetry.sdk.version']).to.match(/1\.\d+\.\d/);
+  expect(span.data.resource['telemetry.sdk.version']).to.match(/2\.\d+\.\d/);
 }
 
 function verifyHttpExit(spans, parentSpan) {

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

@@ -40,11 +40,19 @@ module.exports.init = (_config, cls) => {
   });
 
   const transformToInstanaSpan = otelSpan => {
-    if (!otelSpan || !otelSpan.instrumentationLibrary) {
+    // TODO: remove instrumentationLibrary in next major release
+    //       instrumentationScope was introduced in OpenTelemetry v2
+    if (!otelSpan || (!otelSpan.instrumentationScope && !otelSpan.instrumentationLibrary)) {
+      return;
+    }
+
+    const targetInstrumentionName =
+      otelSpan.instrumentationScope?.name || otelSpan.instrumentationLibrary?.name || null;
+
+    if (!targetInstrumentionName) {
       return;
     }
 
-    const targetInstrumentionName = otelSpan.instrumentationLibrary.name;
     let kind = constants.EXIT;
 
     if (instrumentations[targetInstrumentionName] && instrumentations[targetInstrumentionName].module) {
@@ -73,11 +81,22 @@ module.exports.init = (_config, cls) => {
 
     try {
       cls.ns.runAndReturn(() => {
+        // 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'];
+
         const instanaSpan = cls.startSpan({
           spanName: 'otel',
           kind: kind
         });
+
+        // opentelemetry/instrumentation-fs -> we only want the name behind instrumentation-
+        const operation = targetInstrumentionName.split('-').pop();
+
         instanaSpan.data = {
+          // 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
         };