Added trace state data header extraction from AWS lambda requests and injection into transaction logic + test changes

Author: ahmedetefy

packages/serverless/src/awslambda.ts

@@ -9,7 +9,7 @@ import {
   withScope,
 } from '@sentry/node';
 import * as Sentry from '@sentry/node';
-import { extractTraceparentData } from '@sentry/tracing';
+import { extractSentrytraceData, extractTracestateData } from '@sentry/tracing';
 import { Integration } from '@sentry/types';
 import { isString, logger } from '@sentry/utils';
 // NOTE: I have no idea how to fix this right now, and don't want to waste more time, as it builds just fine — Kamil
@@ -245,14 +245,20 @@ export function wrapHandler<TEvent, TResult>(
 
     // Applying `sentry-trace` to context
     let traceparentData;
+    let tracestateData;
     const eventWithHeaders = event as { headers?: { [key: string]: string } };
     if (eventWithHeaders.headers && isString(eventWithHeaders.headers['sentry-trace'])) {
-      traceparentData = extractTraceparentData(eventWithHeaders.headers['sentry-trace'] as string);
+      traceparentData = extractSentrytraceData(eventWithHeaders.headers['sentry-trace'] as string);
     }
+    if (eventWithHeaders.headers?.tracestate) {
+      tracestateData = extractTracestateData(eventWithHeaders.headers.tracestate as string);
+    }
+
     const transaction = startTransaction({
       name: context.functionName,
       op: 'awslambda.handler',
       ...traceparentData,
+      metadata: { tracestate: tracestateData },
     });
 
     const hub = getCurrentHub();

packages/serverless/test/awslambda.test.ts

@@ -231,7 +231,10 @@ describe('AWSLambda', () => {
       const wrappedHandler = wrapHandler(handler);
 
       try {
-        fakeEvent.headers = { 'sentry-trace': '12312012123120121231201212312012-1121201211212012-0' };
+        fakeEvent.headers = {
+          'sentry-trace': '12312012123120121231201212312012-1121201211212012-0',
+          tracestate: 'sentry=doGsaREgReaT,maisey=silly,charlie=goofy',
+        };
         await wrappedHandler(fakeEvent, fakeContext, fakeCallback);
       } catch (e) {
         expect(Sentry.startTransaction).toBeCalledWith({
@@ -240,6 +243,12 @@ describe('AWSLambda', () => {
           traceId: '12312012123120121231201212312012',
           parentSpanId: '1121201211212012',
           parentSampled: false,
+          metadata: {
+            tracestate: {
+              sentry: 'sentry=doGsaREgReaT',
+              thirdparty: 'maisey=silly,charlie=goofy',
+            },
+          },
         });
         expectScopeSettings();
         expect(Sentry.captureException).toBeCalledWith(e);