Upgrade OTel dependencies, remove patches that are not needed anymore

aws-distro-opentelemetry-node-autoinstrumentation/package.json

@@ -74,12 +74,12 @@
     "@aws-sdk/client-bedrock-agent-runtime": "3.632.0",
     "@aws-sdk/client-bedrock-runtime": "3.632.0",
     "@aws-sdk/client-kinesis": "3.632.0",
-    "@aws-sdk/client-lambda": "^3.632.0",
+    "@aws-sdk/client-lambda": "3.632.0",
     "@aws-sdk/client-s3": "3.632.0",
-    "@aws-sdk/client-secrets-manager": "^3.632.0",
-    "@aws-sdk/client-sfn": "^3.632.0",
-    "@aws-sdk/client-sns": "^3.632.0",
-    "@opentelemetry/contrib-test-utils": "0.41.0",
+    "@aws-sdk/client-secrets-manager": "3.632.0",
+    "@aws-sdk/client-sfn": "3.632.0",
+    "@aws-sdk/client-sns": "3.632.0",
+    "@opentelemetry/contrib-test-utils": "^0.45.0",
     "@smithy/protocol-http": "^5.0.1",
     "@smithy/signature-v4": "^5.0.1",
     "@types/mocha": "7.0.2",
@@ -98,24 +98,24 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/auto-configuration-propagators": "0.3.0",
-    "@opentelemetry/auto-instrumentations-node": "0.50.0",
-    "@opentelemetry/core": "1.26.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "0.53.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.53.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "0.53.0",
-    "@opentelemetry/exporter-zipkin": "1.26.0",
-    "@opentelemetry/id-generator-aws-xray": "1.2.2",
-    "@opentelemetry/instrumentation": "0.53.0",
-    "@opentelemetry/instrumentation-aws-sdk": "0.44.0",
-    "@opentelemetry/otlp-transformer": "0.53.0",
-    "@opentelemetry/propagator-aws-xray": "1.26.0",
-    "@opentelemetry/resource-detector-aws": "1.6.1",
-    "@opentelemetry/resources": "1.26.0",
-    "@opentelemetry/sdk-metrics": "1.26.0",
-    "@opentelemetry/sdk-node": "0.53.0",
-    "@opentelemetry/sdk-trace-base": "1.26.0",
-    "@opentelemetry/semantic-conventions": "1.27.0"
+    "@opentelemetry/auto-configuration-propagators": "0.3.2",
+    "@opentelemetry/auto-instrumentations-node": "0.56.0",
+    "@opentelemetry/core": "1.30.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "0.57.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.57.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "0.57.1",
+    "@opentelemetry/exporter-zipkin": "1.30.1",
+    "@opentelemetry/id-generator-aws-xray": "1.2.3",
+    "@opentelemetry/instrumentation": "0.57.1",
+    "@opentelemetry/instrumentation-aws-sdk": "0.49.0",
+    "@opentelemetry/otlp-transformer": "0.57.1",
+    "@opentelemetry/propagator-aws-xray": "1.26.2",
+    "@opentelemetry/resource-detector-aws": "1.12.0",
+    "@opentelemetry/resources": "1.30.1",
+    "@opentelemetry/sdk-metrics": "1.30.1",
+    "@opentelemetry/sdk-node": "0.57.1",
+    "@opentelemetry/sdk-trace-base": "1.30.1",
+    "@opentelemetry/semantic-conventions": "1.28.0"
   },
   "files": [
     "build/src/**/*.js",

aws-distro-opentelemetry-node-autoinstrumentation/src/otlp-aws-span-exporter.ts

@@ -56,7 +56,7 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
         This is bad practice but there is no other way to access and inject SigV4 headers
         into the request headers before the traces get exported.
       */
-      const oldHeaders = (this as any)._transport?._transport?._parameters?.headers;
+      const oldHeaders = this['_delegate']._transport?._transport?._parameters?.headers();
 
       if (oldHeaders) {
         const request = new this.httpRequest({
@@ -81,7 +81,9 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
 
           const signedRequest = await signer.sign(request);
 
-          (this as any)._transport._transport._parameters.headers = signedRequest.headers;
+          // See type: https://github.com/open-telemetry/opentelemetry-js/blob/experimental/v0.57.1/experimental/packages/otlp-exporter-base/src/transport/http-transport-types.ts#L31
+          const newHeaders: () => Record<string, string> = () => signedRequest.headers;
+          this['_delegate']._transport._transport._parameters.headers = newHeaders;
         } catch (exception) {
           diag.debug(
             `Failed to sign/authenticate the given exported Span request to OTLP XRay endpoint with error: ${exception}`
@@ -90,7 +92,7 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
       }
     }
 
-    await super.export(items, resultCallback);
+    super.export(items, resultCallback);
   }
 
   // Removes Sigv4 headers from old headers to avoid accidentally copying them to the new headers
@@ -128,9 +130,9 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
     }
   }
 
-  private static changeUrlConfig(endpoint: string, config?: OTLPExporterNodeConfigBase) {
+  private static changeUrlConfig(endpoint: string, config?: OTLPExporterNodeConfigBase): OTLPExporterNodeConfigBase {
     const newConfig =
-      config === undefined
+      config == null
         ? { url: endpoint }
         : {
             ...config,