fix stuff

Author: mydea

dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts

@@ -41,11 +41,16 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
 
           const traceData = contexts?.traceData || {};
 
-          expect(traceData['sentry-trace']).toEqual(`${trace_id}-${span_id}`);
+          expect(traceData['sentry-trace']).toContain(`${trace_id}-`);
+          // span_id is a random span ID
+          expect(traceData['sentry-trace']).not.toContain(span_id);
+
           expect(traceData.baggage).toContain(`sentry-trace_id=${trace_id}`);
           expect(traceData.baggage).not.toContain('sentry-sampled=');
 
-          expect(traceData.metaTags).toContain(`<meta name="sentry-trace" content="${trace_id}-${span_id}"/>`);
+          expect(traceData.metaTags).toContain(`<meta name="sentry-trace" content="${trace_id}-`);
+          // span_id is a random span ID
+          expect(traceData.metaTags).not.toContain(span_id);
           expect(traceData.metaTags).toContain(`sentry-trace_id=${trace_id}`);
           expect(traceData.metaTags).not.toContain('sentry-sampled=');
         },

packages/opentelemetry/src/propagator.ts

@@ -206,9 +206,7 @@ export function getInjectionData(context: Context): {
     return {
       dynamicSamplingContext,
       traceId: spanContext.traceId,
-      // Because this is a remote span, we do not want to propagate this directly
-      // As otherwise things may be attached "directly" to an unrelated span
-      spanId: generateSpanId(),
+      spanId: undefined,
       sampled: getSamplingDecision(spanContext),
     };
   }
@@ -236,7 +234,7 @@ export function getInjectionData(context: Context): {
   return {
     dynamicSamplingContext,
     traceId: propagationContext.traceId,
-    spanId: generateSpanId(),
+    spanId: undefined,
     sampled: propagationContext.sampled,
   };
 }