test(otel): Migrate to Vitest#15545

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

Merged
AbhiPrasad merged 1 commit into from
Feb 28, 2025
Merged

test(otel): Migrate to Vitest #15545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion packages/opentelemetry/jest.config.js
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions packages/opentelemetry/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
"clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
"fix": "eslint . --format stylish --fix",
"lint": "eslint . --format stylish",
"test": "yarn test:jest",
"test:jest": "jest",
"test:watch": "jest --watch",
"test": "yarn test:unit",
"test:unit": "vitest run",
"test:watch": "vitest --watch",
"yalc:publish": "yalc publish --push --sig"
},
"volta": {
Expand Down
233 changes: 123 additions & 110 deletions packages/opentelemetry/test/asyncContextStrategy.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
withIsolationScope,
withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
});

describe('withScope()', () => {
it('will make the passed scope the active scope within the callback', done => {
withScope(scope => {
expect(getCurrentScope()).toBe(scope);
done();
});
});

it('will pass a scope that is different from the current active isolation scope', done => {
withScope(scope => {
expect(getIsolationScope()).not.toBe(scope);
done();
});
});

it('will always make the inner most passed scope the current scope when nesting calls', done => {
withIsolationScope(_scope1 => {
withIsolationScope(scope2 => {
expect(getIsolationScope()).toBe(scope2);
it('will make the passed scope the active scope within the callback', () =>
new Promise<void>(done => {
withScope(scope => {
expect(getCurrentScope()).toBe(scope);
done();
});
});
});

it('forks the scope when not passing any scope', done => {
const initialScope = getCurrentScope();
initialScope.setTag('aa', 'aa');

withScope(scope => {
expect(getCurrentScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
});

it('forks the scope when passing undefined', done => {
const initialScope = getCurrentScope();
initialScope.setTag('aa', 'aa');
}));

withScope(undefined, scope => {
expect(getCurrentScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
});
it('will pass a scope that is different from the current active isolation scope', () =>
new Promise<void>(done => {
withScope(scope => {
expect(getIsolationScope()).not.toBe(scope);
done();
});
}));

it('will always make the inner most passed scope the current scope when nesting calls', () =>
new Promise<void>(done => {
withIsolationScope(_scope1 => {
withIsolationScope(scope2 => {
expect(getIsolationScope()).toBe(scope2);
done();
});
});
}));

it('forks the scope when not passing any scope', () =>
new Promise<void>(done => {
const initialScope = getCurrentScope();
initialScope.setTag('aa', 'aa');

withScope(scope => {
expect(getCurrentScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
}));

it('forks the scope when passing undefined', () =>
new Promise<void>(done => {
const initialScope = getCurrentScope();
initialScope.setTag('aa', 'aa');

withScope(undefined, scope => {
expect(getCurrentScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
}));

it('sets the passed in scope as active scope', done => {
const initialScope = getCurrentScope();
initialScope.setTag('aa', 'aa');
it('sets the passed in scope as active scope', () =>
new Promise<void>(done => {
const initialScope = getCurrentScope();
initialScope.setTag('aa', 'aa');

const customScope = new ScopeClass();
const customScope = new ScopeClass();

withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
}));
});

describe('withIsolationScope()', () => {
it('will make the passed isolation scope the active isolation scope within the callback', done => {
withIsolationScope(scope => {
expect(getIsolationScope()).toBe(scope);
done();
});
});

it('will pass an isolation scope that is different from the current active scope', done => {
withIsolationScope(scope => {
expect(getCurrentScope()).not.toBe(scope);
done();
});
});

it('will always make the inner most passed scope the current scope when nesting calls', done => {
withIsolationScope(_scope1 => {
withIsolationScope(scope2 => {
expect(getIsolationScope()).toBe(scope2);
it('will make the passed isolation scope the active isolation scope within the callback', () =>
new Promise<void>(done => {
withIsolationScope(scope => {
expect(getIsolationScope()).toBe(scope);
done();
});
});
});

it('forks the isolation scope when not passing any isolation scope', done => {
const initialScope = getIsolationScope();
initialScope.setTag('aa', 'aa');

withIsolationScope(scope => {
expect(getIsolationScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
});

it('forks the isolation scope when passing undefined', done => {
const initialScope = getIsolationScope();
initialScope.setTag('aa', 'aa');
}));

withIsolationScope(undefined, scope => {
expect(getIsolationScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
});
it('will pass an isolation scope that is different from the current active scope', () =>
new Promise<void>(done => {
withIsolationScope(scope => {
expect(getCurrentScope()).not.toBe(scope);
done();
});
}));

it('will always make the inner most passed scope the current scope when nesting calls', () =>
new Promise<void>(done => {
withIsolationScope(_scope1 => {
withIsolationScope(scope2 => {
expect(getIsolationScope()).toBe(scope2);
done();
});
});
}));

it('forks the isolation scope when not passing any isolation scope', () =>
new Promise<void>(done => {
const initialScope = getIsolationScope();
initialScope.setTag('aa', 'aa');

withIsolationScope(scope => {
expect(getIsolationScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
}));

it('forks the isolation scope when passing undefined', () =>
new Promise<void>(done => {
const initialScope = getIsolationScope();
initialScope.setTag('aa', 'aa');

withIsolationScope(undefined, scope => {
expect(getIsolationScope()).toBe(scope);
scope.setTag('bb', 'bb');
expect(scope).not.toBe(initialScope);
expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
done();
});
}));

it('sets the passed in isolation scope as active isolation scope', done => {
const initialScope = getIsolationScope();
initialScope.setTag('aa', 'aa');
it('sets the passed in isolation scope as active isolation scope', () =>
new Promise<void>(done => {
const initialScope = getIsolationScope();
initialScope.setTag('aa', 'aa');

const customScope = new ScopeClass();
const customScope = new ScopeClass();

withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
}));
});
});
1 change: 1 addition & 0 deletions packages/opentelemetry/test/custom/client.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down
20 changes: 12 additions & 8 deletions packages/opentelemetry/test/helpers/mockSdkInit.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
getCurrentScope().setClient(undefined);
getIsolationScope().clear();
getGlobalScope().clear();
delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
clearOpenTelemetrySetupCheck();

const provider = getProvider(_provider);

if (!provider) {
return;
if (provider) {
await provider.forceFlush();
await provider.shutdown();
}

void provider.forceFlush();
void provider.shutdown();

// Disable all globally registered APIs
trace.disable();
context.disable();
propagation.disable();

await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
let provider = _provider || trace.getTracerProvider();
let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

if (provider instanceof ProxyTracerProvider) {
provider = provider.getDelegate();
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
test(otel): Migrate to Vitest#15545

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

 Merged

AbhiPrasad
merged 1 commit into

from

Feb 28, 2025
 Merged


test(otel): Migrate to Vitest
#15545
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 0 additions & 1 deletion
packages/opentelemetry/jest.config.js

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
 "clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "yarn test:jest",
 "test:jest": "jest",
 "test:watch": "jest --watch",
 "test": "yarn test:unit",
 "test:unit": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

233 changes: 123 additions & 110 deletions
packages/opentelemetry/test/asyncContextStrategy.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
 });

 describe('withScope()', () => {
 it('will make the passed scope the active scope within the callback', done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });

 it('will pass a scope that is different from the current active isolation scope', done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed scope the active scope within the callback', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the scope when not passing any scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the scope when passing undefined', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 }));

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass a scope that is different from the current active isolation scope', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the scope when not passing any scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in scope as active scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in scope as active scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withScope(customScope, scope => {
 expect(getCurrentScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });

 describe('withIsolationScope()', () => {
 it('will make the passed isolation scope the active isolation scope within the callback', done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });

 it('will pass an isolation scope that is different from the current active scope', done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed isolation scope the active isolation scope within the callback', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the isolation scope when not passing any isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the isolation scope when passing undefined', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 }));

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass an isolation scope that is different from the current active scope', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the isolation scope when not passing any isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the isolation scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in isolation scope as active isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in isolation scope as active isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withIsolationScope(customScope, scope => {
 expect(getIsolationScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });
});

1 change: 1 addition & 0 deletions
packages/opentelemetry/test/custom/client.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down

20 changes: 12 additions & 8 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
 getCurrentScope().setClient(undefined);
 getIsolationScope().clear();
 getGlobalScope().clear();
 delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
 init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
 clearOpenTelemetrySetupCheck();

 const provider = getProvider(_provider);

 if (!provider) {
 return;
 if (provider) {
 await provider.forceFlush();
 await provider.shutdown();
 }

 void provider.forceFlush();
 void provider.shutdown();

 // Disable all globally registered APIs
 trace.disable();
 context.disable();
 propagation.disable();

 await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || trace.getTracerProvider();
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
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
test(otel): Migrate to Vitest#15545

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

 Merged

AbhiPrasad
merged 1 commit into

from

Feb 28, 2025
 Merged


test(otel): Migrate to Vitest
#15545
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 0 additions & 1 deletion
packages/opentelemetry/jest.config.js

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
 "clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "yarn test:jest",
 "test:jest": "jest",
 "test:watch": "jest --watch",
 "test": "yarn test:unit",
 "test:unit": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

233 changes: 123 additions & 110 deletions
packages/opentelemetry/test/asyncContextStrategy.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
 });

 describe('withScope()', () => {
 it('will make the passed scope the active scope within the callback', done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });

 it('will pass a scope that is different from the current active isolation scope', done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed scope the active scope within the callback', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the scope when not passing any scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the scope when passing undefined', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 }));

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass a scope that is different from the current active isolation scope', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the scope when not passing any scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in scope as active scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in scope as active scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withScope(customScope, scope => {
 expect(getCurrentScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });

 describe('withIsolationScope()', () => {
 it('will make the passed isolation scope the active isolation scope within the callback', done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });

 it('will pass an isolation scope that is different from the current active scope', done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed isolation scope the active isolation scope within the callback', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the isolation scope when not passing any isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the isolation scope when passing undefined', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 }));

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass an isolation scope that is different from the current active scope', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the isolation scope when not passing any isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the isolation scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in isolation scope as active isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in isolation scope as active isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withIsolationScope(customScope, scope => {
 expect(getIsolationScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });
});

1 change: 1 addition & 0 deletions
packages/opentelemetry/test/custom/client.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down

20 changes: 12 additions & 8 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
 getCurrentScope().setClient(undefined);
 getIsolationScope().clear();
 getGlobalScope().clear();
 delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
 init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
 clearOpenTelemetrySetupCheck();

 const provider = getProvider(_provider);

 if (!provider) {
 return;
 if (provider) {
 await provider.forceFlush();
 await provider.shutdown();
 }

 void provider.forceFlush();
 void provider.shutdown();

 // Disable all globally registered APIs
 trace.disable();
 context.disable();
 propagation.disable();

 await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || trace.getTracerProvider();
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
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
test(otel): Migrate to Vitest#15545

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

 Merged

AbhiPrasad
merged 1 commit into

from

Feb 28, 2025
 Merged


test(otel): Migrate to Vitest
#15545
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 0 additions & 1 deletion
packages/opentelemetry/jest.config.js

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
 "clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "yarn test:jest",
 "test:jest": "jest",
 "test:watch": "jest --watch",
 "test": "yarn test:unit",
 "test:unit": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

233 changes: 123 additions & 110 deletions
packages/opentelemetry/test/asyncContextStrategy.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
 });

 describe('withScope()', () => {
 it('will make the passed scope the active scope within the callback', done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });

 it('will pass a scope that is different from the current active isolation scope', done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed scope the active scope within the callback', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the scope when not passing any scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the scope when passing undefined', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 }));

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass a scope that is different from the current active isolation scope', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the scope when not passing any scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in scope as active scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in scope as active scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withScope(customScope, scope => {
 expect(getCurrentScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });

 describe('withIsolationScope()', () => {
 it('will make the passed isolation scope the active isolation scope within the callback', done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });

 it('will pass an isolation scope that is different from the current active scope', done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed isolation scope the active isolation scope within the callback', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the isolation scope when not passing any isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the isolation scope when passing undefined', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 }));

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass an isolation scope that is different from the current active scope', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the isolation scope when not passing any isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the isolation scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in isolation scope as active isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in isolation scope as active isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withIsolationScope(customScope, scope => {
 expect(getIsolationScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });
});

1 change: 1 addition & 0 deletions
packages/opentelemetry/test/custom/client.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down

20 changes: 12 additions & 8 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
 getCurrentScope().setClient(undefined);
 getIsolationScope().clear();
 getGlobalScope().clear();
 delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
 init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
 clearOpenTelemetrySetupCheck();

 const provider = getProvider(_provider);

 if (!provider) {
 return;
 if (provider) {
 await provider.forceFlush();
 await provider.shutdown();
 }

 void provider.forceFlush();
 void provider.shutdown();

 // Disable all globally registered APIs
 trace.disable();
 context.disable();
 propagation.disable();

 await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || trace.getTracerProvider();
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
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
test(otel): Migrate to Vitest#15545

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

 Merged

AbhiPrasad
merged 1 commit into

from

Feb 28, 2025
 Merged


test(otel): Migrate to Vitest
#15545
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 0 additions & 1 deletion
packages/opentelemetry/jest.config.js

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
 "clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "yarn test:jest",
 "test:jest": "jest",
 "test:watch": "jest --watch",
 "test": "yarn test:unit",
 "test:unit": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

233 changes: 123 additions & 110 deletions
packages/opentelemetry/test/asyncContextStrategy.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
 });

 describe('withScope()', () => {
 it('will make the passed scope the active scope within the callback', done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });

 it('will pass a scope that is different from the current active isolation scope', done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed scope the active scope within the callback', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the scope when not passing any scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the scope when passing undefined', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 }));

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass a scope that is different from the current active isolation scope', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the scope when not passing any scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in scope as active scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in scope as active scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withScope(customScope, scope => {
 expect(getCurrentScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });

 describe('withIsolationScope()', () => {
 it('will make the passed isolation scope the active isolation scope within the callback', done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });

 it('will pass an isolation scope that is different from the current active scope', done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed isolation scope the active isolation scope within the callback', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the isolation scope when not passing any isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the isolation scope when passing undefined', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 }));

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass an isolation scope that is different from the current active scope', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the isolation scope when not passing any isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the isolation scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in isolation scope as active isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in isolation scope as active isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withIsolationScope(customScope, scope => {
 expect(getIsolationScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });
});

