Merge remote-tracking branch 'upstream/develop' into timfish/feat/pino-integration

Author: timfish

.claude/settings.local.json .claude/settings.json.claude/settings.local.json renamed to .claude/settings.json

@@ -133,6 +133,16 @@ body:
       description: Logs? Screenshots? Yes, please.
     validations:
       required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description:
+        Add any other context here. Please keep the pre-filled text, which helps us manage issue prioritization.
+      value: |-
+        <sub>Tip: React with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it.</sub>
+    validations:
+      required: false
   - type: markdown
     attributes:
       value: |-

.github/ISSUE_TEMPLATE/bug.yml

@@ -23,6 +23,16 @@ body:
         Add a blender to Sentry.
     validations:
       required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description:
+        Add any other context here. Please keep the pre-filled text, which helps us manage feature prioritization.
+      value: |-
+        <sub>Tip: React with 👍 to help prioritize this improvement. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it.</sub>
+    validations:
+      required: false
   - type: markdown
     attributes:
       value: |-

.github/ISSUE_TEMPLATE/feature.yml

@@ -233,7 +233,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '154 KB',
+    limit: '156 KB',
   },
   {
     name: '@sentry/node - without tracing',
@@ -263,7 +263,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '107 KB',
+    limit: '111 KB',
   },
 ];
 

.size-limit.js

