removed s3 and kinesis from needing to be patched as upstream already has them

Author: liustve

aws-distro-opentelemetry-node-autoinstrumentation/src/patches/aws/services/kinesis.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());

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

@@ -100,12 +100,12 @@ describe('InstrumentationPatchTest', () => {
     expect(services.has('SNS')).toBeTruthy();
     expect(services.has('DynamoDB')).toBeTruthy();
     expect(services.has('Lambda')).toBeTruthy();
+    expect(services.has('S3')).toBeTruthy();
+    expect(services.has('Kinesis')).toBeTruthy();
 
     // From patching
     expect(services.has('SecretsManager')).toBeTruthy();
     expect(services.has('SFN')).toBeTruthy();
-    expect(services.has('S3')).toBeTruthy();
-    expect(services.has('Kinesis')).toBeTruthy();
     expect(services.get('SNS')._requestPreSpanHook).toBeTruthy();
     expect(services.get('SNS').requestPreSpanHook).toBeTruthy();
     expect(services.get('Lambda')._requestPreSpanHook).toBeTruthy();
@@ -123,18 +123,6 @@ describe('InstrumentationPatchTest', () => {
     expect(awsSdkInstrumentation).toBeInstanceOf(AwsSdkInstrumentationExtended);
   });
 
-  it('S3 without patching', () => {
-    const unpatchedAwsSdkInstrumentation: AwsInstrumentation = extractAwsSdkInstrumentation(UNPATCHED_INSTRUMENTATIONS);
-    const services: Map<string, any> = extractServicesFromAwsSdkInstrumentation(unpatchedAwsSdkInstrumentation);
-    expect(() => doExtractS3Attributes(services)).toThrow();
-  });
-
-  it('Kinesis without patching', () => {
-    const unpatchedAwsSdkInstrumentation: AwsInstrumentation = extractAwsSdkInstrumentation(UNPATCHED_INSTRUMENTATIONS);
-    const services: Map<string, any> = extractServicesFromAwsSdkInstrumentation(unpatchedAwsSdkInstrumentation);
-    expect(() => doExtractKinesisAttributes(services)).toThrow();
-  });
-
   it('SQS without patching', () => {
     const unpatchedAwsSdkInstrumentation: AwsInstrumentation = extractAwsSdkInstrumentation(UNPATCHED_INSTRUMENTATIONS);
     const services: Map<string, any> = extractServicesFromAwsSdkInstrumentation(unpatchedAwsSdkInstrumentation);