fix: bumped @opentelemetry/sdk-trace-base to v2 (#2196)

refs https://jsw.ibm.com/browse/INSTA-65941

Author: kirrg001

package-lock.json

@@ -915,7 +915,10 @@ mochaSuiteFn('opentelemetry tests', function () {
                   dataProperty: 'tags',
                   extraTests: span => {
                     expect(span.data.tags.name).to.eql('fs readFileSync');
-                    checkTelemetryResourceAttrs(span);
+
+                    // This test uses a global OpenTelemetry SDK instance, which still uses sdk version v1.
+                    // Its nice to keep it like that to proof that v1 and v2 work fine with our integration.
+                    checkTelemetryResourceAttrs(span, /1\.\d+\.\d/);
                   }
                 });
 
@@ -928,7 +931,7 @@ mochaSuiteFn('opentelemetry tests', function () {
                   dataProperty: 'tags',
                   extraTests: span => {
                     expect(span.data.tags.name).to.eql('fs statSync');
-                    checkTelemetryResourceAttrs(span);
+                    checkTelemetryResourceAttrs(span, /1\.\d+\.\d/);
                   }
                 });
               })
@@ -995,8 +998,8 @@ mochaSuiteFn('opentelemetry tests', function () {
             expect(response.otelspan.name).to.eql('explicit-otel-operation');
             expect(response.otelspan._spanContext).to.have.property('traceId');
             expect(response.otelspan._spanContext).to.have.property('spanId');
-            expect(response.otelspan.instrumentationLibrary).to.be.an('object');
-            expect(response.otelspan.instrumentationLibrary.name).to.eql('otel-sdk-app-tracer');
+            expect(response.otelspan.instrumentationScope).to.be.an('object');
+            expect(response.otelspan.instrumentationScope.name).to.eql('otel-sdk-app-tracer');
           })
           .then(() => delay(DELAY_TIMEOUT_IN_MS))
           .then(() =>
@@ -1021,11 +1024,11 @@ mochaSuiteFn('opentelemetry tests', function () {
   });
 });
 
-function checkTelemetryResourceAttrs(span) {
+function checkTelemetryResourceAttrs(span, otelSdkVersion = /2\.\d+\.\d/) {
   expect(span.data.resource['service.name']).to.not.exist;
   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(otelSdkVersion);
 }
 
 function verifyHttpExit(spans, parentSpan) {

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

@@ -64,7 +64,7 @@
     "@opentelemetry/instrumentation-restify": "0.53.0",
     "@opentelemetry/instrumentation-socket.io": "0.54.0",
     "@opentelemetry/instrumentation-tedious": "0.27.0",
-    "@opentelemetry/sdk-trace-base": "1.25.0",
+    "@opentelemetry/sdk-trace-base": "2.2.0",
     "cls-bluebird": "^2.1.0",
     "import-in-the-middle": "2.0.0",
     "lru-cache": "^10.1.0",

packages/core/package.json

@@ -18,14 +18,6 @@ module.exports.init = () => {
     instrumentation.enable();
   }
 };
-exports.transform = otelSpan => {
-  // NOTE: This assignment is necessary to display the database name in the UI.
-  // In the backend, for OpenTelemetry, the service name is based on the OpenTelemetry span attribute service.name.
-  if (otelSpan.attributes && 'db.name' in otelSpan.attributes) {
-    otelSpan.resource._attributes['service.name'] = otelSpan.attributes['db.name'];
-  }
-  return otelSpan;
-};
 
 module.exports.getKind = () => {
   const kind = constants.EXIT;

packages/core/src/tracing/opentelemetry-instrumentations/tedious.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) {