update tests, fix sdk devdep versions

Author: jj22ee

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

@@ -74,11 +74,11 @@
     "@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",
+    "@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",

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

@@ -29,7 +29,7 @@ describe('AwsLambdaInstrumentationPatch', () => {
       assert.strictEqual(result.length, 0);
     });
 
-    it('should fallback to .cjs if .js does not exist', () => {
+    it('should fallback to .mjs if .js does not exist', () => {
       process.env.LAMBDA_TASK_ROOT = '/var/task';
       process.env._HANDLER = 'src/index.handler';
 
@@ -43,10 +43,10 @@ describe('AwsLambdaInstrumentationPatch', () => {
 
       const result = instrumentation.init();
 
-      assert.strictEqual(result[0].name, '/var/task/src/index.cjs');
+      assert.strictEqual(result[0].name, '/var/task/src/index.mjs');
     });
 
-    it('should fallback to .mjs when .js and .cjs do not exist', () => {
+    it('should fallback to .cjs when .js and .mjs do not exist', () => {
       process.env.LAMBDA_TASK_ROOT = '/var/task';
       process.env._HANDLER = 'src/index.handler';
 
@@ -60,7 +60,7 @@ describe('AwsLambdaInstrumentationPatch', () => {
 
       const result = instrumentation.init();
 
-      assert.strictEqual(result[0].name, '/var/task/src/index.mjs');
+      assert.strictEqual(result[0].name, '/var/task/src/index.cjs');
     });
 
     it('should instrument CommonJS handler correctly', () => {
@@ -79,23 +79,6 @@ describe('AwsLambdaInstrumentationPatch', () => {
       assert.strictEqual(result[0].files.length, 1);
       assert(debugStub.calledWithMatch('Instrumenting lambda handler', sinon.match.object));
     });
-
-    it('should return ESM instrumentation for .mjs files or when HANDLER_IS_ESM is set', () => {
-      process.env.LAMBDA_TASK_ROOT = '/var/task';
-      process.env._HANDLER = 'src/index.handler';
-      process.env.HANDLER_IS_ESM = 'true'; // ESM environment variable set
-
-      sinon.stub(path, 'basename').returns('index.handler');
-      sinon.stub(fs, 'statSync').throws(new Error('File not found')); // No .js or .cjs file exists
-
-      const result = instrumentation.init();
-
-      assert.strictEqual(result.length, 1);
-      assert.strictEqual(result[0].name, '/var/task/src/index.mjs');
-      assert(result[0] instanceof InstrumentationNodeModuleDefinition);
-      assert.strictEqual(result[0].files.length, 0); //
-      delete process.env.HANDLER_IS_ESM;
-    });
   });
 
   it('should apply and remove patches correctly for a MJS handler', () => {
@@ -105,23 +88,24 @@ describe('AwsLambdaInstrumentationPatch', () => {
 
     // Mock the module exports object with a sample function
     const fakeModuleExports = { handler: sinon.stub() };
+    sinon.stub(fs, 'statSync').returns({} as any); // Mock that the .js file exists
 
     const wrapSpy = sinon.spy(instrumentation, '_wrap' as any);
     const unwrapSpy = sinon.spy(instrumentation, '_unwrap' as any);
 
     const result = instrumentation.init()[0];
     // Ensure result contains patch and unpatch functions
-    assert(result.patch, 'patch function should be defined');
-    assert(result.unpatch, 'unpatch function should be defined');
+    assert(result.files[0].patch, 'patch function should be defined');
+    assert(result.files[0].unpatch, 'unpatch function should be defined');
 
     // Call the patch function with the mocked module exports
-    result.patch(fakeModuleExports);
+    result.files[0].patch(fakeModuleExports);
 
     // Assert that wrap is called after patching
     assert(wrapSpy.calledOnce, '_wrap should be called once when patch is applied');
 
     // Call the unpatch function with the mocked module exports
-    result.unpatch(fakeModuleExports);
+    result.files[0].unpatch(fakeModuleExports);
 
     // Assert that unwrap is called after unpatching
     assert(unwrapSpy.calledOnce, '_unwrap should be called once when unpatch is called');