Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getsentry/sentry-javascript
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9.6.0
Choose a base ref
...
head repository: getsentry/sentry-javascript
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9.6.1
Choose a head ref
  • 16 commits
  • 76 files changed
  • 10 contributors

Commits on Mar 17, 2025

  1. test(opentelemetry): Remove deprecated new Span() usage in tests (#…

    …15702)
    
    Fixes part of #15518
    
    We have been using the deprecated `new Span()` syntax for tests in OTEL.
    
    This PR changes this to instead use a proper tracer, which is also
    supported in v2 of otel.
    mydea authored Mar 17, 2025

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vmishenev Vadim Mishenev
    Copy the full SHA
    9da8e7f View commit details
  2. ref(core): Update log types to explicitly reference otel (#15704)

    In #15530 I added
    types for the log envelope and log item.
    
    This PR comes and explicitly references that these added types were otel
    logs. For more details, see the logs spec in develop:
    getsentry/sentry-docs#12920.
    
    
    Note I used `Otel` everywhere here, but I'm also fine with switching to
    `OpenTelemetry`.
    AbhiPrasad authored Mar 17, 2025

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vmishenev Vadim Mishenev
    Copy the full SHA
    0b37427 View commit details
  3. chore(deps): Bump rollup to 4.35.0 (#15651)

    nwalters512 authored Mar 17, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d16b077 View commit details
  4. feat(ci): Run yarn-deduplicate in CI (#15119)

    nwalters512 authored Mar 17, 2025
    Copy the full SHA
    16e40f4 View commit details
  5. Merge branch 'release/9.6.0'

    getsentry-bot committed Mar 17, 2025
    Copy the full SHA
    eabcdd0 View commit details

Commits on Mar 18, 2025

  1. fix(nuxt): Add Nitro Rollup plugin to inject Sentry server config (#1…

    …5710)
    
    Previously, the Sentry server config was added by adding another entry
    point in the rollup options of Vite. Since Nuxt changed
    `preserveModules` to `true`, this did not work anymore. The aim of this
    change in Nuxt is to avoid duplicating what the Nitro build would do.
    
    This means, that we now don't change the Rollup options in Vite anymore
    (affects Nuxt as a whole) but only the Rollup options during the Nitro
    build.
    
    The added plugin will emit a new file and returns the Sentry config code
    there.
    
    fixes #15628
    s1gr1d authored Mar 18, 2025
    Copy the full SHA
    26e2d17 View commit details
  2. test(browser-utils): Add test to make sure we run `originalHistoryFun…

    …ction` if urls are the same (#15716)
    
    resolves #15594
    AbhiPrasad authored Mar 18, 2025
    Copy the full SHA
    2e5926c View commit details
  3. Merge pull request #15708 from getsentry/master

    [Gitflow] Merge master into develop
    github-actions[bot] authored Mar 18, 2025
    Copy the full SHA
    8fb9501 View commit details
  4. fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

    Fixes #15700
    lforst authored Mar 18, 2025
    Copy the full SHA
    469dae2 View commit details
  5. feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)

    dependabot[bot] authored Mar 18, 2025
    Copy the full SHA
    90f41db View commit details
  6. feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)

    dependabot[bot] authored Mar 18, 2025
    Copy the full SHA
    a5e5945 View commit details
  7. Copy the full SHA
    77c80e4 View commit details
  8. ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)

    Adding tests for the [nightly
    channel](https://nuxt.com/docs/guide/going-further/nightly-release-channel)
    of Nuxt.
    
    Right now, they are failing - will merge this PR once they are not
    failing anymore. See issue:
    #15628
    
    This PR adds fixes to the tests should not fail anymore:
    #15710
    s1gr1d authored Mar 18, 2025
    Copy the full SHA
    c24a8eb View commit details

Commits on Mar 19, 2025

  1. meta(changelog): Update changelog for 9.6.1

    s1gr1d committed Mar 19, 2025
    Copy the full SHA
    3552196 View commit details
  2. Merge pull request #15727 from getsentry/prepare-release/9.6.1

    meta(changelog): Update changelog for 9.6.1
    s1gr1d authored Mar 19, 2025
    Copy the full SHA
    1e1bebb View commit details
  3. release: 9.6.1

    getsentry-bot committed Mar 19, 2025
    Copy the full SHA
    528c3d1 View commit details
Showing with 787 additions and 828 deletions.
  1. +3 −0 .github/workflows/build.yml
  2. +6 −0 .github/workflows/canary.yml
  3. +8 −0 CHANGELOG.md
  4. +2 −2 dev-packages/browser-integration-tests/package.json
  5. +1 −1 dev-packages/bundle-analyzer-scenarios/package.json
  6. +1 −1 dev-packages/clear-cache-gh-action/package.json
  7. +1 −1 dev-packages/e2e-tests/package.json
  8. +1 −1 dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json
  9. +5 −3 dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json
  10. +9 −0 dev-packages/e2e-tests/test-applications/nuxt-3/package.json
  11. +9 −0 dev-packages/e2e-tests/test-applications/nuxt-4/package.json
  12. +1 −1 dev-packages/external-contributor-gh-action/package.json
  13. +4 −4 dev-packages/node-integration-tests/package.json
  14. +1 −1 dev-packages/rollup-utils/package.json
  15. +1 −1 dev-packages/size-limit-gh-action/package.json
  16. +2 −2 dev-packages/test-utils/package.json
  17. +1 −1 lerna.json
  18. +5 −2 package.json
  19. +3 −3 packages/angular/package.json
  20. +4 −4 packages/astro/package.json
  21. +3 −3 packages/aws-serverless/package.json
  22. +2 −2 packages/browser-utils/package.json
  23. +64 −3 packages/browser-utils/test/instrument/history.test.ts
  24. +7 −7 packages/browser/package.json
  25. +4 −4 packages/bun/package.json
  26. +2 −2 packages/cloudflare/package.json
  27. +1 −1 packages/core/package.json
  28. +6 −6 packages/core/src/types-hoist/envelope.ts
  29. +1 −1 packages/core/src/types-hoist/index.ts
  30. +4 −2 packages/core/src/types-hoist/log.ts
  31. +2 −2 packages/deno/package.json
  32. +3 −3 packages/ember/package.json
  33. +3 −3 packages/eslint-config-sdk/package.json
  34. +1 −1 packages/eslint-plugin-sdk/package.json
  35. +2 −2 packages/feedback/package.json
  36. +3 −3 packages/gatsby/package.json
  37. +3 −3 packages/google-cloud-serverless/package.json
  38. +2 −2 packages/integration-shims/package.json
  39. +3 −3 packages/nestjs/package.json
  40. +8 −8 packages/nextjs/package.json
  41. +69 −35 packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
  42. +7 −2 packages/nextjs/src/config/templates/pageWrapperTemplate.ts
  43. +4 −4 packages/node/package.json
  44. +0 −3 packages/node/src/integrations/tracing/graphql.ts
  45. +5 −6 packages/node/src/sdk/initOtel.ts
  46. +6 −6 packages/nuxt/package.json
  47. +1 −1 packages/nuxt/src/module.ts
  48. +49 −11 packages/nuxt/src/vite/addServerConfig.ts
  49. +4 −4 packages/opentelemetry/README.md
  50. +2 −2 packages/opentelemetry/package.json
  51. +0 −40 packages/opentelemetry/test/helpers/createSpan.ts
  52. +4 −6 packages/opentelemetry/test/helpers/initOtel.ts
  53. +26 −7 packages/opentelemetry/test/utils/getRequestSpanData.test.ts
  54. +65 −16 packages/opentelemetry/test/utils/groupSpansWithParents.test.ts
  55. +41 −25 packages/opentelemetry/test/utils/mapStatus.test.ts
  56. +38 −19 packages/opentelemetry/test/utils/spanToJSON.test.ts
  57. +3 −3 packages/profiling-node/package.json
  58. +5 −5 packages/react-router/package.json
  59. +3 −3 packages/react/package.json
  60. +6 −6 packages/remix/package.json
  61. +3 −3 packages/replay-canvas/package.json
  62. +4 −4 packages/replay-internal/package.json
  63. +1 −1 packages/replay-worker/package.json
  64. +3 −3 packages/solid/package.json
  65. +5 −5 packages/solidstart/package.json
  66. +3 −3 packages/svelte/package.json
  67. +6 −6 packages/sveltekit/package.json
  68. +6 −6 packages/tanstackstart-react/package.json
  69. +1 −1 packages/tanstackstart/package.json
  70. +2 −2 packages/types/package.json
  71. +1 −1 packages/typescript/package.json
  72. +3 −3 packages/vercel-edge/package.json
  73. +4 −6 packages/vercel-edge/src/sdk.ts
  74. +3 −3 packages/vue/package.json
  75. +3 −3 packages/wasm/package.json
  76. +209 −485 yarn.lock
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -274,6 +274,9 @@ jobs:
uses: ./.github/actions/restore-cache
with:
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
- name: Check for duplicate dependencies in lockfile
# Run `yarn dedupe-deps:fix` locally to resolve any duplicates.
run: yarn dedupe-deps:check
- name: Lint source files
run: yarn lint:lerna
- name: Lint for ES compatibility
6 changes: 6 additions & 0 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
@@ -108,6 +108,12 @@ jobs:
- test-application: 'react-router-6'
build-command: 'test:build-canary'
label: 'react-router-6 (canary)'
- test-application: 'nuxt-3'
build-command: 'test:build-canary'
label: 'nuxt-3 (canary)'
- test-application: 'nuxt-4'
build-command: 'test:build-canary'
label: 'nuxt-4 (canary)'

steps:
- name: Check out current commit
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -10,6 +10,14 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 9.6.1

- feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))
- feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 ([#15711](https://github.com/getsentry/sentry-javascript/pull/15711))
- fix(nextjs): Re-patch router if it is overridden by Next.js ([#15721](https://github.com/getsentry/sentry-javascript/pull/15721))
- fix(nuxt): Add Nitro Rollup plugin to inject Sentry server config ([#15710](https://github.com/getsentry/sentry-javascript/pull/15710))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
4 changes: 2 additions & 2 deletions dev-packages/browser-integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/browser-integration-tests",
"version": "9.6.0",
"version": "9.6.1",
"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.34.0",
"@sentry/browser": "9.6.0",
"@sentry/browser": "9.6.1",
"axios": "1.8.2",
"babel-loader": "^8.2.2",
"fflate": "0.8.2",
2 changes: 1 addition & 1 deletion dev-packages/bundle-analyzer-scenarios/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/bundle-analyzer-scenarios",
"version": "9.6.0",
"version": "9.6.1",
"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",
2 changes: 1 addition & 1 deletion dev-packages/clear-cache-gh-action/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sentry-internal/clear-cache-gh-action",
"description": "An internal Github Action to clear GitHub caches.",
"version": "9.6.0",
"version": "9.6.1",
"license": "MIT",
"engines": {
"node": ">=18"
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/e2e-tests",
"version": "9.6.0",
"version": "9.6.1",
"license": "MIT",
"private": true,
"scripts": {
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
"@sentry/node": "latest || *"
},
"devDependencies": {
"rollup": "^4.24.2",
"rollup": "^4.35.0",
"vitest": "^0.34.6",
"@sentry/rollup-plugin": "2.22.6"
},
Original file line number Diff line number Diff line change
@@ -21,8 +21,10 @@
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils"
},
"overrides": {
"nitropack": "~2.9.7",
"ofetch": "^1.4.0"
"pnpm": {
"overrides": {
"nitropack": "~2.9.7",
"ofetch": "^1.4.0"
}
}
}
9 changes: 9 additions & 0 deletions dev-packages/e2e-tests/test-applications/nuxt-3/package.json
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
"clean": "npx nuxi cleanup",
"test": "playwright test",
"test:build": "pnpm install && pnpm build",
"test:build-canary": "pnpm add nuxt@npm:nuxt-nightly@3x && pnpm add nitropack@npm:nitropack-nightly@latest && pnpm install --force && pnpm build",
"test:assert": "pnpm test"
},
"dependencies": {
@@ -21,5 +22,13 @@
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils"
},
"sentryTest": {
"optionalVariants": [
{
"build-command": "test:build-canary",
"label": "nuxt-3 (canary)"
}
]
}
}
9 changes: 9 additions & 0 deletions dev-packages/e2e-tests/test-applications/nuxt-4/package.json
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
"clean": "npx nuxi cleanup",
"test": "playwright test",
"test:build": "pnpm install && pnpm build",
"test:build-canary": "pnpm add nuxt@npm:nuxt-nightly@latest && pnpm add nitropack@npm:nitropack-nightly@latest && pnpm install --force && pnpm build",
"test:assert": "pnpm test"
},
"dependencies": {
@@ -25,5 +26,13 @@
},
"overrides": {
"@vercel/nft": "0.27.4"
},
"sentryTest": {
"optionalVariants": [
{
"build-command": "test:build-canary",
"label": "nuxt-4 (canary)"
}
]
}
}
2 changes: 1 addition & 1 deletion dev-packages/external-contributor-gh-action/package.json
Original file line number Diff line number Diff line change
@@ -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.6.0",
"version": "9.6.1",
"license": "MIT",
"engines": {
"node": ">=18"
8 changes: 4 additions & 4 deletions dev-packages/node-integration-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/node-integration-tests",
"version": "9.6.0",
"version": "9.6.1",
"license": "MIT",
"engines": {
"node": ">=18"
@@ -30,9 +30,9 @@
"@nestjs/common": "10.4.6",
"@nestjs/core": "10.4.6",
"@nestjs/platform-express": "10.4.6",
"@sentry/aws-serverless": "9.6.0",
"@sentry/core": "9.6.0",
"@sentry/node": "9.6.0",
"@sentry/aws-serverless": "9.6.1",
"@sentry/core": "9.6.1",
"@sentry/node": "9.6.1",
"@types/mongodb": "^3.6.20",
"@types/mysql": "^2.15.21",
"@types/pg": "^8.6.5",
2 changes: 1 addition & 1 deletion dev-packages/rollup-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/rollup-utils",
"version": "9.6.0",
"version": "9.6.1",
"description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
2 changes: 1 addition & 1 deletion dev-packages/size-limit-gh-action/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sentry-internal/size-limit-gh-action",
"description": "An internal Github Action to compare the current size of a PR against the one on develop.",
"version": "9.6.0",
"version": "9.6.1",
"license": "MIT",
"engines": {
"node": ">=18"
4 changes: 2 additions & 2 deletions dev-packages/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "9.6.0",
"version": "9.6.1",
"name": "@sentry-internal/test-utils",
"author": "Sentry",
"license": "MIT",
@@ -45,7 +45,7 @@
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry/core": "9.6.0"
"@sentry/core": "9.6.1"
},
"volta": {
"extends": "../../package.json"
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "9.6.0",
"version": "9.6.1",
"npmClient": "yarn"
}
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -29,6 +29,8 @@
"lint:lerna": "lerna run lint",
"lint:prettier": "prettier \"**/*.{md,css,yml,yaml}\" \"packages/**/**.{ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" --check",
"lint:es-compatibility": "es-check es2020 ./packages/*/build/{bundles,npm/cjs,cjs}/*.js && es-check es2020 ./packages/*/build/{npm/esm,esm}/*.js --module",
"dedupe-deps:check": "yarn-deduplicate yarn.lock --list --fail",
"dedupe-deps:fix": "yarn-deduplicate yarn.lock",
"postpublish": "lerna run --stream --concurrency 1 postpublish",
"test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test",
"test:unit": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test:unit",
@@ -126,7 +128,7 @@
"npm-run-all2": "^6.2.0",
"prettier": "^3.1.1",
"rimraf": "^5.0.10",
"rollup": "^4.24.2",
"rollup": "^4.35.0",
"rollup-plugin-cleanup": "^3.2.1",
"rollup-plugin-license": "^3.3.1",
"size-limit": "~11.1.6",
@@ -135,7 +137,8 @@
"ts-node": "10.9.1",
"typescript": "~5.0.0",
"vitest": "^2.1.8",
"yalc": "^1.0.0-pre.53"
"yalc": "^1.0.0-pre.53",
"yarn-deduplicate": "6.0.2"
},
"//_resolutions_comment": [
"Because new versions of strip-ansi, string-width, and wrap-ansi are ESM only packages,",
6 changes: 3 additions & 3 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/angular",
"version": "9.6.0",
"version": "9.6.1",
"description": "Official Sentry SDK for Angular",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
"rxjs": "^6.5.5 || ^7.x"
},
"dependencies": {
"@sentry/browser": "9.6.0",
"@sentry/core": "9.6.0",
"@sentry/browser": "9.6.1",
"@sentry/core": "9.6.1",
"tslib": "^2.4.1"
},
"devDependencies": {
8 changes: 4 additions & 4 deletions packages/astro/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/astro",
"version": "9.6.0",
"version": "9.6.1",
"description": "Official Sentry SDK for Astro",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
"astro": ">=3.x || >=4.0.0-beta || >=5.x"
},
"dependencies": {
"@sentry/browser": "9.6.0",
"@sentry/core": "9.6.0",
"@sentry/node": "9.6.0",
"@sentry/browser": "9.6.1",
"@sentry/core": "9.6.1",
"@sentry/node": "9.6.1",
"@sentry/vite-plugin": "^2.22.6"
},
"devDependencies": {
6 changes: 3 additions & 3 deletions packages/aws-serverless/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry/aws-serverless",
"version": "9.6.0",
"version": "9.6.1",
"description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
@@ -68,8 +68,8 @@
"@opentelemetry/instrumentation": "^0.57.2",
"@opentelemetry/instrumentation-aws-lambda": "0.50.3",
"@opentelemetry/instrumentation-aws-sdk": "0.49.1",
"@sentry/core": "9.6.0",
"@sentry/node": "9.6.0",
"@sentry/core": "9.6.1",
"@sentry/node": "9.6.1",
"@types/aws-lambda": "^8.10.62"
},
"devDependencies": {
4 changes: 2 additions & 2 deletions packages/browser-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sentry-internal/browser-utils",
"version": "9.6.0",
"version": "9.6.1",
"description": "Browser Utilities for all Sentry JavaScript SDKs",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
"access": "public"
},
"dependencies": {
"@sentry/core": "9.6.0"
"@sentry/core": "9.6.1"
},
"scripts": {
"build": "run-p build:transpile build:types",
Loading