test fixes

Author: AbhiPrasad

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts

@@ -28,12 +28,11 @@ app.use(cors());
 app.get('/test/express', (_req, res) => {
   // eslint-disable-next-line deprecation/deprecation
   const transaction = Sentry.getCurrentScope().getTransaction();
-  if (transaction) {
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.traceId = '86f39e84263a4de99c326acab3bfe3bd';
-  }
+  const traceId = transaction?.spanContext().traceId;
   const headers = http.get('http://somewhere.not.sentry/').getHeaders();
-
+  if (traceId) {
+    headers['baggage'] = (headers['baggage'] as string).replace(traceId, '__SENTRY_TRACE_ID__')
+  }
   // Responding with the headers outgoing request headers back to the assertions.
   res.send({ test_data: headers });
 });

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts

@@ -16,7 +16,7 @@ test('should attach a baggage header to an outgoing request.', async () => {
       host: 'somewhere.not.sentry',
       baggage:
         'sentry-environment=prod,sentry-release=1.0,sentry-public_key=public' +
-        ',sentry-trace_id=86f39e84263a4de99c326acab3bfe3bd,sentry-sample_rate=1,sentry-transaction=GET%20%2Ftest%2Fexpress' +
+        ',sentry-trace_id=__SENTRY_TRACE_ID__,sentry-sample_rate=1,sentry-transaction=GET%20%2Ftest%2Fexpress' +
         ',sentry-sampled=true',
     },
   });

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts

@@ -32,13 +32,9 @@ app.use(cors());
 app.get('/test/express', (_req, res) => {
   // eslint-disable-next-line deprecation/deprecation
   const transaction = Sentry.getCurrentScope().getTransaction();
-  if (transaction) {
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.traceId = '86f39e84263a4de99c326acab3bfe3bd';
-    transaction.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
-  }
-  const headers = http.get('http://somewhere.not.sentry/').getHeaders();
+  transaction?.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
 
+  const headers = http.get('http://somewhere.not.sentry/').getHeaders();
   // Responding with the headers outgoing request headers back to the assertions.
   res.send({ test_data: headers });
 });

packages/core/test/lib/tracing/sentrySpan.test.ts

@@ -32,7 +32,7 @@ describe('SentrySpan', () => {
       // eslint-disable-next-line deprecation/deprecation
       const span2 = span.startChild();
       expect(spanToJSON(span2).parent_span_id).toBe(span.spanContext().spanId);
-      expect(span.spanContext().traceId).toBe(span.spanContext().traceFlags);
+      expect(span.spanContext().traceId).toBe(span.spanContext().traceId);
       expect(spanIsSampled(span2)).toBe(spanIsSampled(span));
     });
   });