Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dev-packages/bun-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"devDependencies": {
"@sentry-internal/test-utils": "11.0.0",
"bun-types": "^1.2.9",
"vitest": "^3.2.7"
"vitest": "^4.1.11"
},
"volta": {
"extends": "../../package.json"
Expand Down
6 changes: 1 addition & 5 deletions dev-packages/bun-integration-tests/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ export default defineConfig({
}
: {}),
pool: 'threads',
poolOptions: {
threads: {
singleThread: true,
},
},
maxWorkers: 1,
reporters: process.env.DEBUG
? ['default', { summary: false }]
: process.env.GITHUB_ACTIONS
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/bundler-plugin-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"devDependencies": {
"premove": "^4.0.0",
"typescript": "~6.0.3",
"vitest": "^3.2.7"
"vitest": "^4.1.11"
},
"volta": {
"extends": "../../package.json"
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/bundler-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@rollup/plugin-node-resolve": "^16.0.3",
"@sentry/browser": "11.0.0",
"rollup": "^4.60.3",
"vite": "^6.4.3",
"vitest": "^3.2.7",
"vite": "^8.3.1",
"vitest": "^4.1.11",
"webpack": "^5.0.0"
},
"volta": {
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/cloudflare-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"@sentry/conventions": "0.24.0",
"eslint-plugin-regexp": "^3.1.0",
"prisma": "6.15.0",
"vite": "7.3.5",
"vitest": "^3.2.7",
"vite": "^8.3.1",
"vitest": "^4.1.11",
"wrangler": "4.86.0"
},
"volta": {
Expand Down
6 changes: 1 addition & 5 deletions dev-packages/cloudflare-integration-tests/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ export default defineConfig({
// overhead is significantly less.
pool: 'threads',
// Run tests sequentially to avoid port conflicts with wrangler dev processes
poolOptions: {
threads: {
singleThread: true,
},
},
maxWorkers: 1,
sequence: {
shuffle: true,
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"@size-limit/webpack": "~12.1.0",
"@types/jsdom": "^21.1.6",
"@types/node": "^18.19.1",
"@vitest/coverage-v8": "^3.2.7",
"@vitest/coverage-v8": "^4.1.11",
"deepmerge": "^4.2.2",
"es-check": "^7.2.1",
"esbuild": "^0.28.1",
Expand All @@ -143,7 +143,7 @@
"size-limit": "~12.1.0",
"tsx": "^4.23.0",
"typescript": "~7.0.2",
"vitest": "^3.2.7",
"vitest": "^4.1.11",
"yalc": "^1.0.0-pre.53",
"yarn-deduplicate": "6.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"devDependencies": {
"astro": "^4.16.19",
"vite": "^6.4.3"
"vite": "^8.3.1"
},
"scripts": {
"build": "run-p build:transpile build:types",
Expand Down
55 changes: 38 additions & 17 deletions packages/browser/test/profiling/UIProfiler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ describe('Browser Profiling v2 trace lifecycle', () => {
addEventListener() {}
}

const mockConstructor = vi.fn().mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => {
const mockConstructor = vi.fn().mockImplementation(function (opts: {
sampleInterval: number;
maxBufferSize: number;
}) {
return new MockProfilerImpl(opts);
});

Expand Down Expand Up @@ -348,9 +351,12 @@ describe('Browser Profiling v2 trace lifecycle', () => {
addEventListener() {}
}

(window as any).Profiler = vi
.fn()
.mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => new MockProfilerImpl(opts));
(window as any).Profiler = vi.fn().mockImplementation(function (opts: {
sampleInterval: number;
maxBufferSize: number;
}) {
return new MockProfilerImpl(opts);
});

const send = vi.fn().mockResolvedValue(undefined);

Expand Down Expand Up @@ -408,9 +414,12 @@ describe('Browser Profiling v2 trace lifecycle', () => {
addEventListener() {}
}

(window as any).Profiler = vi
.fn()
.mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => new MockProfilerImpl(opts));
(window as any).Profiler = vi.fn().mockImplementation(function (opts: {
sampleInterval: number;
maxBufferSize: number;
}) {
return new MockProfilerImpl(opts);
});

const send = vi.fn().mockResolvedValue(undefined);

Expand Down Expand Up @@ -462,9 +471,12 @@ describe('Browser Profiling v2 trace lifecycle', () => {
addEventListener() {}
}

(window as any).Profiler = vi
.fn()
.mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => new MockProfilerImpl(opts));
(window as any).Profiler = vi.fn().mockImplementation(function (opts: {
sampleInterval: number;
maxBufferSize: number;
}) {
return new MockProfilerImpl(opts);
});

const send = vi.fn().mockResolvedValue(undefined);

Expand Down Expand Up @@ -521,9 +533,12 @@ describe('Browser Profiling v2 trace lifecycle', () => {
addEventListener() {}
}

(window as any).Profiler = vi
.fn()
.mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => new MockProfilerImpl(opts));
(window as any).Profiler = vi.fn().mockImplementation(function (opts: {
sampleInterval: number;
maxBufferSize: number;
}) {
return new MockProfilerImpl(opts);
});

// Session 1
const send1 = vi.fn().mockResolvedValue(undefined);
Expand Down Expand Up @@ -747,7 +762,10 @@ describe('Browser Profiling v2 manual lifecycle', () => {
addEventListener() {}
}

const mockConstructor = vi.fn().mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => {
const mockConstructor = vi.fn().mockImplementation(function (opts: {
sampleInterval: number;
maxBufferSize: number;
}) {
return new MockProfilerImpl(opts);
});

Expand Down Expand Up @@ -869,9 +887,12 @@ describe('Browser Profiling v2 manual lifecycle', () => {
addEventListener() {}
}

(window as any).Profiler = vi
.fn()
.mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => new MockProfilerImpl(opts));
(window as any).Profiler = vi.fn().mockImplementation(function (opts: {
sampleInterval: number;
maxBufferSize: number;
}) {
return new MockProfilerImpl(opts);
});

const send = vi.fn().mockResolvedValue(undefined);

Expand Down
10 changes: 6 additions & 4 deletions packages/browser/test/profiling/integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ describe('BrowserProfilingIntegration', () => {
resources: [],
});

const mockProfiler = vi.fn().mockImplementation(() => ({
stop: stopProfile,
addEventListener: vi.fn(),
}));
const mockProfiler = vi.fn().mockImplementation(function () {
return {
stop: stopProfile,
addEventListener: vi.fn(),
};
});

// @ts-expect-error this is a mock constructor
window.Profiler = mockProfiler;
Expand Down
2 changes: 1 addition & 1 deletion packages/bundler-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"@types/node": "^18.6.3",
"premove": "^4.0.0",
"rolldown": "^1.0.0",
"vitest": "^3.2.7",
"vitest": "^4.1.11",
"webpack": "5.104.1"
},
"volta": {
Expand Down
14 changes: 8 additions & 6 deletions packages/cloudflare/test/durableobject.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -806,12 +806,14 @@ describe('instrumentDurableObjectWithSentry', () => {
const before = flush.mock.calls.length;

const waitUntil = vi.fn();
const testClass = vi.fn(context => ({
fetch: () => {
context.waitUntil(new Promise(res => setTimeout(res)));
return new Response('test');
},
}));
const testClass = vi.fn(function (context) {
return {
fetch: () => {
context.waitUntil(new Promise(res => setTimeout(res)));
return new Response('test');
},
};
});
const instrumented = instrumentDurableObjectWithSentry(vi.fn(), testClass as any);
const context = {
waitUntil,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,17 @@ describe('instrumentWorkerEntrypoint', () => {
});

const waitUntil = vi.fn();
const TestClass = vi.fn((context: ExecutionContext) => ({
fetch: () => {
// The client is created per request, on the scope forked for that request, so it is only
// reachable from inside the handler.
testClient = SentryCore.getClient();
context.waitUntil(deferred);
return new Response('test');
},
}));
const TestClass = vi.fn(function (context: ExecutionContext) {
return {
fetch: () => {
// The client is created per request, on the scope forked for that request, so it is only
// reachable from inside the handler.
testClient = SentryCore.getClient();
context.waitUntil(deferred);
return new Response('test');
},
};
});
const instrumented = instrumentWorkerEntrypoint(vi.fn(), TestClass as unknown as WorkerEntrypointConstructor);
const context = { ...createMockExecutionContext(), waitUntil };
const worker = Reflect.construct(instrumented, [context, {}]);
Expand Down
1 change: 1 addition & 0 deletions packages/cloudflare/test/request.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1172,6 +1172,7 @@ describe('Durable Object (DO) context', () => {

describe('cached client (cacheClient)', () => {
beforeEach(() => {
vi.clearAllMocks();
_clearGlobalClientCache();
});

Expand Down
4 changes: 3 additions & 1 deletion packages/core/test/integrations/spanStreaming.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ const mockSpanBufferInstance = vi.hoisted(() => ({
}));

const MockSpanBuffer = vi.hoisted(() => {
return vi.fn(() => mockSpanBufferInstance);
return vi.fn(function () {
return mockSpanBufferInstance;
});
});

vi.mock('../../src/tracing/spans/spanBuffer', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('injectTracePropagationHeaders', () => {
});

afterEach(() => {
vi.restoreAllMocks();
vi.resetAllMocks();
});

it('injects sentry-trace, traceparent, and baggage headers', () => {
Expand Down
1 change: 1 addition & 0 deletions packages/core/test/lib/integrations/supabase.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ function createMockSupabaseClient(resolveWith: unknown, options?: CreateMockSupa

describe('Supabase Integration', () => {
beforeEach(() => {
vi.clearAllMocks();
currentScopesMocks.getClient.mockReturnValue(undefined);
tracingMocks.startedSpans.length = 0;
});
Expand Down
6 changes: 5 additions & 1 deletion packages/core/test/lib/utils/meta.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { describe, expect, it, vi } from 'vitest';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { getTraceMetaTags } from '../../../src/utils/meta';
import * as TraceDataModule from '../../../src/utils/traceData';

describe('getTraceMetaTags', () => {
afterEach(() => {
vi.restoreAllMocks();
});

it('renders baggage and sentry-trace values to stringified Html meta tags', () => {
vi.spyOn(TraceDataModule, 'getTraceData').mockReturnValueOnce({
'sentry-trace': '12345678901234567890123456789012-1234567890123456-1',
Expand Down
7 changes: 4 additions & 3 deletions packages/hono/test/shared/patchAppUse.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,18 +314,19 @@ describe('patchHttpMethodHandlers (inline middleware spans on main app)', () =>
return result;
});
const fakeApp = Object.assign(new Hono(), { query });
const middlewareSpy = vi.fn();
async function queryMiddleware(receivedContext: unknown, next: () => Promise<void>) {
middlewareSpy(receivedContext, next);
expect(receivedContext).toBe(context);
await next();
}
const middleware = vi.fn(queryMiddleware);
const handler = vi.fn((receivedContext: unknown) => {
expect(receivedContext).toBe(context);
return 'handled';
});

patchHttpMethodHandlers(fakeApp as unknown as Parameters<typeof patchHttpMethodHandlers>[0]);
const registrationResult = fakeApp.query('/test', middleware, handler);
const registrationResult = fakeApp.query('/test', queryMiddleware, handler);

expect(registrationResult).toBe(result);
if (!registeredMiddleware || !registeredHandler) {
Expand All @@ -339,7 +340,7 @@ describe('patchHttpMethodHandlers (inline middleware spans on main app)', () =>

expect(startInactiveSpanMock).toHaveBeenCalledTimes(1);
expect(startInactiveSpanMock).toHaveBeenCalledWith(expect.objectContaining({ name: 'queryMiddleware' }));
expect(middleware).toHaveBeenCalledWith(context, next);
expect(middlewareSpy).toHaveBeenCalledWith(context, next);
expect(next).toHaveBeenCalledTimes(1);
expect(handler).toHaveBeenCalledWith(context);
expect(handlerResult).toBe('handled');
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/test/config/wrappingLoader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { WrappingLoaderOptions } from '../../src/config/loaders/wrappingLoa

vi.mock('fs', { spy: true });

const originalReadfileSync = fs.readFileSync;
const { readFileSync: originalReadfileSync } = await vi.importActual<typeof fs>('fs');

vi.spyOn(fs, 'readFileSync').mockImplementation((filePath, options) => {
if (filePath.toString().endsWith('/config/templates/apiWrapperTemplate.js')) {
Expand Down
4 changes: 3 additions & 1 deletion packages/node/test/transports/http.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,9 @@ describe('makeNewHttpTransport()', () => {
const proxyAgentSpy = vi
.spyOn(httpProxyAgent, 'HttpsProxyAgent')
// @ts-expect-error using http agent as https proxy agent
.mockImplementation(() => new http.Agent({ keepAlive: false, maxSockets: 30, timeout: 2000 }));
.mockImplementation(function () {
return new http.Agent({ keepAlive: false, maxSockets: 30, timeout: 2000 });
});

it('can be configured through option', () => {
makeNodeTransport({
Expand Down
4 changes: 3 additions & 1 deletion packages/node/test/transports/https.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ describe('makeNewHttpsTransport()', () => {
const proxyAgentSpy = vi
.spyOn(httpProxyAgent, 'HttpsProxyAgent')
// @ts-expect-error using http agent as https proxy agent
.mockImplementation(() => new http.Agent({ keepAlive: false, maxSockets: 30, timeout: 2000 }));
.mockImplementation(function () {
return new http.Agent({ keepAlive: false, maxSockets: 30, timeout: 2000 });
});

it('can be configured through option', () => {
makeNodeTransport({
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"nitro": "^3.0.260311-beta",
"nuxi": "^3.25.1",
"nuxt": "3.21.11",
"vite": "^6.4.3"
"vite": "^8.3.1"
},
"scripts": {
"build": "run-s build:types build:transpile",
Expand Down
Loading
Loading