upgrade otel version, remove patches that are not needed anymore

Author: jj22ee

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

@@ -79,7 +79,7 @@
     "@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",
+    "@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 as any)._delegate._transport?._transport?._parameters?.headers;
 
       if (oldHeaders) {
         const request = new this.httpRequest({
@@ -81,7 +81,7 @@ export class OTLPAwsSpanExporter extends OTLPProtoTraceExporter {
 
           const signedRequest = await signer.sign(request);
 
-          (this as any)._transport._transport._parameters.headers = signedRequest.headers;
+          (this as any)._delegate._transport._transport._parameters.headers = signedRequest.headers;
         } catch (exception) {
           diag.debug(
             `Failed to sign/authenticate the given exported Span request to OTLP XRay endpoint with error: ${exception}`
@@ -128,9 +128,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,

aws-distro-opentelemetry-node-autoinstrumentation/src/patches/aws/services/kinesis.ts

@@ -3,123 +3,11 @@
 // Modifications Copyright The OpenTelemetry Authors. Licensed under the Apache License 2.0 License.
 
 import { AwsLambdaInstrumentation } from '@opentelemetry/instrumentation-aws-lambda';
-import * as path from 'path';
-import * as fs from 'fs';
-import {
-  InstrumentationNodeModuleDefinition,
-  InstrumentationNodeModuleFile,
-  isWrapped,
-} from '@opentelemetry/instrumentation';
 import { diag, Span, SpanStatusCode } from '@opentelemetry/api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 export class AwsLambdaInstrumentationPatch extends AwsLambdaInstrumentation {
-  override init() {
-    // Custom logic before calling the original implementation
-    diag.debug('Initializing AwsLambdaInstrumentationPatch');
-    const taskRoot = process.env.LAMBDA_TASK_ROOT;
-    const handlerDef = this._config.lambdaHandler ?? process.env._HANDLER;
-
-    // _HANDLER and LAMBDA_TASK_ROOT are always defined in Lambda but guard bail out if in the future this changes.
-    if (!taskRoot || !handlerDef) {
-      this._diag.debug('Skipping lambda instrumentation: no _HANDLER/lambdaHandler or LAMBDA_TASK_ROOT.', {
-        taskRoot,
-        handlerDef,
-      });
-      return [];
-    }
-
-    const handler = path.basename(handlerDef);
-    const moduleRoot = handlerDef.substr(0, handlerDef.length - handler.length);
-
-    const [module, functionName] = handler.split('.', 2);
-
-    // Lambda loads user function using an absolute path.
-    let filename = path.resolve(taskRoot, moduleRoot, module);
-    if (!filename.endsWith('.js')) {
-      // its impossible to know in advance if the user has a cjs or js or mjs file.
-      // check that the .js file exists otherwise fallback to next known possibility
-      try {
-        fs.statSync(`${filename}.js`);
-        filename += '.js';
-      } catch (e) {
-        // fallback to .cjs
-        try {
-          fs.statSync(`${filename}.cjs`);
-          filename += '.cjs';
-        } catch (e) {
-          // fall back to .mjs
-          filename += '.mjs';
-        }
-      }
-    }
-
-    diag.debug('Instrumenting lambda handler', {
-      taskRoot,
-      handlerDef,
-      handler,
-      moduleRoot,
-      module,
-      filename,
-      functionName,
-    });
-
-    if (filename.endsWith('.mjs') || process.env.HANDLER_IS_ESM) {
-      return [
-        new InstrumentationNodeModuleDefinition(
-          // NB: The patching infrastructure seems to match names backwards, this must be the filename, while
-          // InstrumentationNodeModuleFile must be the module name.
-          filename,
-          ['*'],
-          (moduleExports: any) => {
-            diag.debug('Applying patch for lambda esm handler');
-            if (isWrapped(moduleExports[functionName])) {
-              this._unwrap(moduleExports, functionName);
-            }
-            this._wrap(moduleExports, functionName, (this as any)._getHandler());
-            return moduleExports;
-          },
-          (moduleExports?: any) => {
-            if (moduleExports == null) return;
-            diag.debug('Removing patch for lambda esm handler');
-            this._unwrap(moduleExports, functionName);
-          }
-        ),
-      ];
-    } else {
-      return [
-        new InstrumentationNodeModuleDefinition(
-          // NB: The patching infrastructure seems to match names backwards, this must be the filename, while
-          // InstrumentationNodeModuleFile must be the module name.
-          filename,
-          ['*'],
-          undefined,
-          undefined,
-          [
-            new InstrumentationNodeModuleFile(
-              module,
-              ['*'],
-              (moduleExports: any) => {
-                diag.debug('Applying patch for lambda handler');
-                if (isWrapped(moduleExports[functionName])) {
-                  this._unwrap(moduleExports, functionName);
-                }
-                this._wrap(moduleExports, functionName, (this as any)._getHandler());
-                return moduleExports;
-              },
-              (moduleExports?: any) => {
-                if (moduleExports == null) return;
-                diag.debug('Removing patch for lambda handler');
-                this._unwrap(moduleExports, functionName);
-              }
-            ),
-          ]
-        ),
-      ];
-    }
-  }
-
   // Override the upstream private _endSpan method to remove the unnecessary metric force-flush error message
   // https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts#L358-L398
   override _endSpan(span: Span, err: string | Error | null | undefined, callback: () => void) {

aws-distro-opentelemetry-node-autoinstrumentation/src/patches/aws/services/s3.ts

@@ -29,8 +29,6 @@ import {
   BedrockRuntimeServiceExtension,
   BedrockServiceExtension,
 } from './aws/services/bedrock';
-import { KinesisServiceExtension } from './aws/services/kinesis';
-import { S3ServiceExtension } from './aws/services/s3';
 import { SecretsManagerServiceExtension } from './aws/services/secretsmanager';
 import { StepFunctionsServiceExtension } from './aws/services/step-functions';
 import { InstrumentationConfigMap } from '@opentelemetry/auto-instrumentations-node';
@@ -74,8 +72,6 @@ export function applyInstrumentationPatches(
       const services: Map<string, ServiceExtension> | undefined = (instrumentations[index] as any).servicesExtensions
         ?.services;
       if (services) {
-        services.set('S3', new S3ServiceExtension());
-        services.set('Kinesis', new KinesisServiceExtension());
         services.set('SecretsManager', new SecretsManagerServiceExtension());
         services.set('SFN', new StepFunctionsServiceExtension());
         services.set('Bedrock', new BedrockServiceExtension());
@@ -90,7 +86,6 @@ export function applyInstrumentationPatches(
       diag.debug('Overriding aws lambda instrumentation');
       const lambdaInstrumentation = new AwsLambdaInstrumentationPatch({
         eventContextExtractor: customExtractor,
-        disableAwsContextPropagation: true,
       });
       instrumentations[index] = lambdaInstrumentation;
     }

aws-distro-opentelemetry-node-autoinstrumentation/src/patches/extended-instrumentations/aws-lambda.ts

@@ -319,25 +319,29 @@ describe('AwsOpenTelemetryConfiguratorTest', () => {
     // Check default protocol - HTTP, as specified by aws-distro-opentelemetry-node-autoinstrumentation's register.ts.
     let exporter: PushMetricExporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPHttpOTLPMetricExporter);
-    expect('http://localhost:4316/v1/metrics').toEqual((exporter as any)._otlpExporter.url);
+    expect('http://localhost:4316/v1/metrics').toEqual(
+      (exporter as any)._delegate._transport._transport._parameters.url
+    );
 
     // Overwrite protocol to gRPC.
     process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'grpc';
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPGrpcOTLPMetricExporter);
-    expect('localhost:4315').toEqual((exporter as any)._otlpExporter.url);
+    expect('localhost:4315').toEqual((exporter as any)._delegate._transport._parameters.address);
 
     // Overwrite protocol back to HTTP.
     process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'http/protobuf';
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPHttpOTLPMetricExporter);
-    expect('http://localhost:4316/v1/metrics').toEqual((exporter as any)._otlpExporter.url);
+    expect('http://localhost:4316/v1/metrics').toEqual(
+      (exporter as any)._delegate._transport._transport._parameters.url
+    );
 
     // If for some reason, the env var is undefined (it shouldn't), overwrite protocol to gRPC.
     delete process.env.OTEL_EXPORTER_OTLP_PROTOCOL;
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPGrpcOTLPMetricExporter);
-    expect('localhost:4315').toEqual((exporter as any)._otlpExporter.url);
+    expect('localhost:4315').toEqual((exporter as any)._delegate._transport._parameters.address);
 
     // Expect invalid protocol to throw error.
     process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'invalid_protocol';
@@ -351,38 +355,42 @@ describe('AwsOpenTelemetryConfiguratorTest', () => {
     // Check default protocol - HTTP, as specified by aws-distro-opentelemetry-node-autoinstrumentation's register.ts.
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPHttpOTLPMetricExporter);
-    expect('http://localhost:4316/v1/metrics').toEqual((exporter as any)._otlpExporter.url);
+    expect('http://localhost:4316/v1/metrics').toEqual(
+      (exporter as any)._delegate._transport._transport._parameters.url
+    );
 
     // Overwrite protocol to gRPC.
     process.env.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL = 'grpc';
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPGrpcOTLPMetricExporter);
-    expect('localhost:4315').toEqual((exporter as any)._otlpExporter.url);
+    expect('localhost:4315').toEqual((exporter as any)._delegate._transport._parameters.address);
 
     // Overwrite protocol back to HTTP.
     process.env.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL = 'http/protobuf';
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPHttpOTLPMetricExporter);
-    expect('http://localhost:4316/v1/metrics').toEqual((exporter as any)._otlpExporter.url);
+    expect('http://localhost:4316/v1/metrics').toEqual(
+      (exporter as any)._delegate._transport._transport._parameters.url
+    );
 
     // Expect invalid protocol to throw error.
     process.env.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL = 'invalid_protocol';
     expect(() => ApplicationSignalsExporterProvider.Instance.createExporter()).toThrow();
 
     // Test custom URLs via OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT
-    process.env.OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT = 'my_custom_endpoint';
+    process.env.OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT = 'http://my_custom_endpoint';
 
     // Overwrite protocol to gRPC, export to url "my_custom_endpoint"
     process.env.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL = 'grpc';
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPGrpcOTLPMetricExporter);
-    expect('my_custom_endpoint').toEqual((exporter as any)._otlpExporter.url);
+    expect('my_custom_endpoint').toEqual((exporter as any)._delegate._transport._parameters.address);
 
-    // Overwrite protocol back to HTTP, export to url "my_custom_endpoint"
+    // Overwrite protocol back to HTTP, export to url "http://my_custom_endpoint"
     process.env.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL = 'http/protobuf';
     exporter = ApplicationSignalsExporterProvider.Instance.createExporter();
     expect(exporter).toBeInstanceOf(OTLPHttpOTLPMetricExporter);
-    expect('my_custom_endpoint').toEqual((exporter as any)._otlpExporter.url);
+    expect('http://my_custom_endpoint').toEqual((exporter as any)._delegate._transport._transport._parameters.url);
 
     // Cleanup
     delete process.env.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL;