test: Ensure we properly test trace & span IDs

Author: mydea

dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts

@@ -43,6 +43,8 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
       version: expect.any(String),
       packages: [{ name: expect.any(String), version: expect.any(String) }],
     },
-    contexts: { trace: { trace_id: expect.any(String), span_id: expect.any(String) } },
+    contexts: {
+      trace: { trace_id: expect.stringMatching(/[a-f0-9]{32}/), span_id: expect.stringMatching(/[a-f0-9]{16}/) },
+    },
   });
 });

dev-packages/browser-integration-tests/suites/replay/dsc/test.ts

@@ -58,7 +58,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.any(String),
+      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       replay_id: replay.session?.id,
       sampled: 'true',
@@ -105,7 +105,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.any(String),
+      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       sampled: 'true',
     });
@@ -157,7 +157,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.any(String),
+      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       replay_id: replay.session?.id,
       sampled: 'true',
@@ -199,7 +199,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.any(String),
+      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       sampled: 'true',
     });
@@ -240,7 +240,7 @@ sentryTest('should add replay_id to error DSC while replay is active', async ({
   expect(error1Header.trace).toBeDefined();
   expect(error1Header.trace).toEqual({
     environment: 'production',
-    trace_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     public_key: 'public',
     replay_id: replay.session?.id,
     ...(hasTracing
@@ -261,7 +261,7 @@ sentryTest('should add replay_id to error DSC while replay is active', async ({
   expect(error2Header.trace).toBeDefined();
   expect(error2Header.trace).toEqual({
     environment: 'production',
-    trace_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     public_key: 'public',
     ...(hasTracing
       ? {

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts

@@ -35,7 +35,7 @@ sentryTest('should create fetch spans with http timing @firefox', async ({ brows
     expect(span).toMatchObject({
       description: `GET http://example.com/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,

dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts

@@ -24,7 +24,7 @@ sentryTest(
       environment: 'production',
       sample_rate: '1',
       transaction: expect.stringContaining('/index.html'),
-      trace_id: expect.any(String),
+      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       sampled: 'true',
     });

dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts

@@ -27,7 +27,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.any(String),
+      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       sampled: 'true',
     });

dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts

@@ -24,7 +24,7 @@ sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, p
     expect(span).toMatchObject({
       description: `GET /test-req/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,

dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts

@@ -28,7 +28,7 @@ sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, p
     expect(span).toMatchObject({
       description: `GET http://example.com/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,

dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts

@@ -24,7 +24,7 @@ sentryTest('should create spans for xhr requests', async ({ getLocalTestUrl, pag
     expect(span).toMatchObject({
       description: `GET /test-req/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,

dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts

@@ -20,7 +20,7 @@ sentryTest('should create spans for XHR requests', async ({ getLocalTestUrl, pag
     expect(span).toMatchObject({
       description: `GET http://example.com/${index}`,
       parent_span_id: eventData.contexts?.trace?.span_id,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: eventData.contexts?.trace?.trace_id,

dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/tests/basic.test.ts

@@ -37,9 +37,9 @@ test('Lambda layer SDK bundle sends events', async ({ request }) => {
     },
     op: 'function.aws.lambda',
     origin: 'auto.otel.aws-lambda',
-    span_id: expect.any(String),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
     status: 'ok',
-    trace_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
   });
 
   expect(transactionEvent.spans).toHaveLength(2);