fix: update logic and tests for pieceing url parts together

Author: johnbley

plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts

@@ -443,17 +443,22 @@ export class AwsLambdaInstrumentation extends InstrumentationBase<AwsLambdaInstr
 
   private static _extractFullUrl(event: any): string | undefined {
     // API gateway encodes a lot of url information in various places to recompute this
-    if (!event.headers || !event.path) {
+    if (
+      !(
+        event.headers &&
+        (event.path || event.rawPath) &&
+        event.headers['host'] &&
+        event.headers['x-forwarded-proto']
+      )
+    ) {
       return undefined;
     }
-    let answer = '';
-    if (event.headers['x-forwarded-proto']) {
-      answer += event.headers['x-forwarded-proto'] + '://';
-    }
-    if (event.headers['host']) {
-      answer += event.headers['host'];
+    let answer = event.headers['x-forwarded-proto'] + '://';
+    answer += event.headers['host'];
+    if (event.headers['x-forwarded-port']) {
+      answer += ':' + event.headers['x-forwarded-port'];
     }
-    answer += event.path;
+    answer += event.path ? event.path : event.rawPath;
     if (event.queryStringParameters) {
       let first = true;
       for (const key in event.queryStringParameters) {
@@ -464,7 +469,7 @@ export class AwsLambdaInstrumentation extends InstrumentationBase<AwsLambdaInstr
         first = false;
       }
     }
-    return answer.length === 0 ? undefined : answer;
+    return answer;
   }
 
   private static _determineParent(

plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts

@@ -1082,7 +1082,7 @@ describe('lambda handler', () => {
   });
 
   describe('url parsing', () => {
-    it('pulls url from api gateway events', async () => {
+    it('pulls url from api gateway rest events', async () => {
       initializeHandler('lambda-test/sync.handler');
       const event = {
         path: '/lambda/test/path',
@@ -1103,5 +1103,27 @@ describe('lambda handler', () => {
       );
       console.log(span);
     });
+    it('pulls url from api gateway http events', async () => {
+      initializeHandler('lambda-test/sync.handler');
+      const event = {
+        rawPath: '/lambda/test/path',
+        headers: {
+          host: 'www.example.com',
+          'x-forwarded-proto': 'http',
+          'x-forwarded-port': 1234,
+        },
+        queryStringParameters: {
+          key: 'value',
+        },
+      };
+
+      await lambdaRequire('lambda-test/sync').handler(event, ctx, () => {});
+      const [span] = memoryExporter.getFinishedSpans();
+      assert.strictEqual(
+        span.attributes[ATTR_URL_FULL],
+        'http://www.example.com:1234/lambda/test/path?key=value'
+      );
+      console.log(span);
+    });
   });
 });