@@ -4,6 +4,46 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+### Important Changes
+
+- **feat(node) Ensure `prismaIntegration` works with Prisma 5 ([#17595](https://github.com/getsentry/sentry-javascript/pull/17595))**
+
+We used to require to pass in the v5 version of `@prisma/instrumentation` into `prismaIntegration({ prismaInstrumentation: new PrismaInstrumentation() })`, if you wanted to get full instrumentation for Prisma v5. However, it turns out this does not work on v10 of the SDK anymore, because `@prisma/instrumentation@5` requires OTEL v1.
+
+With this release, we dropped the requirement to configure anything to get v5 support of Prisma. You do not need to configure anything in the integration anymore, and can remove the dependency on `@prisma/instrumentation@5` if you had it in your application. You only need to configure the `tracing` preview feature [according to our docs](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/prisma/).
+
+- **feat(deps): Update OpenTelemetry dependencies ([#17558](https://github.com/getsentry/sentry-javascript/pull/17558))**
+  - @opentelemetry/core bumped to ^2.1.0
+  - @opentelemetry/context-async-hooks bumped to ^2.1.0
+  - @opentelemetry/resources bumped to ^2.1.0
+  - @opentelemetry/sdk-trace-base bumped to ^2.1.0
+  - @opentelemetry/semantic-conventions bumped to ^1.37.0
+  - @opentelemetry/instrumentation bumped to ^0.204.0
+  - @opentelemetry/instrumentation-http bumped to ^0.204.0
+  - @opentelemetry/instrumentation-amqplib bumped to ^0.51.0
+  - @opentelemetry/instrumentation-aws-sdk bumped to ^0.59.0
+  - @opentelemetry/instrumentation-connect bumped to ^0.48.0
+  - @opentelemetry/instrumentation-dataloader bumped to ^0.22.0
+  - @opentelemetry/instrumentation-express bumped to ^0.53.0
+  - @opentelemetry/instrumentation-fs bumped from to ^0.24.0
+  - @opentelemetry/instrumentation-generic-pool bumped to ^0.48.0
+  - @opentelemetry/instrumentation-graphql bumped to ^0.52.0
+  - @opentelemetry/instrumentation-hapi bumped to ^0.51.0
+  - @opentelemetry/instrumentation-ioredis bumped to ^0.52.0
+  - @opentelemetry/instrumentation-kafkajs bumped to ^0.14.0
+  - @opentelemetry/instrumentation-knex bumped to ^0.49.0
+  - @opentelemetry/instrumentation-koa bumped to ^0.52.0
+  - @opentelemetry/instrumentation-lru-memoizer bumped to ^0.49.0
+  - @opentelemetry/instrumentation-mongodb bumped from to ^0.57.0
+  - @opentelemetry/instrumentation-mongoose bumped from to ^0.51.0
+  - @opentelemetry/instrumentation-mysql bumped to ^0.50.0
+  - @opentelemetry/instrumentation-mysql2 bumped to ^0.51.0
+  - @opentelemetry/instrumentation-nestjs-core bumped to ^0.50.0
+  - @opentelemetry/instrumentation-pg bumped to ^0.57.0
+  - @opentelemetry/instrumentation-redis bumped to ^0.53.0
+  - @opentelemetry/instrumentation-undici bumped to ^0.15.0
+  - @prisma/instrumentation bumped to 6.15.0
+
 ## 10.11.0
 
 ### Important Changes

CHANGELOG.md

@@ -30,10 +30,13 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
       const clientReportPromise = waitForClientReportRequest(page);
 
       await sentryTest.step('Initial pageload', async () => {
+        // negative sampling decision -> no pageload txn
         await page.goto(url);
       });
 
       await sentryTest.step('Make fetch request', async () => {
+        // The fetch requests starts a new trace on purpose. So we only want the
+        // sampling decision and rand to be the same as from the meta tag but not the trace id or DSC
         const tracingHeadersPromise = waitForTracingHeadersOnUrl(page, 'http://sentry-test-external.io');
 
         await page.locator('#btn2').click();

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-precedence/test.ts

@@ -1 +1,2 @@
-fetch('http://sentry-test-site.example/0').then();
+fetch('http://sentry-test-site.example/0');
+fetch('http://sentry-test-site.example/1');

dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance-propagateTraceparent/subject.js

@@ -12,21 +12,36 @@ sentryTest(
 
     const url = await getLocalTestUrl({ testDir: __dirname });
 
-    const [, request] = await Promise.all([page.goto(url), page.waitForRequest('http://sentry-test-site.example/0')]);
+    const [, request0, request1] = await Promise.all([
+      page.goto(url),
+      page.waitForRequest('http://sentry-test-site.example/0'),
+      page.waitForRequest('http://sentry-test-site.example/1'),
+    ]);
 
-    const requestHeaders = request.headers();
+    const requestHeaders0 = request0.headers();
 
-    const traceparentData = extractTraceparentData(requestHeaders['sentry-trace']);
+    const traceparentData = extractTraceparentData(requestHeaders0['sentry-trace']);
     expect(traceparentData).toMatchObject({
       traceId: expect.stringMatching(/^([a-f0-9]{32})$/),
       parentSpanId: expect.stringMatching(/^([a-f0-9]{16})$/),
       parentSampled: undefined,
     });
 
-    expect(requestHeaders).toMatchObject({
+    expect(requestHeaders0).toMatchObject({
       'sentry-trace': `${traceparentData?.traceId}-${traceparentData?.parentSpanId}`,
       baggage: expect.stringContaining(`sentry-trace_id=${traceparentData?.traceId}`),
       traceparent: `00-${traceparentData?.traceId}-${traceparentData?.parentSpanId}-00`,
     });
+
+    const requestHeaders1 = request1.headers();
+    expect(requestHeaders1).toMatchObject({
+      'sentry-trace': `${traceparentData?.traceId}-${traceparentData?.parentSpanId}`,
+      baggage: expect.stringContaining(`sentry-trace_id=${traceparentData?.traceId}`),
+      traceparent: `00-${traceparentData?.traceId}-${traceparentData?.parentSpanId}-00`,
+    });
+
+    expect(requestHeaders1['sentry-trace']).toBe(requestHeaders0['sentry-trace']);
+    expect(requestHeaders1['baggage']).toBe(requestHeaders0['baggage']);
+    expect(requestHeaders1['traceparent']).toBe(requestHeaders0['traceparent']);
   },
 );

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

@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  // in browser TwP means not setting tracesSampleRate but adding browserTracingIntegration,
+  dsn: 'https://[email protected]/1337',
+  integrations: [Sentry.browserTracingIntegration()],
+  tracePropagationTargets: ['http://sentry-test-site.example'],
+  propagateTraceparent: true,
+});

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance-propagateTraceparent/init.js

@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <!-- Purposefully emitting the `sampled` flag in the sentry-trace tag -->
+    <meta name="sentry-trace" content="12345678901234567890123456789012-1234567890123456" />
+    <meta
+      name="baggage"
+      content="sentry-trace_id=12345678901234567890123456789012,sentry-public_key=public,sentry-release=1.0.0,sentry-environment=prod,sentry-sample_rand=0.42"
+    />
+  </head>
+  <body>
+    <button id="errorBtn">Throw Error</button>
+    <button id="fetchBtn">Fetch Request</button>
+    <button id="xhrBtn">XHR Request</button>
+  </body>
+</html>