meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
s1gr1d wants to merge 14 commits into from
Closed

meta(changelog): Update changelog for 9.7.0 #15724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9da8e7f
test(opentelemetry): Remove deprecated `new Span()` usage in tests (#…
mydea Mar 17, 2025
0b37427
ref(core): Update log types to explicitly reference otel (#15704)
AbhiPrasad Mar 17, 2025
d16b077
chore(deps): Bump rollup to 4.35.0 (#15651)
nwalters512 Mar 17, 2025
16e40f4
feat(ci): Run yarn-deduplicate in CI (#15119)
nwalters512 Mar 17, 2025
26e2d17
fix(nuxt): Add Nitro Rollup plugin to inject Sentry server config (#1…
s1gr1d Mar 18, 2025
2e5926c
test(browser-utils): Add test to make sure we run `originalHistoryFun…
AbhiPrasad Mar 18, 2025
8fb9501
Merge pull request #15708 from getsentry/master
github-actions[bot] Mar 18, 2025
469dae2
fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)
Mar 18, 2025
90f41db
feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)
dependabot[bot] Mar 18, 2025
a5e5945
feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)
dependabot[bot] Mar 18, 2025
77c80e4
ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…
mydea Mar 18, 2025
c24a8eb
ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)
s1gr1d Mar 18, 2025
1d767b5
meta(changelog): Update changelog for 9.7.0
s1gr1d Mar 18, 2025
58e07b9
meta(changelog): Update changelog for 9.6.1
s1gr1d Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/canary.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
},
Expand Down
8 changes: 5 additions & 3 deletions dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
},
"overrides": {
"@vercel/nft": "0.27.4"
},
"sentryTest": {
"optionalVariants": [
{
"build-command": "test:build-canary",
"label": "nuxt-4 (canary)"
}
]
}
}
7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down
67 changes: 64 additions & 3 deletions packages/browser-utils/test/instrument/history.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
const originalHistory = WINDOW.history;
WINDOW.addEventListener = vi.fn();

afterEach(() => {
// @ts-expect-error - this is fine for testing
WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
pushState: expect.any(Function), // patched function
});
});

it('does not trigger handlers when the URLs are the same', () => {
const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
const pushStateMock = vi.fn();

// @ts-expect-error - this is fine for testing
WINDOW.history = {
pushState: pushStateMock,
replaceState: () => {},
};

instrumentHistory();

// First call with URL1 to set lastHref
WINDOW.history.pushState({}, '', 'https://example.com/page1');
expect(pushStateMock).toHaveBeenCalledTimes(1);

// Reset mocks to check next call
pushStateMock.mockClear();
vi.mocked(triggerHandlerSpy).mockClear();

// Call with the same URL
WINDOW.history.pushState({}, '', 'https://example.com/page1');

expect(pushStateMock).toHaveBeenCalledTimes(1);
expect(triggerHandlerSpy).not.toHaveBeenCalled();
});

it('triggers handlers when the URLs are different', () => {
const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
// Setup a mock for history.pushState
const pushStateMock = vi.fn();

// @ts-expect-error - this is fine for testing
WINDOW.history = {
pushState: pushStateMock,
replaceState: () => {},
};

// Run the instrumentation
instrumentHistory();

// First call with URL1 to set lastHref
WINDOW.history.pushState({}, '', 'https://example.com/page1');
expect(pushStateMock).toHaveBeenCalledTimes(1);

// Reset mocks to check next call
pushStateMock.mockClear();
vi.mocked(triggerHandlerSpy).mockClear();

// Call with a different URL
WINDOW.history.pushState({}, '', 'https://example.com/page2');

// Original function should be called
expect(pushStateMock).toHaveBeenCalledTimes(1);

// triggerHandlers should be called with from and to data
expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
from: 'https://example.com/page1',
to: 'https://example.com/page2',
});
});
});
12 changes: 6 additions & 6 deletions packages/core/src/types-hoist/envelope.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
| EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
| CheckInEnvelope
| SpanEnvelope
| RawSecurityEnvelope
| LogEnvelope;
| OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];
2 changes: 1 addition & 1 deletion packages/core/src/types-hoist/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down
6 changes: 4 additions & 2 deletions packages/core/src/types-hoist/log.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
stringValue: string;
}
| {
intValue: number;
// integers must be represented as a string
// because JSON cannot differentiate between integers and floats
intValue: string;
}
| {
boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
/**
* The severity level of the log.
*
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
"@sentry/webpack-plugin": "3.2.2",
"chalk": "3.0.0",
"resolve": "1.22.8",
"rollup": "4.34.9",
"rollup": "4.35.0",
"stacktrace-parser": "^0.1.10"
},
"devDependencies": {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

s1gr1d
wants to merge
14
commits into

from

 Closed


meta(changelog): Update changelog for 9.7.0
#15724
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
9da8e7f

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


mydea Mar 17, 2025
0b37427

ref(core): Update log types to explicitly reference otel (#15704)


AbhiPrasad Mar 17, 2025
d16b077

chore(deps): Bump rollup to 4.35.0 (#15651)


nwalters512 Mar 17, 2025
16e40f4

feat(ci): Run yarn-deduplicate in CI (#15119)


nwalters512 Mar 17, 2025
26e2d17

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


s1gr1d Mar 18, 2025
2e5926c

test(browser-utils): Add test to make sure we run `originalHistoryFun…


AbhiPrasad Mar 18, 2025
8fb9501

Merge pull request #15708 from getsentry/master


github-actions[bot] Mar 18, 2025
469dae2

fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

Mar 18, 2025
90f41db

feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)


dependabot[bot] Mar 18, 2025
a5e5945

feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)


dependabot[bot] Mar 18, 2025
77c80e4

ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…


mydea Mar 18, 2025
c24a8eb

ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)


s1gr1d Mar 18, 2025
1d767b5

meta(changelog): Update changelog for 9.7.0


s1gr1d Mar 18, 2025
58e07b9

meta(changelog): Update changelog for 9.6.1


s1gr1d Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 6 additions & 0 deletions
.github/workflows/canary.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

9 changes: 9 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 },
Expand Down

8 changes: 5 additions & 3 deletions
dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
 },
 "overrides": {
 "@vercel/nft": "0.27.4"
 },
 "sentryTest": {
 "optionalVariants": [
 {
 "build-command": "test:build-canary",
 "label": "nuxt-4 (canary)"
 }
 ]
 }
}

