test: Ensure we properly test trace & span IDs

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);

dev-packages/e2e-tests/test-applications/aws-serverless-esm/tests/basic.test.ts

@@ -34,9 +34,9 @@ test('AWS Serverless SDK sends events in ESM mode', async ({ request }) => {
     },
     op: 'function.aws.lambda',
     origin: 'auto.function.serverless',
-    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);

dev-packages/e2e-tests/test-applications/create-next-app/tests/client-errors.test.ts

@@ -24,7 +24,7 @@ test('Sends a client-side exception to Sentry', async ({ page }) => {
   expect(errorEvent.transaction).toEqual('/');
 
   expect(errorEvent.contexts?.trace).toEqual({
-    trace_id: expect.any(String),
-    span_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
   });
 });

dev-packages/e2e-tests/test-applications/create-next-app/tests/client-transactions.test.ts

@@ -20,8 +20,8 @@ test('Sends a pageload transaction to Sentry', async ({ page }) => {
           version: '18.2.0',
         },
         trace: {
-          span_id: expect.any(String),
-          trace_id: expect.any(String),
+          span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           op: 'pageload',
           origin: 'auto.pageload.nextjs.pages_router_instrumentation',
           data: expect.objectContaining({
@@ -65,8 +65,8 @@ test('captures a navigation transcation to Sentry', async ({ page }) => {
           version: '18.2.0',
         },
         trace: {
-          span_id: expect.any(String),
-          trace_id: expect.any(String),
+          span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           op: 'navigation',
           origin: 'auto.navigation.nextjs.pages_router_instrumentation',
           data: expect.objectContaining({

dev-packages/e2e-tests/test-applications/create-next-app/tests/server-errors.test.ts

@@ -25,7 +25,7 @@ test('Sends a server-side exception to Sentry', async ({ baseURL }) => {
   expect(errorEvent.transaction).toEqual('GET /api/error');
 
   expect(errorEvent.contexts?.trace).toEqual({
-    trace_id: expect.any(String),
-    span_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
   });
 });

dev-packages/e2e-tests/test-applications/create-next-app/tests/server-transactions.test.ts

@@ -19,8 +19,8 @@ test('Sends server-side transactions to Sentry', async ({ baseURL }) => {
       type: 'transaction',
       contexts: expect.objectContaining({
         trace: {
-          span_id: expect.any(String),
-          trace_id: expect.any(String),
+          span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           op: 'http.server',
           origin: 'auto.http.nextjs',
           data: expect.objectContaining({
@@ -41,7 +41,7 @@ test('Sends server-side transactions to Sentry', async ({ baseURL }) => {
           description: 'test-span',
           origin: 'manual',
           parent_span_id: transactionEvent.contexts?.trace?.span_id,
-          span_id: expect.any(String),
+          span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           status: 'ok',
           timestamp: expect.any(Number),

dev-packages/e2e-tests/test-applications/create-remix-app/tests/client-inp.test.ts

@@ -34,12 +34,12 @@ test('sends an INP span during pageload', async ({ page }) => {
     },
     description: 'body > div > input#exception-button[type="button"]',
     op: 'ui.interaction.click',
-    parent_span_id: expect.any(String),
+    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
     is_segment: true,
-    span_id: expect.any(String),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
-    trace_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.http.browser.inp',
     exclusive_time: expect.any(Number),
     measurements: { inp: { unit: 'millisecond', value: expect.any(Number) } },
@@ -86,12 +86,12 @@ test('sends an INP span after pageload', async ({ page }) => {
     },
     description: 'body > div > input#exception-button[type="button"]',
     op: 'ui.interaction.click',
-    parent_span_id: expect.any(String),
+    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
     is_segment: true,
-    span_id: expect.any(String),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
-    trace_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.http.browser.inp',
     exclusive_time: expect.any(Number),
     measurements: { inp: { unit: 'millisecond', value: expect.any(Number) } },
@@ -131,11 +131,11 @@ test('sends an INP span during navigation', async ({ page }) => {
     },
     description: '<unknown>',
     op: 'ui.interaction.click',
-    parent_span_id: expect.any(String),
-    span_id: expect.any(String),
+    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
-    trace_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.http.browser.inp',
     exclusive_time: expect.any(Number),
     measurements: { inp: { unit: 'millisecond', value: expect.any(Number) } },
@@ -186,10 +186,10 @@ test('sends an INP span after navigation', async ({ page }) => {
     description: '<unknown>',
     op: 'ui.interaction.click',
     is_segment: true,
-    span_id: expect.any(String),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
-    trace_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.http.browser.inp',
     exclusive_time: expect.any(Number),
     measurements: { inp: { unit: 'millisecond', value: expect.any(Number) } },

dev-packages/e2e-tests/test-applications/default-browser/tests/errors.test.ts

@@ -24,8 +24,8 @@ test('captures an error', async ({ page }) => {
   });
 
   expect(errorEvent.contexts?.trace).toEqual({
-    trace_id: expect.any(String),
-    span_id: expect.any(String),
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
   });
 });
 

dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

@@ -157,7 +157,7 @@ test('captures correct spans for navigation', async ({ page }) => {
     op: 'ui.ember.transition',
     origin: 'auto.ui.ember',
     parent_span_id: spanId,
-    span_id: expect.any(String),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: traceId,
@@ -174,7 +174,7 @@ test('captures correct spans for navigation', async ({ page }) => {
       op: 'ui.ember.route.before_model',
       origin: 'auto.ui.ember',
       parent_span_id: spanId,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -189,7 +189,7 @@ test('captures correct spans for navigation', async ({ page }) => {
       op: 'ui.ember.route.before_model',
       origin: 'auto.ui.ember',
       parent_span_id: spanId,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -207,7 +207,7 @@ test('captures correct spans for navigation', async ({ page }) => {
       op: 'ui.ember.route.model',
       origin: 'auto.ui.ember',
       parent_span_id: spanId,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -222,7 +222,7 @@ test('captures correct spans for navigation', async ({ page }) => {
       op: 'ui.ember.route.model',
       origin: 'auto.ui.ember',
       parent_span_id: spanId,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -240,7 +240,7 @@ test('captures correct spans for navigation', async ({ page }) => {
       op: 'ui.ember.route.after_model',
       origin: 'auto.ui.ember',
       parent_span_id: spanId,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -255,7 +255,7 @@ test('captures correct spans for navigation', async ({ page }) => {
       op: 'ui.ember.route.after_model',
       origin: 'auto.ui.ember',
       parent_span_id: spanId,
-      span_id: expect.any(String),
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -271,7 +271,7 @@ test('captures correct spans for navigation', async ({ page }) => {
     op: 'ui.ember.runloop.render',
     origin: 'auto.ui.ember',
     parent_span_id: spanId,
-    span_id: expect.any(String),
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: traceId,