Merge branch 'develop' into nh/array-attribute-support

nicohrubec · web-flow · commit 20adc34b8e99 · 2026-05-04T15:58:03.000+02:00
diff --git a/dev-packages/cloudflare-integration-tests/runner.ts b/dev-packages/cloudflare-integration-tests/runner.ts
@@ -208,22 +208,33 @@ export function createRunner(...paths: string[]) {
 
           if (process.env.DEBUG) log('Starting scenario', testPath);
 
-          const stdio: ('inherit' | 'ipc' | 'ignore')[] = process.env.DEBUG
-            ? ['inherit', 'inherit', 'inherit', 'ipc']
-            : ['ignore', 'ignore', 'ignore', 'ipc'];
-
           const onChildError = (e: Error) => {
             // eslint-disable-next-line no-console
             console.error('Error starting child process:', e);
             reject(e);
           };
 
-          function onChildMessage(message: string, onReady?: (port: number) => void): void {
-            const msg = JSON.parse(message) as { event: string; port?: number };
-            if (msg.event === 'DEV_SERVER_READY' && typeof msg.port === 'number') {
-              if (process.env.DEBUG) log('worker ready on port', msg.port);
-              onReady?.(msg.port);
-            }
+          // Inspired by workers-sdk: https://github.com/cloudflare/workers-sdk/blob/main/packages/wrangler/e2e/helpers/wrangler.ts
+          function waitForReady(childProcess: ReturnType<typeof spawn>): Promise<number> {
+            return new Promise((resolve, reject) => {
+              const stdout = childProcess.stdout;
+              if (!stdout) {
+                reject(new Error('No stdout available'));
+                return;
+              }
+
+              let output = '';
+              stdout.on('data', (chunk: Buffer) => {
+                const text = chunk.toString();
+                if (process.env.DEBUG) process.stdout.write(text);
+                output += text;
+
+                const match = output.match(/Ready on (https?:\/\/[^\s]+)/);
+                if (match?.[1]) {
+                  resolve(parseInt(new URL(match[1]).port, 10));
+                }
+              });
+            });
           }
 
           if (existsSync(join(testPath, 'wrangler-sub-worker.jsonc'))) {
@@ -242,17 +253,15 @@ export function createRunner(...paths: string[]) {
                 '--inspector-port',
                 '0',
               ],
-              { stdio, signal },
+              { stdio: ['ignore', 'pipe', 'inherit'], signal },
             );
 
-            // Wait for the sub-worker to be ready before starting the main worker
-            await new Promise<void>((resolveSubWorker, rejectSubWorker) => {
-              childSubWorker!.on('message', (msg: string) => onChildMessage(msg, () => resolveSubWorker()));
-              childSubWorker!.on('error', rejectSubWorker);
-              childSubWorker!.on('exit', code => {
-                rejectSubWorker(new Error(`Sub-worker exited with code ${code}`));
-              });
+            childSubWorker.on('error', onChildError);
+            childSubWorker.on('exit', code => {
+              onChildError(new Error(`Sub-worker exited with code ${code}`));
             });
+
+            await waitForReady(childSubWorker);
           }
 
           child = spawn(
@@ -273,7 +282,7 @@ export function createRunner(...paths: string[]) {
               '0',
               ...extraWranglerArgs,
             ],
-            { stdio, signal },
+            { stdio: ['ignore', 'pipe', 'inherit'], signal },
           );
 
           CLEANUP_STEPS.add(() => {
@@ -283,7 +292,10 @@ export function createRunner(...paths: string[]) {
 
           childSubWorker?.on('error', onChildError);
           child.on('error', onChildError);
-          child.on('message', (msg: string) => onChildMessage(msg, setWorkerPort));
+
+          const workerPort = await waitForReady(child);
+
+          setWorkerPort(workerPort);
         })
         .catch(e => reject(e));
 
diff --git a/dev-packages/e2e-tests/test-applications/browser-webworker-vite/package.json b/dev-packages/e2e-tests/test-applications/browser-webworker-vite/package.json
@@ -15,7 +15,7 @@
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "~5.8.3",
-    "vite": "^7.0.4"
+    "vite": "^7.3.2"
   },
   "dependencies": {
     "@sentry/browser": "file:../../packed/sentry-browser-packed.tgz",
diff --git a/dev-packages/e2e-tests/test-applications/deno-streamed/package.json b/dev-packages/e2e-tests/test-applications/deno-streamed/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "start": "deno run --allow-net --allow-env --allow-read src/app.ts",
+    "start": "deno run --allow-net --allow-env --allow-read --allow-sys src/app.ts",
     "test": "playwright test",
     "clean": "npx rimraf node_modules pnpm-lock.yaml",
     "test:build": "pnpm install",
diff --git a/dev-packages/e2e-tests/test-applications/deno-streamed/tests/spans.test.ts b/dev-packages/e2e-tests/test-applications/deno-streamed/tests/spans.test.ts
@@ -3,6 +3,10 @@ import { waitForStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
 
 const SEGMENT_SPAN = {
   attributes: {
+    'app.start_time': {
+      type: 'string',
+      value: expect.any(String),
+    },
     'client.address': {
       type: 'string',
       value: expect.any(String),
@@ -11,6 +15,11 @@ const SEGMENT_SPAN = {
       type: 'integer',
       value: expect.any(Number),
     },
+    // TODO: 'device.archs' is set but arrays are not yet serialized in span attributes
+    'device.processor_count': {
+      type: 'integer',
+      value: expect.any(Number),
+    },
     'http.request.header.accept': {
       type: 'string',
       value: '*/*',
@@ -51,6 +60,14 @@ const SEGMENT_SPAN = {
       type: 'integer',
       value: expect.any(Number),
     },
+    'os.name': {
+      type: 'string',
+      value: expect.any(String),
+    },
+    'os.version': {
+      type: 'string',
+      value: expect.any(String),
+    },
     'sentry.environment': {
       type: 'string',
       value: 'qa',
@@ -115,6 +132,14 @@ const SEGMENT_SPAN = {
       type: 'string',
       value: 'node',
     },
+    'process.runtime.engine.name': {
+      type: 'string',
+      value: 'v8',
+    },
+    'process.runtime.engine.version': {
+      type: 'string',
+      value: expect.any(String),
+    },
   },
   end_timestamp: expect.any(Number),
   is_segment: true,
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
@@ -35,7 +35,7 @@
     "@types/react-dom": "^19.1.2",
     "tailwindcss": "^4.1.4",
     "typescript": "^5.8.3",
-    "vite": "^6.3.3",
+    "vite": "^6.4.2",
     "vite-tsconfig-paths": "^5.1.4"
   },
   "browserslist": {
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/package.json
@@ -35,7 +35,7 @@
     "@types/react-dom": "^19.1.2",
     "tailwindcss": "^4.1.4",
     "typescript": "^5.8.3",
-    "vite": "^6.3.3",
+    "vite": "^6.4.2",
     "vite-tsconfig-paths": "^5.1.4"
   },
   "browserslist": {
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-spa/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-spa/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
-    "vite": "^6.0.1",
+    "vite": "^6.4.2",
     "@vitejs/plugin-react": "^4.3.4",
     "typescript": "~5.0.0"
   },
diff --git a/dev-packages/e2e-tests/test-applications/solid-tanstack-router/package.json b/dev-packages/e2e-tests/test-applications/solid-tanstack-router/package.json
@@ -25,7 +25,7 @@
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.7.2",
-    "vite": "^7.1.7",
+    "vite": "^7.3.2",
     "vite-plugin-solid": "^2.11.2"
   },
   "volta": {
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2-kit-tracing/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-2-kit-tracing/package.json
@@ -28,7 +28,7 @@
     "svelte-check": "^4.3.1",
     "tslib": "^2.4.1",
     "typescript": "^5.0.0",
-    "vite": "^7.1.3"
+    "vite": "^7.3.2"
   },
   "type": "module",
   "volta": {
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json
@@ -25,7 +25,7 @@
     "svelte": "^5.20.2",
     "svelte-check": "^4.1.4",
     "typescript": "^5.0.0",
-    "vite": "^6.1.1",
+    "vite": "^6.4.2",
     "wrangler": "^4.61.0"
   },
   "volta": {
diff --git a/package.json b/package.json
@@ -122,9 +122,9 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@rollup/pluginutils": "^5.1.0",
+    "@size-limit/esbuild": "~12.1.0",
     "@size-limit/file": "~12.1.0",
     "@size-limit/webpack": "~12.1.0",
-    "@size-limit/esbuild": "~12.1.0",
     "@types/jsdom": "^21.1.6",
     "@types/node": "^18.19.1",
     "@vitest/coverage-v8": "^3.2.4",
@@ -142,7 +142,7 @@
     "rimraf": "^5.0.10",
     "rollup": "^4.59.0",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-license": "^3.3.1",
+    "rollup-plugin-license": "^3.7.1",
     "size-limit": "~12.1.0",
     "sucrase": "^3.35.0",
     "ts-node": "10.9.2",
diff --git a/packages/deno/src/integrations/context.ts b/packages/deno/src/integrations/context.ts
@@ -1,5 +1,5 @@
-import type { Event, IntegrationFn } from '@sentry/core';
-import { defineIntegration } from '@sentry/core';
+import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration, safeSetSpanJSONAttributes } from '@sentry/core';
 
 const INTEGRATION_NAME = 'DenoContext';
 
@@ -22,41 +22,54 @@ async function getOSRelease(): Promise<string | undefined> {
     : undefined;
 }
 
-async function addDenoRuntimeContext(event: Event): Promise<Event> {
-  event.contexts = {
-    ...{
-      app: {
-        app_start_time: new Date(Date.now() - performance.now()).toISOString(),
-      },
-      device: {
-        arch: Deno.build.arch,
-        // eslint-disable-next-line no-restricted-globals
-        processor_count: navigator.hardwareConcurrency,
-      },
-      os: {
-        name: getOSName(),
-        version: await getOSRelease(),
-      },
-      v8: {
-        name: 'v8',
-        version: Deno.version.v8,
-      },
-      typescript: {
-        name: 'TypeScript',
-        version: Deno.version.typescript,
-      },
-    },
-    ...event.contexts,
+const _denoContextIntegration = (() => {
+  const appStartTime = new Date(Date.now() - performance.now()).toISOString();
+  const osName = getOSName();
+  const arch = Deno.build.arch;
+  // eslint-disable-next-line no-restricted-globals
+  const processorCount = navigator.hardwareConcurrency;
+  const v8Version = Deno.version.v8;
+  const tsVersion = Deno.version.typescript;
+
+  const cachedContext = {
+    app: { app_start_time: appStartTime },
+    device: { arch, processor_count: processorCount },
+    os: { name: osName } as { name: string; version?: string },
+    v8: { name: 'v8', version: v8Version },
+    typescript: { name: 'TypeScript', version: tsVersion },
   };
 
-  return event;
-}
+  const cachedSpanAttributes: Record<string, unknown> = {
+    'app.start_time': appStartTime,
+    // Convention uses 'device.archs' (string[]), but array attributes are not yet serialized.
+    // Once array serialization lands, this will start appearing on spans automatically.
+    'device.archs': [arch],
+    'device.processor_count': processorCount,
+    'os.name': osName,
+    'process.runtime.engine.name': 'v8',
+    'process.runtime.engine.version': v8Version,
+  };
+
+  getOSRelease()
+    .then(release => {
+      cachedContext.os.version = release;
+      cachedSpanAttributes['os.version'] = release;
+    })
+    .catch(() => {
+      // Ignore - os.version will be undefined
+    });
 
-const _denoContextIntegration = (() => {
   return {
     name: INTEGRATION_NAME,
     processEvent(event) {
-      return addDenoRuntimeContext(event);
+      event.contexts = {
+        ...cachedContext,
+        ...event.contexts,
+      };
+      return event;
+    },
+    processSegmentSpan(span) {
+      safeSetSpanJSONAttributes(span, cachedSpanAttributes);
     },
   };
 }) satisfies IntegrationFn;
diff --git a/packages/opentelemetry/src/resource.ts b/packages/opentelemetry/src/resource.ts
@@ -39,18 +39,58 @@ class SentryResource {
   }
 }
 
+/**
+ * Parses `OTEL_RESOURCE_ATTRIBUTES` env var (comma-separated `key=value` pairs).
+ * Values are URL-decoded per the OTel spec.
+ */
+function parseOtelResourceAttributes(raw: string | undefined): Attributes {
+  if (!raw) {
+    return {};
+  }
+  const result: Attributes = {};
+  for (const pair of raw.split(',')) {
+    const eq = pair.indexOf('=');
+    if (eq === -1) {
+      continue;
+    }
+    const key = pair.substring(0, eq).trim();
+    const value = pair.substring(eq + 1).trim();
+    if (key) {
+      try {
+        result[key] = decodeURIComponent(value);
+      } catch {
+        result[key] = value;
+      }
+    }
+  }
+  return result;
+}
+
 /**
  * Returns a Resource for use in Sentry's OpenTelemetry TracerProvider setup.
  *
  * Combines the default OTel SDK telemetry attributes with Sentry-specific
  * service attributes, equivalent to what was previously done via:
  * `defaultResource().merge(resourceFromAttributes({ ... }))`
+ *
+ * Respects OTEL_SERVICE_NAME and OTEL_RESOURCE_ATTRIBUTES environment variables
+ * per the OpenTelemetry specification.
  */
-export function getSentryResource(serviceName: string): SentryResource {
+export function getSentryResource(serviceNameFallback: string): SentryResource {
+  const env = typeof process !== 'undefined' ? process.env : {};
+  const otelServiceName = env.OTEL_SERVICE_NAME;
+  const otelResourceAttrs = parseOtelResourceAttributes(env.OTEL_RESOURCE_ATTRIBUTES);
+
   return new SentryResource({
-    [ATTR_SERVICE_NAME]: serviceName,
+    // Lowest priority: Sentry defaults
     // eslint-disable-next-line deprecation/deprecation
     [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
+    [ATTR_SERVICE_NAME]: serviceNameFallback,
+    // OTEL_RESOURCE_ATTRIBUTES overrides defaults (including service.name and service.namespace)
+    ...otelResourceAttrs,
+    // OTEL_SERVICE_NAME explicitly overrides service.name
+    ...(otelServiceName ? { [ATTR_SERVICE_NAME]: otelServiceName } : {}),
+    // Highest priority: Sentry SDK telemetry attrs (cannot be overridden by env vars)
     [ATTR_SERVICE_VERSION]: SDK_VERSION,
     [ATTR_TELEMETRY_SDK_LANGUAGE]: SDK_INFO[ATTR_TELEMETRY_SDK_LANGUAGE],
     [ATTR_TELEMETRY_SDK_NAME]: SDK_INFO[ATTR_TELEMETRY_SDK_NAME],
diff --git a/packages/opentelemetry/test/resource.test.ts b/packages/opentelemetry/test/resource.test.ts
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
diff --git a/packages/remix/package.json b/packages/remix/package.json
diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json
diff --git a/yarn.lock b/yarn.lock
