s/traceparent/sentrytrace in various spots

Author: lobsterkatie

packages/node/src/handlers.ts

@@ -54,16 +54,16 @@ export function tracingHandler(): (
     next: (error?: any) => void,
   ): void {
     // If there is a trace header set, we extract the data from it (parentSpanId, traceId, and sampling decision)
-    let traceparentData;
+    let sentrytraceData;
     if (req.headers && isString(req.headers['sentry-trace'])) {
-      traceparentData = extractSentrytraceData(req.headers['sentry-trace'] as string);
+      sentrytraceData = extractSentrytraceData(req.headers['sentry-trace'] as string);
     }
 
     const transaction = startTransaction(
       {
         name: extractExpressTransactionName(req, { path: true, method: true }),
         op: 'http.server',
-        ...traceparentData,
+        ...sentrytraceData,
       },
       // extra context passed to the tracesSampler
       { request: extractRequestData(req) },

packages/serverless/src/awslambda.ts

@@ -253,15 +253,15 @@ export function wrapHandler<TEvent, TResult>(
     }
 
     // Applying `sentry-trace` to context
-    let traceparentData;
+    let sentrytraceData;
     const eventWithHeaders = event as { headers?: { [key: string]: string } };
     if (eventWithHeaders.headers && isString(eventWithHeaders.headers['sentry-trace'])) {
-      traceparentData = extractSentrytraceData(eventWithHeaders.headers['sentry-trace'] as string);
+      sentrytraceData = extractSentrytraceData(eventWithHeaders.headers['sentry-trace'] as string);
     }
     const transaction = startTransaction({
       name: context.functionName,
       op: 'awslambda.handler',
-      ...traceparentData,
+      ...sentrytraceData,
     });
 
     const hub = getCurrentHub();

packages/serverless/src/gcpfunction/http.ts

@@ -50,15 +50,15 @@ function _wrapHttpFunction(fn: HttpFunction, wrapOptions: Partial<HttpFunctionWr
     const reqUrl = stripUrlQueryAndFragment(req.originalUrl || req.url || '');
 
     // Applying `sentry-trace` to context
-    let traceparentData;
+    let sentrytraceData;
     const reqWithHeaders = req as { headers?: { [key: string]: string } };
     if (reqWithHeaders.headers && isString(reqWithHeaders.headers['sentry-trace'])) {
-      traceparentData = extractSentrytraceData(reqWithHeaders.headers['sentry-trace'] as string);
+      sentrytraceData = extractSentrytraceData(reqWithHeaders.headers['sentry-trace'] as string);
     }
     const transaction = startTransaction({
       name: `${reqMethod} ${reqUrl}`,
       op: 'gcp.function.http',
-      ...traceparentData,
+      ...sentrytraceData,
     });
 
     // getCurrentHub() is expected to use current active domain as a carrier

packages/tracing/src/utils.ts

@@ -28,12 +28,13 @@ export function hasTracingEnabled(
 /**
  * Extract transaction context data from a `sentry-trace` header.
  *
- * @param traceparent Traceparent string
+ * @param header Traceparent string
  *
  * @returns Object containing data from the header, or undefined if traceparent string is malformed
  */
-export function extractSentrytraceData(traceparent: string): TraceparentData | undefined {
-  const matches = traceparent.match(SENTRY_TRACE_REGEX);
+export function extractSentrytraceData(header: string): TraceparentData | undefined {
+  const matches = header.match(SENTRY_TRACE_REGEX);
+
   if (matches) {
     let parentSampled: boolean | undefined;
     if (matches[3] === '1') {
@@ -47,6 +48,7 @@ export function extractSentrytraceData(traceparent: string): TraceparentData | u
       parentSpanId: matches[2],
     };
   }
+
   return undefined;
 }