1 change: 1 addition & 0 deletions
packages/opentelemetry/test/custom/client.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down

20 changes: 12 additions & 8 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
 getCurrentScope().setClient(undefined);
 getIsolationScope().clear();
 getGlobalScope().clear();
 delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
 init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
 clearOpenTelemetrySetupCheck();

 const provider = getProvider(_provider);

 if (!provider) {
 return;
 if (provider) {
 await provider.forceFlush();
 await provider.shutdown();
 }

 void provider.forceFlush();
 void provider.shutdown();

 // Disable all globally registered APIs
 trace.disable();
 context.disable();
 propagation.disable();

 await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || trace.getTracerProvider();
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
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
test(otel): Migrate to Vitest#15545

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

 Merged

AbhiPrasad
merged 1 commit into

from

Feb 28, 2025
 Merged


test(otel): Migrate to Vitest
#15545
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 0 additions & 1 deletion
packages/opentelemetry/jest.config.js

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
 "clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "yarn test:jest",
 "test:jest": "jest",
 "test:watch": "jest --watch",
 "test": "yarn test:unit",
 "test:unit": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

233 changes: 123 additions & 110 deletions
packages/opentelemetry/test/asyncContextStrategy.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
 });

 describe('withScope()', () => {
 it('will make the passed scope the active scope within the callback', done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });

 it('will pass a scope that is different from the current active isolation scope', done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed scope the active scope within the callback', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the scope when not passing any scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the scope when passing undefined', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 }));

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass a scope that is different from the current active isolation scope', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the scope when not passing any scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in scope as active scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in scope as active scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withScope(customScope, scope => {
 expect(getCurrentScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });

 describe('withIsolationScope()', () => {
 it('will make the passed isolation scope the active isolation scope within the callback', done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });

 it('will pass an isolation scope that is different from the current active scope', done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed isolation scope the active isolation scope within the callback', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the isolation scope when not passing any isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the isolation scope when passing undefined', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 }));

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass an isolation scope that is different from the current active scope', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the isolation scope when not passing any isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the isolation scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in isolation scope as active isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in isolation scope as active isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withIsolationScope(customScope, scope => {
 expect(getIsolationScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });
});

