Merge remote-tracking branch 'origin/v10' into backport/v10-25345-cloudflare-default-reexport

Co-Authored-By: Isaac Schlueter <isaac.schlueter@sentry.io>

Author: sentry-junior[bot]

CHANGELOG.md

@@ -4,6 +4,20 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+### Important Changes
+
+- **fix(v10/deps)!: Limit `@opentelemetry/api` to `<1.10.0` and the OpenTelemetry SDK to `<3.0.0` ([#25715](https://github.com/getsentry/sentry-javascript/pull/25715))**
+
+  **Breaking change**
+
+  If your app uses `@opentelemetry/api` 1.10.0 or OpenTelemetry SDK v3 together with v10 of the Sentry SDK, you must stay on `@opentelemetry/api` below 1.10.0 and OpenTelemetry SDK v2, or upgrade to v11.
+
+  `@opentelemetry/api` 1.10.0 only works with OpenTelemetry SDK v3 (`@opentelemetry/core` 3.x, `@opentelemetry/instrumentation` 0.300.x). The SDK v2 packages that v10 uses only support `@opentelemetry/api` below 1.10.0, and SDK v3 needs Node.js 22.15.0 or newer, while v10 supports Node.js 18 and newer. For this reason, v10 now limits `@opentelemetry/api` to `<1.10.0`, and the `@opentelemetry/instrumentation` and `@opentelemetry/exporter-trace-otlp-http` peer dependencies of `@sentry/node-core` to `<0.300.0`.
+
+  If your app depends on `@opentelemetry/api` directly, use a version below 1.10.0 (for example `~1.9.1`). With 1.10.0, your app and the Sentry SDK use different copies of the API, and the OpenTelemetry calls of your app do not see the tracer provider of the Sentry SDK.
+
+  To use `@opentelemetry/api` 1.10.0 and OpenTelemetry SDK v3, upgrade to v11 of the Sentry SDK. For the upgrade steps, see the [migration guide](https://docs.sentry.io/platforms/javascript/migration/v10-to-v11/).
+
 ## 10.77.0
 
 ### Important Changes

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

@@ -97,7 +97,7 @@ sentryTest(
       expect.arrayContaining([
         {
           ...expectedClickBreadcrumb,
-          message: 'body > div#error.btn.btn-error[aria-label="An Error in aria-label"]',
+          message: 'body > div#error.btn.btn-error[aria-label="** ***** ** **********"]',
           data: {
             nodeId: expect.any(Number),
             node: {
@@ -124,7 +124,7 @@ sentryTest(
       expect.arrayContaining([
         {
           ...expectedClickBreadcrumb,
-          message: 'body > button#img-button[title="Button title"]',
+          message: 'body > button#img-button[title="****** *****"]',
           data: {
             nodeId: expect.any(Number),
             node: {

dev-packages/e2e-tests/test-applications/aws-serverless-layer/src/lambda-functions-layer/Callback/index.js

@@ -1,9 +1,19 @@
 // Callback-style handler `(event, context, callback)` to exercise the wrapped-callback span path.
+// `event.callbackDelayMs` makes the handler return before it calls back, like most real callback-style handlers.
 exports.handler = (event, context, callback) => {
-  if (event.shouldError) {
-    callback(new Error('callback error'));
+  const respond = () => {
+    if (event.shouldError) {
+      callback(new Error('callback error'));
+      return;
+    }
+
+    callback(null, { ok: true });
+  };
+
+  if (event.callbackDelayMs) {
+    setTimeout(respond, event.callbackDelayMs);
     return;
   }
 
-  callback(null, { ok: true });
+  respond();
 };

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

@@ -312,6 +312,48 @@ test.describe('Lambda layer', () => {
     );
   });
 
+  test('ends the span when a callback-style handler calls back after it returned', async ({ lambdaClient }) => {
+    const transactionEventPromise = waitForTransaction('aws-serverless-layer', transactionEvent => {
+      return transactionEvent?.transaction === 'LayerCallback';
+    });
+
+    await lambdaClient.send(
+      new InvokeCommand({
+        FunctionName: 'LayerCallback',
+        Payload: JSON.stringify({ callbackDelayMs: 200 }),
+      }),
+    );
+
+    const transactionEvent = await transactionEventPromise;
+
+    expect(transactionEvent.contexts?.trace?.status).toBe('ok');
+    expect(transactionEvent.timestamp! - transactionEvent.start_timestamp!).toBeGreaterThanOrEqual(0.2);
+  });
+
+  test('sets error status when a callback-style handler calls back with an error after it returned', async ({
+    lambdaClient,
+  }) => {
+    const errorEventPromise = waitForError('aws-serverless-layer', errorEvent => {
+      return errorEvent?.exception?.values?.[0]?.value === 'callback error';
+    });
+    const transactionEventPromise = waitForTransaction('aws-serverless-layer', transactionEvent => {
+      return transactionEvent?.transaction === 'LayerCallback';
+    });
+
+    await lambdaClient.send(
+      new InvokeCommand({
+        FunctionName: 'LayerCallback',
+        Payload: JSON.stringify({ shouldError: true, callbackDelayMs: 200 }),
+      }),
+    );
+
+    const [errorEvent, transactionEvent] = await Promise.all([errorEventPromise, transactionEventPromise]);
+
+    expect(transactionEvent.contexts?.trace?.status).toBe('internal_error');
+    expect(transactionEvent.timestamp! - transactionEvent.start_timestamp!).toBeGreaterThanOrEqual(0.2);
+    expect(errorEvent.contexts?.trace?.trace_id).toBe(transactionEvent.contexts?.trace?.trace_id);
+  });
+
   test('continues a trace from incoming headers', async ({ lambdaClient }) => {
     const traceId = 'd4cda95b652f4a1592b449d5929fda1b';
     const parentSpanId = '6e0c63257de34c92';

dev-packages/e2e-tests/test-applications/deno-streamed/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@sentry/deno": "file:../../packed/sentry-deno-packed.tgz",
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": ">=1.9.0 <1.10.0",
     "ai": "^3.0.0",
     "zod": "^3.22.4"
   },

dev-packages/e2e-tests/test-applications/deno/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@sentry/deno": "file:../../packed/sentry-deno-packed.tgz",
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": ">=1.9.0 <1.10.0",
     "ai": "^3.0.0",
     "zod": "^3.22.4"
   },

dev-packages/e2e-tests/test-applications/nextjs-custom-otel/package.json

@@ -19,7 +19,7 @@
     "test:assert-webpack": "pnpm test:prod && pnpm test:dev-webpack"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.1",
+    "@opentelemetry/api": ">=1.9.1 <1.10.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.220.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.220.0",
     "@opentelemetry/resources": "^2.9.0",

dev-packages/e2e-tests/test-applications/node-core-express-otel-v1-custom-sampler/package.json

@@ -11,7 +11,7 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": ">=1.9.0 <1.10.0",
     "@opentelemetry/core": "^1.30.1",
     "@opentelemetry/instrumentation": "^0.57.1",
     "@opentelemetry/instrumentation-http": "^0.57.1",

dev-packages/e2e-tests/test-applications/node-core-express-otel-v1-sdk-node/package.json

@@ -11,7 +11,7 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": ">=1.9.0 <1.10.0",
     "@opentelemetry/core": "^1.30.1",
     "@opentelemetry/instrumentation": "^0.57.2",
     "@opentelemetry/instrumentation-http": "^0.57.2",

dev-packages/e2e-tests/test-applications/node-core-express-otel-v1/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@sentry/node-core": "file:../../packed/sentry-node-core-packed.tgz",
     "@sentry/opentelemetry": "file:../../packed/sentry-opentelemetry-packed.tgz",
-    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api": ">=1.9.0 <1.10.0",
     "@opentelemetry/core": "^1.30.1",
     "@opentelemetry/instrumentation": "^0.57.1",
     "@opentelemetry/instrumentation-http": "^0.57.1",