fix some tests

Author: s1gr1d

dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts

@@ -14,7 +14,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
   const transactionEvent = await pageloadTransactionEventPromise;
 
   expect(transactionEvent.contexts?.trace).toEqual({
-    data: {
+    data: expect.objectContaining({
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
@@ -38,7 +38,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'http.status_code': 200,
       'http.status_text': 'OK',
       'http.route': '/test-transaction',
-    },
+    }),
     op: 'http.server',
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     status: 'ok',

dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts

@@ -51,7 +51,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
   );
 
   expect(outboundTransaction.contexts?.trace).toEqual({
-    data: {
+    data: expect.objectContaining({
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
@@ -75,7 +75,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'http.status_code': 200,
       'http.status_text': 'OK',
       'http.route': '/test-outgoing-http/:id',
-    },
+    }),
     op: 'http.server',
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     status: 'ok',
@@ -84,7 +84,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
   });
 
   expect(inboundTransaction.contexts?.trace).toEqual({
-    data: {
+    data: expect.objectContaining({
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
@@ -106,7 +106,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'http.status_code': 200,
       'http.status_text': 'OK',
       'http.route': '/test-inbound-headers/:id',
-    },
+    }),
     op: 'http.server',
     parent_span_id: outgoingHttpSpanId,
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
@@ -165,7 +165,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
   );
 
   expect(outboundTransaction.contexts?.trace).toEqual({
-    data: {
+    data: expect.objectContaining({
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
@@ -189,7 +189,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
       'http.status_code': 200,
       'http.status_text': 'OK',
       'http.route': '/test-outgoing-fetch/:id',
-    },
+    }),
     op: 'http.server',
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     status: 'ok',

dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts

@@ -50,7 +50,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
   );
 
   expect(outboundTransaction.contexts?.trace).toEqual({
-    data: {
+    data: expect.objectContaining({
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
@@ -74,7 +74,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'http.status_code': 200,
       'http.status_text': 'OK',
       'http.route': '/test-outgoing-http/:id',
-    },
+    }),
     op: 'http.server',
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     status: 'ok',
@@ -83,7 +83,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
   });
 
   expect(inboundTransaction.contexts?.trace).toEqual({
-    data: {
+    data: expect.objectContaining({
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
@@ -105,7 +105,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'http.status_code': 200,
       'http.status_text': 'OK',
       'http.route': '/test-inbound-headers/:id',
-    },
+    }),
     op: 'http.server',
     parent_span_id: outgoingHttpSpanId,
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
@@ -164,7 +164,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
   );
 
   expect(outboundTransaction.contexts?.trace).toEqual({
-    data: {
+    data: expect.objectContaining({
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
@@ -188,7 +188,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
       'http.status_code': 200,
       'http.status_text': 'OK',
       'http.route': '/test-outgoing-fetch/:id',
-    },
+    }),
     op: 'http.server',
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     status: 'ok',

dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts

@@ -2,6 +2,18 @@ import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';
 import { createTestServer } from '../../../utils/server';
 
+function getCommonHttpRequestHeaders(): Record<string, unknown> {
+  return {
+    'http.request.header.accept': ['*/*'],
+    'http.request.header.accept_encoding': ['gzip, deflate'],
+    'http.request.header.accept_language': ['*'],
+    'http.request.header.connection': ['keep-alive'],
+    'http.request.header.host': [expect.any(String)],
+    'http.request.header.sec_fetch_mode': ['cors'],
+    'http.request.header.user_agent': ['node'],
+  };
+}
+
 describe('httpIntegration', () => {
   afterAll(() => {
     cleanupChildProcesses();
@@ -86,6 +98,7 @@ describe('httpIntegration', () => {
                 'sentry.sample_rate': 1,
                 'sentry.source': 'route',
                 url: `http://localhost:${port}/test`,
+                ...getCommonHttpRequestHeaders(),
               });
             },
           })
@@ -127,6 +140,9 @@ describe('httpIntegration', () => {
                 'sentry.sample_rate': 1,
                 'sentry.source': 'route',
                 url: `http://localhost:${port}/test`,
+                'http.request.header.content_length': ['9'],
+                'http.request.header.content_type': ['text/plain;charset=UTF-8'],
+                ...getCommonHttpRequestHeaders(),
               });
             },
           })

packages/cloudflare/test/request.test.ts

@@ -319,6 +319,7 @@ describe('withSentry', () => {
           'sentry.sample_rate': 1,
           'http.response.status_code': 200,
           'http.request.body.size': 10,
+          'http.request.header.content_length': ['10'],
         },
         op: 'http.server',
         origin: 'auto.http.cloudflare',

packages/core/src/utils/request.ts

@@ -129,7 +129,7 @@ function getAbsoluteUrl({
 }
 
 /**
- * Converts HTTP request headers to OpenTelemetry span attributes following semantic conventions.
+ * Converts incoming HTTP request headers to OpenTelemetry span attributes following semantic conventions.
  * Header names are converted to the format: http.request.header.<key>
  * where <key> is the header name in lowercase with dashes converted to underscores.
  *