1 change: 1 addition & 0 deletions
packages/opentelemetry/test/custom/client.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down

20 changes: 12 additions & 8 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
 getCurrentScope().setClient(undefined);
 getIsolationScope().clear();
 getGlobalScope().clear();
 delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
 init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
 clearOpenTelemetrySetupCheck();

 const provider = getProvider(_provider);

 if (!provider) {
 return;
 if (provider) {
 await provider.forceFlush();
 await provider.shutdown();
 }

 void provider.forceFlush();
 void provider.shutdown();

 // Disable all globally registered APIs
 trace.disable();
 context.disable();
 propagation.disable();

 await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || trace.getTracerProvider();
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
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
test(otel): Migrate to Vitest#15545

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

 Merged

AbhiPrasad
merged 1 commit into

from

Feb 28, 2025
 Merged


test(otel): Migrate to Vitest
#15545
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 0 additions & 1 deletion
packages/opentelemetry/jest.config.js

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
 "clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "yarn test:jest",
 "test:jest": "jest",
 "test:watch": "jest --watch",
 "test": "yarn test:unit",
 "test:unit": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

233 changes: 123 additions & 110 deletions
packages/opentelemetry/test/asyncContextStrategy.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
 });

 describe('withScope()', () => {
 it('will make the passed scope the active scope within the callback', done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });

 it('will pass a scope that is different from the current active isolation scope', done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed scope the active scope within the callback', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the scope when not passing any scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the scope when passing undefined', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 }));

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass a scope that is different from the current active isolation scope', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the scope when not passing any scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in scope as active scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in scope as active scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withScope(customScope, scope => {
 expect(getCurrentScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });

 describe('withIsolationScope()', () => {
 it('will make the passed isolation scope the active isolation scope within the callback', done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });

 it('will pass an isolation scope that is different from the current active scope', done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed isolation scope the active isolation scope within the callback', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the isolation scope when not passing any isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the isolation scope when passing undefined', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 }));

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass an isolation scope that is different from the current active scope', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the isolation scope when not passing any isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the isolation scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in isolation scope as active isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in isolation scope as active isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withIsolationScope(customScope, scope => {
 expect(getIsolationScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });
});