7 changes: 5 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down

67 changes: 64 additions & 3 deletions
packages/browser-utils/test/instrument/history.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
 const originalHistory = WINDOW.history;
 WINDOW.addEventListener = vi.fn();

 afterEach(() => {
 // @ts-expect-error - this is fine for testing
 WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
 pushState: expect.any(Function), // patched function
 });
 });

 it('does not trigger handlers when the URLs are the same', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with the same URL
 WINDOW.history.pushState({}, '', 'https://example.com/page1');

 expect(pushStateMock).toHaveBeenCalledTimes(1);
 expect(triggerHandlerSpy).not.toHaveBeenCalled();
 });

 it('triggers handlers when the URLs are different', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 // Setup a mock for history.pushState
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 // Run the instrumentation
 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with a different URL
 WINDOW.history.pushState({}, '', 'https://example.com/page2');

 // Original function should be called
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // triggerHandlers should be called with from and to data
 expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
 from: 'https://example.com/page1',
 to: 'https://example.com/page2',
 });
 });
});

12 changes: 6 additions & 6 deletions
packages/core/src/types-hoist/envelope.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
 EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
 | EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
 | CheckInEnvelope
 | SpanEnvelope
 | RawSecurityEnvelope
 | LogEnvelope;
 | OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];

2 changes: 1 addition & 1 deletion
packages/core/src/types-hoist/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
 TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down

