chore: aws-sdk in node18 e2e tests

Author: dreamorosi

package-lock.json

@@ -33,6 +33,7 @@
   "devDependencies": {
     "@aws-sdk/client-dynamodb": "^3.231.0",
     "@types/promise-retry": "^1.1.3",
+    "aws-sdk": "^2.1276.0",
     "axios": "^1.2.1",
     "promise-retry": "^2.0.1"
   },
@@ -59,4 +60,4 @@
     "serverless",
     "nodejs"
   ]
-}
+}

packages/tracer/package.json

@@ -3,7 +3,9 @@ import { Context } from 'aws-lambda';
 import { DynamoDBClient, PutItemCommand } from '@aws-sdk/client-dynamodb';
 import axios from 'axios';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-let AWS = require('aws-sdk');
+// let AWS = require('aws-sdk');
+import AWS from 'aws-sdk';
+import { default as AWS2 } from 'aws-sdk';
 
 const serviceName = process.env.EXPECTED_SERVICE_NAME ?? 'MyFunctionWithStandardHandler';
 const customAnnotationKey = process.env.EXPECTED_CUSTOM_ANNOTATION_KEY ?? 'myAnnotation';
@@ -21,7 +23,7 @@ interface CustomEvent {
 }
 
 // Function that refreshes imports to ensure that we are instrumenting only one version of the AWS SDK v2 at a time.
-const refreshAWSSDKImport = (): void => {
+/* const refreshAWSSDKImport = (): void => {
   // Clean up the require cache to ensure we're using a newly imported version of the AWS SDK v2
   for (const key in require.cache) {
     if (key.indexOf('/aws-sdk/') !== -1) {
@@ -30,7 +32,7 @@ const refreshAWSSDKImport = (): void => {
   }
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   AWS = require('aws-sdk');
-};
+}; */
 
 const tracer = new Tracer({ serviceName: serviceName });
 const dynamoDBv3 = tracer.captureAWSv3Client(new DynamoDBClient({}));
@@ -48,12 +50,12 @@ export const handler = async (event: CustomEvent, _context: Context): Promise<vo
   tracer.putMetadata(customMetadataKey, customMetadataValue);
 
   let dynamoDBv2;
-  refreshAWSSDKImport();
+  // refreshAWSSDKImport();
   if (event.sdkV2 === 'client') {
     dynamoDBv2 = tracer.captureAWSClient(new AWS.DynamoDB.DocumentClient());
   } else if (event.sdkV2 === 'all') {
-    AWS = tracer.captureAWS(AWS);
-    dynamoDBv2 = new AWS.DynamoDB.DocumentClient();
+    tracer.captureAWS(AWS2);
+    dynamoDBv2 = new AWS2.DynamoDB.DocumentClient();
   }
   try {
     await dynamoDBv2.put({ TableName: testTableName, Item: { id: `${serviceName}-${event.invocation}-sdkv2` } }).promise();

packages/tracer/tests/e2e/allFeatures.manual.test.functionCode.ts

@@ -60,7 +60,7 @@ let sortedTraces: ParsedTrace[];
 const integTestApp = new App();
 let stack: Stack;
 
-describe(`Tracer E2E tests, all features with manual instantiation for runtime: ${runtime}`, () => {
+describe(`Tracer E2E tests, all features with manual instantiation for runtime: nodejs18x`, () => {
 
   beforeAll(async () => {
 

packages/tracer/tests/e2e/allFeatures.manual.test.ts

@@ -252,11 +252,7 @@ const createTracerTestFunction = (params: TracerTestFunctionParams): NodejsFunct
       EXPECTED_CUSTOM_ERROR_MESSAGE: expectedCustomErrorMessage,
       ...environmentParams,
     },
-    timeout: Duration.seconds(30), // Default value (3 seconds) will time out 
-    bundling: { 
-      // Exclude aws-sdk and use the default one provided by Lambda
-      externalModules: ['aws-sdk'],
-    },
+    timeout: Duration.seconds(30), // Default value (3 seconds) will time out
     runtime: TEST_RUNTIMES[runtime as TestRuntimesKey],
   });