1 change: 1 addition & 0 deletions
packages/opentelemetry/test/custom/client.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down

20 changes: 12 additions & 8 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
 getCurrentScope().setClient(undefined);
 getIsolationScope().clear();
 getGlobalScope().clear();
 delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
 init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
 clearOpenTelemetrySetupCheck();

 const provider = getProvider(_provider);

 if (!provider) {
 return;
 if (provider) {
 await provider.forceFlush();
 await provider.shutdown();
 }

 void provider.forceFlush();
 void provider.shutdown();

 // Disable all globally registered APIs
 trace.disable();
 context.disable();
 propagation.disable();

 await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || trace.getTracerProvider();
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
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
test(otel): Migrate to Vitest#15545

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

 Merged

AbhiPrasad
merged 1 commit into

from

Feb 28, 2025
 Merged


test(otel): Migrate to Vitest
#15545
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


1 change: 0 additions & 1 deletion
packages/opentelemetry/jest.config.js

View file


Open in desktop


This file was deleted.


6 changes: 3 additions & 3 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,9 +73,9 @@
 "clean": "rimraf build coverage sentry-opentelemetry-*.tgz",
 "fix": "eslint . --format stylish --fix",
 "lint": "eslint . --format stylish",
 "test": "yarn test:jest",
 "test:jest": "jest",
 "test:watch": "jest --watch",
 "test": "yarn test:unit",
 "test:unit": "vitest run",
 "test:watch": "vitest --watch",
 "yalc:publish": "yalc publish --push --sig"
 },
 "volta": {
Expand Down

233 changes: 123 additions & 110 deletions
packages/opentelemetry/test/asyncContextStrategy.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 withIsolationScope,
 withScope,
} from '@sentry/core';
import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';

