Pointing to latest upstream for mysql2 instrumentation fix

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

@@ -94,15 +94,15 @@
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/auto-configuration-propagators": "0.3.0",
-    "@opentelemetry/auto-instrumentations-node": "0.50.0",
+    "@opentelemetry/auto-instrumentations-node": "0.56.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/instrumentation-aws-sdk": "0.49.0",
     "@opentelemetry/propagator-aws-xray": "1.26.0",
     "@opentelemetry/resource-detector-aws": "1.6.1",
     "@opentelemetry/resources": "1.26.0",

aws-distro-opentelemetry-node-autoinstrumentation/src/patches/instrumentation-patch.ts

@@ -23,8 +23,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';
@@ -68,8 +66,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());
@@ -84,7 +80,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/test/patches/aws/services/bedrock.test.ts

@@ -7,7 +7,7 @@ import { applyInstrumentationPatches } from './../../../../src/patches/instrumen
 
 const instrumentations: AwsInstrumentation[] = [new AwsInstrumentation()];
 applyInstrumentationPatches(instrumentations);
-registerInstrumentationTesting(instrumentations[0]);
+registerInstrumentationTesting(instrumentations[0] as unknown as InstrumentationBase<InstrumentationConfig>);
 
 import { Bedrock } from '@aws-sdk/client-bedrock';
 import { BedrockAgent } from '@aws-sdk/client-bedrock-agent';
@@ -20,6 +20,7 @@ import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { expect } from 'expect';
 import { AWS_ATTRIBUTE_KEYS } from '../../../../src/aws-attribute-keys';
 import { AwsSpanProcessingUtil } from '../../../../src/aws-span-processing-util';
+import { InstrumentationBase, InstrumentationConfig } from '@opentelemetry/instrumentation';
 
 // This file's contents are being contributed to upstream
 // - https://github.com/open-telemetry/opentelemetry-js-contrib/pull/2361

aws-distro-opentelemetry-node-autoinstrumentation/test/patches/aws/services/secretsmanager.test.ts

@@ -7,7 +7,7 @@ import { applyInstrumentationPatches } from './../../../../src/patches/instrumen
 
 const instrumentations: AwsInstrumentation[] = [new AwsInstrumentation()];
 applyInstrumentationPatches(instrumentations);
-registerInstrumentationTesting(instrumentations[0]);
+registerInstrumentationTesting(instrumentations[0] as unknown as InstrumentationBase<InstrumentationConfig>);
 
 import { SecretsManager } from '@aws-sdk/client-secrets-manager';
 import * as nock from 'nock';
@@ -16,6 +16,7 @@ import { SpanKind } from '@opentelemetry/api';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { expect } from 'expect';
 import { AWS_ATTRIBUTE_KEYS } from '../../../../src/aws-attribute-keys';
+import { InstrumentationBase, InstrumentationConfig } from '@opentelemetry/instrumentation';
 
 const region = 'us-east-1';
 

aws-distro-opentelemetry-node-autoinstrumentation/test/patches/aws/services/step-functions.test.ts

@@ -7,7 +7,7 @@ import { applyInstrumentationPatches } from './../../../../src/patches/instrumen
 
 const instrumentations: AwsInstrumentation[] = [new AwsInstrumentation()];
 applyInstrumentationPatches(instrumentations);
-registerInstrumentationTesting(instrumentations[0]);
+registerInstrumentationTesting(instrumentations[0] as unknown as InstrumentationBase<InstrumentationConfig>);
 
 import { SFN } from '@aws-sdk/client-sfn';
 import * as nock from 'nock';
@@ -16,6 +16,7 @@ import { SpanKind } from '@opentelemetry/api';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { expect } from 'expect';
 import { AWS_ATTRIBUTE_KEYS } from '../../../../src/aws-attribute-keys';
+import { InstrumentationBase, InstrumentationConfig } from '@opentelemetry/instrumentation';
 
 const region = 'us-east-1';