Merge branch 'develop' into sig/otel-top-level-span-links

# Conflicts:
#	dev-packages/node-integration-tests/suites/tracing/linking/test.ts
#	packages/opentelemetry/test/spanExporter.test.ts
#	packages/opentelemetry/test/trace.test.ts

Author: s1gr1d

CHANGELOG.md

@@ -10,7 +10,18 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @filips-alpe. Thank you for your contribution!
+## 9.1.0
+
+- feat(browser): Add `graphqlClientIntegration` ([#13783](https://github.com/getsentry/sentry-javascript/pull/13783))
+- feat(core): Allow for nested trpc context ([#15379](https://github.com/getsentry/sentry-javascript/pull/15379))
+- feat(core): Create types and utilities for span links ([#15375](https://github.com/getsentry/sentry-javascript/pull/15375))
+- feat(deps): bump @opentelemetry/instrumentation-pg from 0.50.0 to 0.51.0 ([#15273](https://github.com/getsentry/sentry-javascript/pull/15273))
+- feat(node): Extract Sentry-specific node-fetch instrumentation ([#15231](https://github.com/getsentry/sentry-javascript/pull/15231))
+- feat(vue): Support Pinia v3 ([#15383](https://github.com/getsentry/sentry-javascript/pull/15383))
+- fix(sveltekit): Avoid request body double read errors ([#15368](https://github.com/getsentry/sentry-javascript/pull/15368))
+- fix(sveltekit): Avoid top-level `vite` import ([#15371](https://github.com/getsentry/sentry-javascript/pull/15371))
+
+Work in this release was contributed by @Zen-cronic and @filips-alpe. Thank you for your contribution!
 
 ## 9.0.1
 

dev-packages/browser-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -42,7 +42,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.50.0",
     "@sentry-internal/rrweb": "2.31.0",
-    "@sentry/browser": "9.0.1",
+    "@sentry/browser": "9.1.0",
     "axios": "1.7.7",
     "babel-loader": "^8.2.2",
     "fflate": "0.8.2",

dev-packages/bundle-analyzer-scenarios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "description": "Scenarios to test bundle analysis with",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/clear-cache-gh-action",
   "description": "An internal Github Action to clear GitHub caches.",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "license": "MIT",
   "private": true,
   "scripts": {

dev-packages/external-contributor-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/external-contributor-gh-action",
   "description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/node-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "9.0.1",
+  "version": "9.1.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -16,12 +16,9 @@
     "build:types": "tsc -p tsconfig.types.json",
     "clean": "rimraf -g **/node_modules && run-p clean:script",
     "clean:script": "node scripts/clean.js",
-    "prisma-v5:init": "cd suites/tracing/prisma-orm-v5 && yarn && yarn setup",
-    "prisma-v6:init": "cd suites/tracing/prisma-orm-v6 && yarn && yarn setup",
     "lint": "eslint . --format stylish",
     "fix": "eslint . --format stylish --fix",
     "type-check": "tsc",
-    "pretest": "run-s --silent prisma-v5:init prisma-v6:init",
     "test": "jest --config ./jest.config.js",
     "test:watch": "yarn test --watch"
   },
@@ -31,9 +28,9 @@
     "@nestjs/common": "10.4.6",
     "@nestjs/core": "10.4.6",
     "@nestjs/platform-express": "10.4.6",
-    "@sentry/aws-serverless": "9.0.1",
-    "@sentry/core": "9.0.1",
-    "@sentry/node": "9.0.1",
+    "@sentry/aws-serverless": "9.1.0",
+    "@sentry/core": "9.1.0",
+    "@sentry/node": "9.1.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",

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

@@ -173,8 +173,8 @@ describe('span links', () => {
                 span_id: expect.stringMatching(parent1_spanId),
               }),
             expect.objectContaining({
-              trace_id: expect.stringMatching(child1_1?.trace_id as string),
-              span_id: expect.stringMatching(child1_1?.span_id as string),
+              trace_id: expect.stringMatching(child1_1?.trace_id || 'non-existent-id-fallback'),
+              span_id: expect.stringMatching(child1_1?.span_id || 'non-existent-id-fallback'),
               attributes: expect.objectContaining({
                 'sentry.link.type': 'previous_trace',
               }),

dev-packages/node-integration-tests/suites/tracing/prisma-orm-v5/package.json

@@ -7,10 +7,9 @@
     "node": ">=18"
   },
   "scripts": {
-    "db-up": "docker compose up -d",
     "generate": "prisma generate",
     "migrate": "prisma migrate dev -n sentry-test",
-    "setup": "run-s --silent db-up generate migrate"
+    "setup": "run-s --silent generate migrate"
   },
   "keywords": [],
   "author": "",

dev-packages/node-integration-tests/suites/tracing/prisma-orm-v5/test.ts

@@ -1,8 +1,20 @@
-import { createRunner } from '../../../utils/runner';
+import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
 
-describe('Prisma ORM Tests', () => {
+// When running docker compose, we need a larger timeout, as this takes some time...
+jest.setTimeout(75000);
+
+afterAll(() => {
+  cleanupChildProcesses();
+});
+
+describe('Prisma ORM v5 Tests', () => {
   test('CJS - should instrument PostgreSQL queries from Prisma ORM', done => {
     createRunner(__dirname, 'scenario.js')
+      .withDockerCompose({
+        workingDirectory: [__dirname],
+        readyMatches: ['port 5432'],
+        setupCommand: 'yarn && yarn setup',
+      })
       .expect({
         transaction: transaction => {
           expect(transaction.transaction).toBe('Test Transaction');