6 changes: 4 additions & 2 deletions
packages/core/src/types-hoist/log.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
 stringValue: string;
 }
 | {
 intValue: number;
 // integers must be represented as a string
 // because JSON cannot differentiate between integers and floats
 intValue: string;
 }
 | {
 boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
 value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
 /**
 * The severity level of the log.
 *
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
 "@sentry/webpack-plugin": "3.2.2",
 "chalk": "3.0.0",
 "resolve": "1.22.8",
 "rollup": "4.34.9",
 "rollup": "4.35.0",
 "stacktrace-parser": "^0.1.10"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

s1gr1d
wants to merge
14
commits into

from

 Closed


meta(changelog): Update changelog for 9.7.0
#15724
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
9da8e7f

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


mydea Mar 17, 2025
0b37427

ref(core): Update log types to explicitly reference otel (#15704)


AbhiPrasad Mar 17, 2025
d16b077

chore(deps): Bump rollup to 4.35.0 (#15651)


nwalters512 Mar 17, 2025
16e40f4

feat(ci): Run yarn-deduplicate in CI (#15119)


nwalters512 Mar 17, 2025
26e2d17

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


s1gr1d Mar 18, 2025
2e5926c

test(browser-utils): Add test to make sure we run `originalHistoryFun…


AbhiPrasad Mar 18, 2025
8fb9501

Merge pull request #15708 from getsentry/master


github-actions[bot] Mar 18, 2025
469dae2

fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

Mar 18, 2025
90f41db

feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)


dependabot[bot] Mar 18, 2025
a5e5945

feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)


dependabot[bot] Mar 18, 2025
77c80e4

ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…


mydea Mar 18, 2025
c24a8eb

ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)


s1gr1d Mar 18, 2025
1d767b5

meta(changelog): Update changelog for 9.7.0


s1gr1d Mar 18, 2025
58e07b9

meta(changelog): Update changelog for 9.6.1


s1gr1d Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 6 additions & 0 deletions
.github/workflows/canary.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

9 changes: 9 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 },
Expand Down

8 changes: 5 additions & 3 deletions
dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
 },
 "overrides": {
 "@vercel/nft": "0.27.4"
 },
 "sentryTest": {
 "optionalVariants": [
 {
 "build-command": "test:build-canary",
 "label": "nuxt-4 (canary)"
 }
 ]
 }
}

7 changes: 5 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down

67 changes: 64 additions & 3 deletions
packages/browser-utils/test/instrument/history.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
 const originalHistory = WINDOW.history;
 WINDOW.addEventListener = vi.fn();

 afterEach(() => {
 // @ts-expect-error - this is fine for testing
 WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
 pushState: expect.any(Function), // patched function
 });
 });

 it('does not trigger handlers when the URLs are the same', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with the same URL
 WINDOW.history.pushState({}, '', 'https://example.com/page1');

 expect(pushStateMock).toHaveBeenCalledTimes(1);
 expect(triggerHandlerSpy).not.toHaveBeenCalled();
 });

 it('triggers handlers when the URLs are different', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 // Setup a mock for history.pushState
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 // Run the instrumentation
 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with a different URL
 WINDOW.history.pushState({}, '', 'https://example.com/page2');

 // Original function should be called
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // triggerHandlers should be called with from and to data
 expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
 from: 'https://example.com/page1',
 to: 'https://example.com/page2',
 });
 });
});

12 changes: 6 additions & 6 deletions
packages/core/src/types-hoist/envelope.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
 EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
 | EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
 | CheckInEnvelope
 | SpanEnvelope
 | RawSecurityEnvelope
 | LogEnvelope;
 | OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];

2 changes: 1 addition & 1 deletion
packages/core/src/types-hoist/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
 TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down

6 changes: 4 additions & 2 deletions
packages/core/src/types-hoist/log.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
 stringValue: string;
 }
 | {
 intValue: number;
 // integers must be represented as a string
 // because JSON cannot differentiate between integers and floats
 intValue: string;
 }
 | {
 boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
 value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
 /**
 * The severity level of the log.
 *
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
 "@sentry/webpack-plugin": "3.2.2",
 "chalk": "3.0.0",
 "resolve": "1.22.8",
 "rollup": "4.34.9",
 "rollup": "4.35.0",
 "stacktrace-parser": "^0.1.10"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

s1gr1d
wants to merge
14
commits into

from

 Closed


meta(changelog): Update changelog for 9.7.0
#15724
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
9da8e7f

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


mydea Mar 17, 2025
0b37427

ref(core): Update log types to explicitly reference otel (#15704)


AbhiPrasad Mar 17, 2025
d16b077

chore(deps): Bump rollup to 4.35.0 (#15651)


nwalters512 Mar 17, 2025
16e40f4

feat(ci): Run yarn-deduplicate in CI (#15119)


nwalters512 Mar 17, 2025
26e2d17

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


s1gr1d Mar 18, 2025
2e5926c

test(browser-utils): Add test to make sure we run `originalHistoryFun…


AbhiPrasad Mar 18, 2025
8fb9501

Merge pull request #15708 from getsentry/master


github-actions[bot] Mar 18, 2025
469dae2

fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

Mar 18, 2025
90f41db

feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)


dependabot[bot] Mar 18, 2025
a5e5945

feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)


dependabot[bot] Mar 18, 2025
77c80e4

ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…


mydea Mar 18, 2025
c24a8eb

ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)


s1gr1d Mar 18, 2025
1d767b5

meta(changelog): Update changelog for 9.7.0


s1gr1d Mar 18, 2025
58e07b9

meta(changelog): Update changelog for 9.6.1


s1gr1d Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 6 additions & 0 deletions
.github/workflows/canary.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

9 changes: 9 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 },
Expand Down

8 changes: 5 additions & 3 deletions
dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
 },
 "overrides": {
 "@vercel/nft": "0.27.4"
 },
 "sentryTest": {
 "optionalVariants": [
 {
 "build-command": "test:build-canary",
 "label": "nuxt-4 (canary)"
 }
 ]
 }
}

7 changes: 5 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down

67 changes: 64 additions & 3 deletions
packages/browser-utils/test/instrument/history.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
 const originalHistory = WINDOW.history;
 WINDOW.addEventListener = vi.fn();

 afterEach(() => {
 // @ts-expect-error - this is fine for testing
 WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
 pushState: expect.any(Function), // patched function
 });
 });

 it('does not trigger handlers when the URLs are the same', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with the same URL
 WINDOW.history.pushState({}, '', 'https://example.com/page1');

 expect(pushStateMock).toHaveBeenCalledTimes(1);
 expect(triggerHandlerSpy).not.toHaveBeenCalled();
 });

 it('triggers handlers when the URLs are different', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 // Setup a mock for history.pushState
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 // Run the instrumentation
 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with a different URL
 WINDOW.history.pushState({}, '', 'https://example.com/page2');

 // Original function should be called
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // triggerHandlers should be called with from and to data
 expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
 from: 'https://example.com/page1',
 to: 'https://example.com/page2',
 });
 });
});

12 changes: 6 additions & 6 deletions
packages/core/src/types-hoist/envelope.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
 EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
 | EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
 | CheckInEnvelope
 | SpanEnvelope
 | RawSecurityEnvelope
 | LogEnvelope;
 | OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];

2 changes: 1 addition & 1 deletion
packages/core/src/types-hoist/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
 TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down

6 changes: 4 additions & 2 deletions
packages/core/src/types-hoist/log.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
 stringValue: string;
 }
 | {
 intValue: number;
 // integers must be represented as a string
 // because JSON cannot differentiate between integers and floats
 intValue: string;
 }
 | {
 boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
 value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
 /**
 * The severity level of the log.
 *
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
 "@sentry/webpack-plugin": "3.2.2",
 "chalk": "3.0.0",
 "resolve": "1.22.8",
 "rollup": "4.34.9",
 "rollup": "4.35.0",
 "stacktrace-parser": "^0.1.10"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

s1gr1d
wants to merge
14
commits into

from

 Closed


meta(changelog): Update changelog for 9.7.0
#15724
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
9da8e7f

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


mydea Mar 17, 2025
0b37427

ref(core): Update log types to explicitly reference otel (#15704)


AbhiPrasad Mar 17, 2025
d16b077

chore(deps): Bump rollup to 4.35.0 (#15651)


nwalters512 Mar 17, 2025
16e40f4

feat(ci): Run yarn-deduplicate in CI (#15119)


nwalters512 Mar 17, 2025
26e2d17

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


s1gr1d Mar 18, 2025
2e5926c

test(browser-utils): Add test to make sure we run `originalHistoryFun…


AbhiPrasad Mar 18, 2025
8fb9501

Merge pull request #15708 from getsentry/master


github-actions[bot] Mar 18, 2025
469dae2

fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

Mar 18, 2025
90f41db

feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)


dependabot[bot] Mar 18, 2025
a5e5945

feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)


dependabot[bot] Mar 18, 2025
77c80e4

ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…


mydea Mar 18, 2025
c24a8eb

ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)


s1gr1d Mar 18, 2025
1d767b5

meta(changelog): Update changelog for 9.7.0


s1gr1d Mar 18, 2025
58e07b9

meta(changelog): Update changelog for 9.6.1


s1gr1d Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 6 additions & 0 deletions
.github/workflows/canary.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

9 changes: 9 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 },
Expand Down

8 changes: 5 additions & 3 deletions
dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
 },
 "overrides": {
 "@vercel/nft": "0.27.4"
 },
 "sentryTest": {
 "optionalVariants": [
 {
 "build-command": "test:build-canary",
 "label": "nuxt-4 (canary)"
 }
 ]
 }
}

7 changes: 5 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down

67 changes: 64 additions & 3 deletions
packages/browser-utils/test/instrument/history.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
 const originalHistory = WINDOW.history;
 WINDOW.addEventListener = vi.fn();

 afterEach(() => {
 // @ts-expect-error - this is fine for testing
 WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
 pushState: expect.any(Function), // patched function
 });
 });

 it('does not trigger handlers when the URLs are the same', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with the same URL
 WINDOW.history.pushState({}, '', 'https://example.com/page1');

 expect(pushStateMock).toHaveBeenCalledTimes(1);
 expect(triggerHandlerSpy).not.toHaveBeenCalled();
 });

 it('triggers handlers when the URLs are different', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 // Setup a mock for history.pushState
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 // Run the instrumentation
 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with a different URL
 WINDOW.history.pushState({}, '', 'https://example.com/page2');

 // Original function should be called
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // triggerHandlers should be called with from and to data
 expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
 from: 'https://example.com/page1',
 to: 'https://example.com/page2',
 });
 });
});

12 changes: 6 additions & 6 deletions
packages/core/src/types-hoist/envelope.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
 EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
 | EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
 | CheckInEnvelope
 | SpanEnvelope
 | RawSecurityEnvelope
 | LogEnvelope;
 | OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];

2 changes: 1 addition & 1 deletion
packages/core/src/types-hoist/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
 TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down

6 changes: 4 additions & 2 deletions
packages/core/src/types-hoist/log.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
 stringValue: string;
 }
 | {
 intValue: number;
 // integers must be represented as a string
 // because JSON cannot differentiate between integers and floats
 intValue: string;
 }
 | {
 boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
 value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
 /**
 * The severity level of the log.
 *
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
 "@sentry/webpack-plugin": "3.2.2",
 "chalk": "3.0.0",
 "resolve": "1.22.8",
 "rollup": "4.34.9",
 "rollup": "4.35.0",
 "stacktrace-parser": "^0.1.10"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

s1gr1d
wants to merge
14
commits into

from

 Closed


meta(changelog): Update changelog for 9.7.0
#15724
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
9da8e7f

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


mydea Mar 17, 2025
0b37427

ref(core): Update log types to explicitly reference otel (#15704)


AbhiPrasad Mar 17, 2025
d16b077

chore(deps): Bump rollup to 4.35.0 (#15651)


nwalters512 Mar 17, 2025
16e40f4

feat(ci): Run yarn-deduplicate in CI (#15119)


nwalters512 Mar 17, 2025
26e2d17

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


s1gr1d Mar 18, 2025
2e5926c

test(browser-utils): Add test to make sure we run `originalHistoryFun…


AbhiPrasad Mar 18, 2025
8fb9501

Merge pull request #15708 from getsentry/master


github-actions[bot] Mar 18, 2025
469dae2

fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

Mar 18, 2025
90f41db

feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)


dependabot[bot] Mar 18, 2025
a5e5945

feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)


dependabot[bot] Mar 18, 2025
77c80e4

ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…


mydea Mar 18, 2025
c24a8eb

ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)


s1gr1d Mar 18, 2025
1d767b5

meta(changelog): Update changelog for 9.7.0


s1gr1d Mar 18, 2025
58e07b9

meta(changelog): Update changelog for 9.6.1


s1gr1d Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 6 additions & 0 deletions
.github/workflows/canary.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

9 changes: 9 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 },
Expand Down

8 changes: 5 additions & 3 deletions
dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
 },
 "overrides": {
 "@vercel/nft": "0.27.4"
 },
 "sentryTest": {
 "optionalVariants": [
 {
 "build-command": "test:build-canary",
 "label": "nuxt-4 (canary)"
 }
 ]
 }
}

7 changes: 5 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down

67 changes: 64 additions & 3 deletions
packages/browser-utils/test/instrument/history.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
 const originalHistory = WINDOW.history;
 WINDOW.addEventListener = vi.fn();

 afterEach(() => {
 // @ts-expect-error - this is fine for testing
 WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
 pushState: expect.any(Function), // patched function
 });
 });

 it('does not trigger handlers when the URLs are the same', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with the same URL
 WINDOW.history.pushState({}, '', 'https://example.com/page1');

 expect(pushStateMock).toHaveBeenCalledTimes(1);
 expect(triggerHandlerSpy).not.toHaveBeenCalled();
 });

 it('triggers handlers when the URLs are different', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 // Setup a mock for history.pushState
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 // Run the instrumentation
 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with a different URL
 WINDOW.history.pushState({}, '', 'https://example.com/page2');

 // Original function should be called
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // triggerHandlers should be called with from and to data
 expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
 from: 'https://example.com/page1',
 to: 'https://example.com/page2',
 });
 });
});

12 changes: 6 additions & 6 deletions
packages/core/src/types-hoist/envelope.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
 EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
 | EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
 | CheckInEnvelope
 | SpanEnvelope
 | RawSecurityEnvelope
 | LogEnvelope;
 | OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];

2 changes: 1 addition & 1 deletion
packages/core/src/types-hoist/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
 TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down

6 changes: 4 additions & 2 deletions
packages/core/src/types-hoist/log.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
 stringValue: string;
 }
 | {
 intValue: number;
 // integers must be represented as a string
 // because JSON cannot differentiate between integers and floats
 intValue: string;
 }
 | {
 boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
 value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
 /**
 * The severity level of the log.
 *
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
 "@sentry/webpack-plugin": "3.2.2",
 "chalk": "3.0.0",
 "resolve": "1.22.8",
 "rollup": "4.34.9",
 "rollup": "4.35.0",
 "stacktrace-parser": "^0.1.10"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

s1gr1d
wants to merge
14
commits into

from

 Closed


meta(changelog): Update changelog for 9.7.0
#15724
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
9da8e7f

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


mydea Mar 17, 2025
0b37427

ref(core): Update log types to explicitly reference otel (#15704)


AbhiPrasad Mar 17, 2025
d16b077

chore(deps): Bump rollup to 4.35.0 (#15651)


nwalters512 Mar 17, 2025
16e40f4

feat(ci): Run yarn-deduplicate in CI (#15119)


nwalters512 Mar 17, 2025
26e2d17

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


s1gr1d Mar 18, 2025
2e5926c

test(browser-utils): Add test to make sure we run `originalHistoryFun…


AbhiPrasad Mar 18, 2025
8fb9501

Merge pull request #15708 from getsentry/master


github-actions[bot] Mar 18, 2025
469dae2

fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

Mar 18, 2025
90f41db

feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)


dependabot[bot] Mar 18, 2025
a5e5945

feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)


dependabot[bot] Mar 18, 2025
77c80e4

ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…


mydea Mar 18, 2025
c24a8eb

ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)


s1gr1d Mar 18, 2025
1d767b5

meta(changelog): Update changelog for 9.7.0


s1gr1d Mar 18, 2025
58e07b9

meta(changelog): Update changelog for 9.6.1


s1gr1d Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 6 additions & 0 deletions
.github/workflows/canary.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

9 changes: 9 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 },
Expand Down

8 changes: 5 additions & 3 deletions
dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
 },
 "overrides": {
 "@vercel/nft": "0.27.4"
 },
 "sentryTest": {
 "optionalVariants": [
 {
 "build-command": "test:build-canary",
 "label": "nuxt-4 (canary)"
 }
 ]
 }
}

7 changes: 5 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down

67 changes: 64 additions & 3 deletions
packages/browser-utils/test/instrument/history.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
 const originalHistory = WINDOW.history;
 WINDOW.addEventListener = vi.fn();

 afterEach(() => {
 // @ts-expect-error - this is fine for testing
 WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
 pushState: expect.any(Function), // patched function
 });
 });

 it('does not trigger handlers when the URLs are the same', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with the same URL
 WINDOW.history.pushState({}, '', 'https://example.com/page1');

 expect(pushStateMock).toHaveBeenCalledTimes(1);
 expect(triggerHandlerSpy).not.toHaveBeenCalled();
 });

 it('triggers handlers when the URLs are different', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 // Setup a mock for history.pushState
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 // Run the instrumentation
 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with a different URL
 WINDOW.history.pushState({}, '', 'https://example.com/page2');

 // Original function should be called
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // triggerHandlers should be called with from and to data
 expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
 from: 'https://example.com/page1',
 to: 'https://example.com/page2',
 });
 });
});

12 changes: 6 additions & 6 deletions
packages/core/src/types-hoist/envelope.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
 EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
 | EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
 | CheckInEnvelope
 | SpanEnvelope
 | RawSecurityEnvelope
 | LogEnvelope;
 | OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];

2 changes: 1 addition & 1 deletion
packages/core/src/types-hoist/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
 TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down

6 changes: 4 additions & 2 deletions
packages/core/src/types-hoist/log.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
 stringValue: string;
 }
 | {
 intValue: number;
 // integers must be represented as a string
 // because JSON cannot differentiate between integers and floats
 intValue: string;
 }
 | {
 boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
 value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
 /**
 * The severity level of the log.
 *
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
 "@sentry/webpack-plugin": "3.2.2",
 "chalk": "3.0.0",
 "resolve": "1.22.8",
 "rollup": "4.34.9",
 "rollup": "4.35.0",
 "stacktrace-parser": "^0.1.10"
 },
 "devDependencies": {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
meta(changelog): Update changelog for 9.7.0#15724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

s1gr1d
wants to merge
14
commits into

from

 Closed


meta(changelog): Update changelog for 9.7.0
#15724
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
9da8e7f

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


mydea Mar 17, 2025
0b37427

ref(core): Update log types to explicitly reference otel (#15704)


AbhiPrasad Mar 17, 2025
d16b077

chore(deps): Bump rollup to 4.35.0 (#15651)


nwalters512 Mar 17, 2025
16e40f4

feat(ci): Run yarn-deduplicate in CI (#15119)


nwalters512 Mar 17, 2025
26e2d17

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


s1gr1d Mar 18, 2025
2e5926c

test(browser-utils): Add test to make sure we run `originalHistoryFun…


AbhiPrasad Mar 18, 2025
8fb9501

Merge pull request #15708 from getsentry/master


github-actions[bot] Mar 18, 2025
469dae2

fix(nextjs): Re-patch router if it is overriden by Next.js (#15721)

Mar 18, 2025
90f41db

feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 (#15714)


dependabot[bot] Mar 18, 2025
a5e5945

feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 (#15711)


dependabot[bot] Mar 18, 2025
77c80e4

ref(node): Avoid `provider.register()` which is removed in OTEL v2 (#…


mydea Mar 18, 2025
c24a8eb

ci(nuxt): Canary test Nightly Channels of Nuxt (#15631)


s1gr1d Mar 18, 2025
1d767b5

meta(changelog): Update changelog for 9.7.0


s1gr1d Mar 18, 2025
58e07b9

meta(changelog): Update changelog for 9.6.1


s1gr1d Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

6 changes: 6 additions & 0 deletions
.github/workflows/canary.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

9 changes: 9 additions & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,15 @@

- "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 overriden 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))
- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))

## 9.6.0

### Important Changes
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
 },
Expand Down

8 changes: 5 additions & 3 deletions
dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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": {
Expand All@@ -25,5 +26,13 @@
 },
 "overrides": {
 "@vercel/nft": "0.27.4"
 },
 "sentryTest": {
 "optionalVariants": [
 {
 "build-command": "test:build-canary",
 "label": "nuxt-4 (canary)"
 }
 ]
 }
}

7 changes: 5 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand DownExpand Up@@ -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",
Expand All@@ -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,",
Expand Down

67 changes: 64 additions & 3 deletions
packages/browser-utils/test/instrument/history.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { describe, expect, it, vi, afterEach } from 'vitest';
import { WINDOW } from '../../src/types';
import { afterEach } from 'node:test';

import { instrumentHistory } from './../../src/instrument/history';
import * as instrumentHandlersModule from '@sentry/core';

describe('instrumentHistory', () => {
 const originalHistory = WINDOW.history;
 WINDOW.addEventListener = vi.fn();

 afterEach(() => {
 // @ts-expect-error - this is fine for testing
 WINDOW.history = originalHistory;
Expand DownExpand Up@@ -55,4 +54,66 @@ describe('instrumentHistory', () => {
 pushState: expect.any(Function), // patched function
 });
 });

 it('does not trigger handlers when the URLs are the same', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with the same URL
 WINDOW.history.pushState({}, '', 'https://example.com/page1');

 expect(pushStateMock).toHaveBeenCalledTimes(1);
 expect(triggerHandlerSpy).not.toHaveBeenCalled();
 });

 it('triggers handlers when the URLs are different', () => {
 const triggerHandlerSpy = vi.spyOn(instrumentHandlersModule, 'triggerHandlers');
 // Setup a mock for history.pushState
 const pushStateMock = vi.fn();

 // @ts-expect-error - this is fine for testing
 WINDOW.history = {
 pushState: pushStateMock,
 replaceState: () => {},
 };

 // Run the instrumentation
 instrumentHistory();

 // First call with URL1 to set lastHref
 WINDOW.history.pushState({}, '', 'https://example.com/page1');
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // Reset mocks to check next call
 pushStateMock.mockClear();
 vi.mocked(triggerHandlerSpy).mockClear();

 // Call with a different URL
 WINDOW.history.pushState({}, '', 'https://example.com/page2');

 // Original function should be called
 expect(pushStateMock).toHaveBeenCalledTimes(1);

 // triggerHandlers should be called with from and to data
 expect(triggerHandlerSpy).toHaveBeenCalledWith('history', {
 from: 'https://example.com/page1',
 to: 'https://example.com/page2',
 });
 });
});

12 changes: 6 additions & 6 deletions
packages/core/src/types-hoist/envelope.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import type { LegacyCSPReport } from './csp';
import type { DsnComponents } from './dsn';
import type { Event } from './event';
import type { FeedbackEvent, UserFeedback } from './feedback';
import type { Log } from './log';
import type { SerializedOtelLog } from './log';
import type { Profile, ProfileChunk } from './profiling';
import type { ReplayEvent, ReplayRecordingData } from './replay';
import type { SdkInfo } from './sdkinfo';
Expand DownExpand Up@@ -87,7 +87,7 @@ type CheckInItemHeaders = { type: 'check_in' };
type ProfileItemHeaders = { type: 'profile' };
type ProfileChunkItemHeaders = { type: 'profile_chunk' };
type SpanItemHeaders = { type: 'span' };
type LogItemHeaders = { type: 'otel_log' };
type OtelLogItemHeaders = { type: 'otel_log' };
type RawSecurityHeaders = { type: 'raw_security'; sentry_release?: string; sentry_environment?: string };

export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
Expand All@@ -104,7 +104,7 @@ export type FeedbackItem = BaseEnvelopeItem<FeedbackItemHeaders, FeedbackEvent>;
export type ProfileItem = BaseEnvelopeItem<ProfileItemHeaders, Profile>;
export type ProfileChunkItem = BaseEnvelopeItem<ProfileChunkItemHeaders, ProfileChunk>;
export type SpanItem = BaseEnvelopeItem<SpanItemHeaders, Partial<SpanJSON>>;
export type LogItem = BaseEnvelopeItem<LogItemHeaders, Log>;
export type OtelLogItem = BaseEnvelopeItem<OtelLogItemHeaders, SerializedOtelLog>;
export type RawSecurityItem = BaseEnvelopeItem<RawSecurityHeaders, LegacyCSPReport>;

export type EventEnvelopeHeaders = { event_id: string; sent_at: string; trace?: Partial<DynamicSamplingContext> };
Expand All@@ -113,7 +113,7 @@ type CheckInEnvelopeHeaders = { trace?: DynamicSamplingContext };
type ClientReportEnvelopeHeaders = BaseEnvelopeHeaders;
type ReplayEnvelopeHeaders = BaseEnvelopeHeaders;
type SpanEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type LogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };
type OtelLogEnvelopeHeaders = BaseEnvelopeHeaders & { trace?: DynamicSamplingContext };

export type EventEnvelope = BaseEnvelope<
 EventEnvelopeHeaders,
Expand All@@ -126,7 +126,7 @@ export type CheckInEnvelope = BaseEnvelope<CheckInEnvelopeHeaders, CheckInItem>;
export type SpanEnvelope = BaseEnvelope<SpanEnvelopeHeaders, SpanItem>;
export type ProfileChunkEnvelope = BaseEnvelope<BaseEnvelopeHeaders, ProfileChunkItem>;
export type RawSecurityEnvelope = BaseEnvelope<BaseEnvelopeHeaders, RawSecurityItem>;
export type LogEnvelope = BaseEnvelope<LogEnvelopeHeaders, LogItem>;
export type OtelLogEnvelope = BaseEnvelope<OtelLogEnvelopeHeaders, OtelLogItem>;

export type Envelope =
 | EventEnvelope
Expand All@@ -137,6 +137,6 @@ export type Envelope =
 | CheckInEnvelope
 | SpanEnvelope
 | RawSecurityEnvelope
 | LogEnvelope;
 | OtelLogEnvelope;

export type EnvelopeItem = Envelope[1][number];

2 changes: 1 addition & 1 deletion
packages/core/src/types-hoist/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,7 +110,7 @@ export type {
 TraceFlag,
} from './span';
export type { SpanStatus } from './spanStatus';
export type { Log, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { SerializedOtelLog, LogAttribute, LogSeverityLevel, LogAttributeValueType } from './log';
export type { TimedEvent } from './timedEvent';
export type { StackFrame } from './stackframe';
export type { Stacktrace, StackParser, StackLineParser, StackLineParserFn } from './stacktrace';
Expand Down

6 changes: 4 additions & 2 deletions
packages/core/src/types-hoist/log.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ export type LogAttributeValueType =
 stringValue: string;
 }
 | {
 intValue: number;
 // integers must be represented as a string
 // because JSON cannot differentiate between integers and floats
 intValue: string;
 }
 | {
 boolValue: boolean;
Expand All@@ -19,7 +21,7 @@ export type LogAttribute = {
 value: LogAttributeValueType;
};

export interface Log {
export interface SerializedOtelLog {
 /**
 * The severity level of the log.
 *
Expand Down

2 changes: 1 addition & 1 deletion
packages/nextjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@
 "@sentry/webpack-plugin": "3.2.2",
 "chalk": "3.0.0",
 "resolve": "1.22.8",
 "rollup": "4.34.9",
 "rollup": "4.35.0",
 "stacktrace-parser": "^0.1.10"
 },
 "devDependencies": {
Expand Down
Loading