instr-aws-sdk

Author: trentm

package-lock.json

@@ -44,8 +44,8 @@
     "@opentelemetry/api": "^1.3.0"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.8.0",
-    "@opentelemetry/instrumentation": "^0.57.2",
+    "@opentelemetry/core": "^2.0.0-dev.0",
+    "@opentelemetry/instrumentation": "^0.200.0-dev.0",
     "@opentelemetry/propagation-utils": "^0.30.16",
     "@opentelemetry/semantic-conventions": "^1.27.0"
   },
@@ -59,7 +59,7 @@
     "@aws-sdk/types": "3.78.0",
     "@opentelemetry/api": "^1.3.0",
     "@opentelemetry/contrib-test-utils": "^0.45.1",
-    "@opentelemetry/sdk-trace-base": "^1.8.0",
+    "@opentelemetry/sdk-trace-base": "^2.0.0-dev.0",
     "@smithy/node-http-handler": "2.4.0",
     "@types/mocha": "10.0.10",
     "@types/node": "18.18.14",
@@ -75,6 +75,6 @@
     "typescript": "4.4.4"
   },
   "engines": {
-    "node": ">=14"
+    "node": "^18.19.0 || >=20.6.0"
   }
 }

plugins/node/opentelemetry-instrumentation-aws-sdk/package.json

@@ -66,7 +66,7 @@ describe('instrumentation-aws-sdk-v2', () => {
 
   const getAwsSpans = (): ReadableSpan[] => {
     return getTestSpans().filter(s =>
-      s.instrumentationLibrary.name.includes('aws-sdk')
+      s.instrumentationScope.name.includes('aws-sdk')
     );
   };
 

plugins/node/opentelemetry-instrumentation-aws-sdk/test/aws-sdk-v2.test.ts

@@ -97,7 +97,7 @@ describe('SQS', () => {
       expect(awsReceiveSpan.length).toBe(1);
       const internalSpan = spans.filter(s => s.kind === SpanKind.INTERNAL);
       expect(internalSpan.length).toBe(1);
-      expect(internalSpan[0].parentSpanId).toStrictEqual(
+      expect(internalSpan[0].parentSpanContext?.spanId).toStrictEqual(
         awsReceiveSpan[0].spanContext().spanId
       );
     };
@@ -200,20 +200,20 @@ describe('SQS', () => {
           MESSAGINGOPERATIONVALUES_PROCESS
       );
       expect(processSpans.length).toBe(2);
-      expect(processSpans[0].parentSpanId).toStrictEqual(
+      expect(processSpans[0].parentSpanContext?.spanId).toStrictEqual(
         awsReceiveSpan[0].spanContext().spanId
       );
-      expect(processSpans[1].parentSpanId).toStrictEqual(
+      expect(processSpans[1].parentSpanContext?.spanId).toStrictEqual(
         awsReceiveSpan[0].spanContext().spanId
       );
 
       const processChildSpans = spans.filter(s => s.kind === SpanKind.INTERNAL);
       expect(processChildSpans.length).toBe(2 * numChildPerProcessSpan);
       for (let i = 0; i < numChildPerProcessSpan; i++) {
-        expect(processChildSpans[2 * i + 0].parentSpanId).toStrictEqual(
+        expect(processChildSpans[2 * i + 0].parentSpanContext?.spanId).toStrictEqual(
           processSpans[0].spanContext().spanId
         );
-        expect(processChildSpans[2 * i + 1].parentSpanId).toStrictEqual(
+        expect(processChildSpans[2 * i + 1].parentSpanContext?.spanId).toStrictEqual(
           processSpans[1].spanContext().spanId
         );
       }