fix _sentryTraceToTraceParentHeader potentially returning invalid traceparent header

Author: Lms24

packages/core/src/utils/traceData.ts

@@ -58,7 +58,10 @@ export function getTraceData(
   };
 
   if (options.propagateTraceparent) {
-    traceData.traceparent = _sentryTraceToTraceParentHeader(sentryTrace);
+    const traceparent = _sentryTraceToTraceParentHeader(sentryTrace);
+    if (traceparent) {
+      traceData.traceparent = traceparent;
+    }
   }
 
   return traceData;
@@ -84,7 +87,10 @@ function scopeToTraceHeader(scope: Scope): string {
  *
  * Exported for testing
  */
-export function _sentryTraceToTraceParentHeader(sentryTrace: string): string {
+export function _sentryTraceToTraceParentHeader(sentryTrace: string): string | undefined {
   const { traceId, parentSpanId, parentSampled } = extractTraceparentData(sentryTrace) || {};
+  if (!traceId || !parentSpanId) {
+    return undefined;
+  }
   return `00-${traceId}-${parentSpanId}-${parentSampled ? '01' : '00'}`;
 }

packages/core/test/lib/utils/traceData.test.ts

@@ -365,4 +365,18 @@ describe('_sentryTraceToTraceParentHeader', () => {
     const traceparent = _sentryTraceToTraceParentHeader('12345678901234567890123456789012-1234567890123456');
     expect(traceparent).toBe('00-12345678901234567890123456789012-1234567890123456-00');
   });
+
+  it.each([
+    '12345678901234567890123456789012--0',
+    '-12345678901234567890123456789012-0',
+    '--1',
+    '0',
+    '1',
+    '',
+    '00-12345678901234567890123456789012-1234567890123456-01',
+    '00-12345678901234567890123456789012-1234567890123456-00',
+  ])('returns undefined if the sentry-trace header is invalid (%s)', sentryTrace => {
+    const traceparent = _sentryTraceToTraceParentHeader(sentryTrace);
+    expect(traceparent).toBeUndefined();
+  });
 });