import type { Scope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
Expand DownExpand Up@@ -301,130 +302,142 @@ describe('asyncContextStrategy', () => {
 });

 describe('withScope()', () => {
 it('will make the passed scope the active scope within the callback', done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });

 it('will pass a scope that is different from the current active isolation scope', done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed scope the active scope within the callback', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the scope when not passing any scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the scope when passing undefined', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 }));

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass a scope that is different from the current active isolation scope', () =>
 new Promise<void>(done => {
 withScope(scope => {
 expect(getIsolationScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the scope when not passing any scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 withScope(undefined, scope => {
 expect(getCurrentScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in scope as active scope', done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in scope as active scope', () =>
 new Promise<void>(done => {
 const initialScope = getCurrentScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withScope(customScope, scope => {
 expect(getCurrentScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withScope(customScope, scope => {
expect(getCurrentScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });

 describe('withIsolationScope()', () => {
 it('will make the passed isolation scope the active isolation scope within the callback', done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });

 it('will pass an isolation scope that is different from the current active scope', done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 });

 it('will always make the inner most passed scope the current scope when nesting calls', done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 it('will make the passed isolation scope the active isolation scope within the callback', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 done();
 });
 });
 });

 it('forks the isolation scope when not passing any isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });

 it('forks the isolation scope when passing undefined', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 }));

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 });
 it('will pass an isolation scope that is different from the current active scope', () =>
 new Promise<void>(done => {
 withIsolationScope(scope => {
 expect(getCurrentScope()).not.toBe(scope);
 done();
 });
 }));

 it('will always make the inner most passed scope the current scope when nesting calls', () =>
 new Promise<void>(done => {
 withIsolationScope(_scope1 => {
 withIsolationScope(scope2 => {
 expect(getIsolationScope()).toBe(scope2);
 done();
 });
 });
 }));

 it('forks the isolation scope when not passing any isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('forks the isolation scope when passing undefined', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 withIsolationScope(undefined, scope => {
 expect(getIsolationScope()).toBe(scope);
 scope.setTag('bb', 'bb');
 expect(scope).not.toBe(initialScope);
 expect(scope.getScopeData().tags).toEqual({ aa: 'aa', bb: 'bb' });
 done();
 });
 }));

 it('sets the passed in isolation scope as active isolation scope', done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');
 it('sets the passed in isolation scope as active isolation scope', () =>
 new Promise<void>(done => {
 const initialScope = getIsolationScope();
 initialScope.setTag('aa', 'aa');

 const customScope = new ScopeClass();
const customScope = new ScopeClass();

 withIsolationScope(customScope, scope => {
 expect(getIsolationScope()).toBe(customScope);
 expect(scope).toBe(customScope);
 done();
 });
});
withIsolationScope(customScope, scope => {
expect(getIsolationScope()).toBe(customScope);
expect(scope).toBe(customScope);
done();
});
 }));
 });
});

1 change: 1 addition & 0 deletions
packages/opentelemetry/test/custom/client.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';

import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';

Expand Down

20 changes: 12 additions & 8 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
import { getClient } from '@sentry/core';

import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand All@@ -24,6 +26,7 @@ function resetGlobals(): void {
 getCurrentScope().setClient(undefined);
 getIsolationScope().clear();
 getGlobalScope().clear();
 delete (global as any).__SENTRY__;
}

export function mockSdkInit(options?: Partial<ClientOptions>) {
Expand All@@ -32,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
 init({ dsn: PUBLIC_DSN, ...options });
}

export function cleanupOtel(_provider?: BasicTracerProvider): void {
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
 clearOpenTelemetrySetupCheck();

 const provider = getProvider(_provider);

 if (!provider) {
 return;
 if (provider) {
 await provider.forceFlush();
 await provider.shutdown();
 }

 void provider.forceFlush();
 void provider.shutdown();

 // Disable all globally registered APIs
 trace.disable();
 context.disable();
 propagation.disable();

 await flush();
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || trace.getTracerProvider();
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading