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

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
mydea merged 3 commits into from
Mar 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a67c3e8
test(opentelemetry): Remove deprecated `new Span()` usage in tests
mydea Mar 17, 2025
2f84350
test cleanup
mydea Mar 17, 2025
9bb5c81
formatting
mydea Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions packages/node/src/integrations/tracing/graphql.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

if (options.useOperationNameForRootSpan && operationType) {
const rootSpan = getRootSpan(span);

// We guard to only do this on http.server spans

const rootSpanAttributes = spanToJSON(rootSpan).data;

const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down
40 changes: 0 additions & 40 deletions packages/opentelemetry/test/helpers/createSpan.ts
View file
Open in desktop

This file was deleted.

33 changes: 26 additions & 7 deletions packages/opentelemetry/test/utils/getRequestSpanData.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
let provider: BasicTracerProvider | undefined;

beforeEach(() => {
const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
provider = setupOtel(client);
});

afterEach(() => {
cleanupOtel(provider);
});

function createSpan(name: string): Span {
return trace.getTracer('test').startSpan(name);
}

it('works with basic span', () => {
const span = createSpan();
const span = createSpan('test-span');
const data = getRequestSpanData(span);

expect(data).toEqual({});
});

it('works with http span', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setAttributes({
[SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
[SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
});

it('works without method', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setAttributes({
[SEMATTRS_HTTP_URL]: 'http://example.com',
});
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
});

it('works with incorrect URL', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setAttributes({
[SEMATTRS_HTTP_URL]: 'malformed-url-here',
[SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down
81 changes: 65 additions & 16 deletions packages/opentelemetry/test/utils/groupSpansWithParents.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
let provider: BasicTracerProvider | undefined;

beforeEach(() => {
const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
provider = setupOtel(client);
});

afterEach(() => {
cleanupOtel(provider);
});

it('works with no spans', () => {
const actual = groupSpansWithParents([]);
expect(actual).toEqual([]);
});

it('works with a single root span & in-order spans', () => {
const rootSpan = createSpan('root', { spanId: 'rootId' });
const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.
const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
const parentSpan1 = withActiveSpan(
rootSpan as unknown as Span,
() => tracer.startSpan('parent1') as unknown as ReadableSpan,
);
const parentSpan2 = withActiveSpan(
rootSpan as unknown as Span,
() => tracer.startSpan('parent2') as unknown as ReadableSpan,
);
const child1 = withActiveSpan(
parentSpan1 as unknown as Span,
() => tracer.startSpan('child1') as unknown as ReadableSpan,
);

const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
});

it('works with a spans with missing root span', () => {
const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
const tracer = trace.getTracer('test');

// We create this root span here, but we do not pass it to `groupSpansWithParents` below
const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
const parentSpan1 = withActiveSpan(
rootSpan as unknown as Span,
() => tracer.startSpan('parent1') as unknown as ReadableSpan,
);
const parentSpan2 = withActiveSpan(
rootSpan as unknown as Span,
() => tracer.startSpan('parent2') as unknown as ReadableSpan,
);
const child1 = withActiveSpan(
parentSpan1 as unknown as Span,
() => tracer.startSpan('child1') as unknown as ReadableSpan,
);

const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
expect(actual).toHaveLength(4);

// Ensure parent & span is correctly set
const rootRef = actual.find(ref => ref.id === 'rootId');
const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
const parent1Ref = actual.find(ref => ref.span === parentSpan1);
const parent2Ref = actual.find(ref => ref.span === parentSpan2);
const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
});

it('works with multiple root spans & out-of-order spans', () => {
const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
const tracer = trace.getTracer('test');
const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
const parentSpan1 = withActiveSpan(
rootSpan1 as unknown as Span,
() => tracer.startSpan('parent1') as unknown as ReadableSpan,
);
const parentSpan2 = withActiveSpan(
rootSpan2 as unknown as Span,
() => tracer.startSpan('parent2') as unknown as ReadableSpan,
);
const childSpan1 = withActiveSpan(
parentSpan1 as unknown as Span,
() => tracer.startSpan('child1') as unknown as ReadableSpan,
);

const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
expect(actual).toHaveLength(5);
Expand Down
66 changes: 41 additions & 25 deletions packages/opentelemetry/test/utils/mapStatus.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
let provider: BasicTracerProvider | undefined;

beforeEach(() => {
const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
provider = setupOtel(client);
});

afterEach(() => {
cleanupOtel(provider);
});

function createSpan(name: string): Span {
return trace.getTracer('test').startSpan(name);
}

const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
// http codes
[400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
[504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
[999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

// grpc codes
[undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
[undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
[undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

// http takes precedence over grpc
['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
[400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
];

it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
const span = createSpan();
const span = createSpan('test-span');
span.setStatus({ code: 0 }); // UNSET

if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
expect(actual).toEqual(expected);
});

it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
const span = createSpan('test-span');

span.setStatus({ code: 0 }); // UNSET
span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

const actual = mapStatus(span);
expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
});

it('returns ok span status when is UNSET present on span', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setStatus({ code: 0 }); // UNSET
expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
});

it('returns ok span status when already present on span', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setStatus({ code: 1 }); // OK
expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
});

it('returns error status when span already has error status', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
});

it('returns error status when span already has error status without message', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setStatus({ code: 2 }); // ERROR
expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
});

it('infers error status form attributes when span already has error status without message', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
span.setStatus({ code: 2 }); // ERROR
expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
});

it('returns unknown error status when code is unknown', () => {
const span = createSpan();
const span = createSpan('test-span');
span.setStatus({ code: -1 as 0 });
expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
});
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(opentelemetry): Remove deprecated new Span() usage in tests#15702

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

mydea
merged 3 commits into

from

Mar 17, 2025
 Merged


test(opentelemetry): Remove deprecated new Span() usage in tests
#15702
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a67c3e8

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


mydea Mar 17, 2025
2f84350

test cleanup


mydea Mar 17, 2025
9bb5c81

formatting


mydea Mar 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
packages/node/src/integrations/tracing/graphql.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

 if (options.useOperationNameForRootSpan && operationType) {
 const rootSpan = getRootSpan(span);

 // We guard to only do this on http.server spans

 const rootSpanAttributes = spanToJSON(rootSpan).data;

 const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down

40 changes: 0 additions & 40 deletions
packages/opentelemetry/test/helpers/createSpan.ts

View file


Open in desktop


This file was deleted.


33 changes: 26 additions & 7 deletions
packages/opentelemetry/test/utils/getRequestSpanData.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 it('works with basic span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 const data = getRequestSpanData(span);

 expect(data).toEqual({});
 });

 it('works with http span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
 });

 it('works without method', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com',
 });
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
 });

 it('works with incorrect URL', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'malformed-url-here',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down

81 changes: 65 additions & 16 deletions
packages/opentelemetry/test/utils/groupSpansWithParents.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 it('works with no spans', () => {
 const actual = groupSpansWithParents([]);
 expect(actual).toEqual([]);
 });

 it('works with a single root span & in-order spans', () => {
 const rootSpan = createSpan('root', { spanId: 'rootId' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.

 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
 });

 it('works with a spans with missing root span', () => {
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');

 // We create this root span here, but we do not pass it to `groupSpansWithParents` below
 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);

 // Ensure parent & span is correctly set
 const rootRef = actual.find(ref => ref.id === 'rootId');
 const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
 const parent1Ref = actual.find(ref => ref.span === parentSpan1);
 const parent2Ref = actual.find(ref => ref.span === parentSpan2);
 const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
 });

 it('works with multiple root spans & out-of-order spans', () => {
 const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
 const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
 const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
 const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
 const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan1 as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan2 as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const childSpan1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
 expect(actual).toHaveLength(5);
Expand Down

66 changes: 41 additions & 25 deletions
packages/opentelemetry/test/utils/mapStatus.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
 // http codes
 [400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
 [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 ['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
 ['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
 ['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
 ['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
 ['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
 ['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 ['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 ['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
 ['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
 ['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 ['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // grpc codes
 [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 [undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
 [undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // http takes precedence over grpc
 ['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 [400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ];

 it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET

 if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
 expect(actual).toEqual(expected);
 });

 it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
 const span = createSpan('test-span');

 span.setStatus({ code: 0 }); // UNSET
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

 const actual = mapStatus(span);
 expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns ok span status when is UNSET present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns ok span status when already present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 1 }); // OK
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns error status when span already has error status', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns error status when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });

 it('infers error status form attributes when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 });

 it('returns unknown error status when code is unknown', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: -1 as 0 });
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });
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(opentelemetry): Remove deprecated new Span() usage in tests#15702

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

mydea
merged 3 commits into

from

Mar 17, 2025
 Merged


test(opentelemetry): Remove deprecated new Span() usage in tests
#15702
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a67c3e8

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


mydea Mar 17, 2025
2f84350

test cleanup


mydea Mar 17, 2025
9bb5c81

formatting


mydea Mar 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
packages/node/src/integrations/tracing/graphql.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

 if (options.useOperationNameForRootSpan && operationType) {
 const rootSpan = getRootSpan(span);

 // We guard to only do this on http.server spans

 const rootSpanAttributes = spanToJSON(rootSpan).data;

 const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down

40 changes: 0 additions & 40 deletions
packages/opentelemetry/test/helpers/createSpan.ts

View file


Open in desktop


This file was deleted.


33 changes: 26 additions & 7 deletions
packages/opentelemetry/test/utils/getRequestSpanData.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 it('works with basic span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 const data = getRequestSpanData(span);

 expect(data).toEqual({});
 });

 it('works with http span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
 });

 it('works without method', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com',
 });
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
 });

 it('works with incorrect URL', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'malformed-url-here',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down

81 changes: 65 additions & 16 deletions
packages/opentelemetry/test/utils/groupSpansWithParents.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 it('works with no spans', () => {
 const actual = groupSpansWithParents([]);
 expect(actual).toEqual([]);
 });

 it('works with a single root span & in-order spans', () => {
 const rootSpan = createSpan('root', { spanId: 'rootId' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.

 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
 });

 it('works with a spans with missing root span', () => {
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');

 // We create this root span here, but we do not pass it to `groupSpansWithParents` below
 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);

 // Ensure parent & span is correctly set
 const rootRef = actual.find(ref => ref.id === 'rootId');
 const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
 const parent1Ref = actual.find(ref => ref.span === parentSpan1);
 const parent2Ref = actual.find(ref => ref.span === parentSpan2);
 const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
 });

 it('works with multiple root spans & out-of-order spans', () => {
 const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
 const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
 const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
 const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
 const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan1 as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan2 as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const childSpan1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
 expect(actual).toHaveLength(5);
Expand Down

66 changes: 41 additions & 25 deletions
packages/opentelemetry/test/utils/mapStatus.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
 // http codes
 [400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
 [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 ['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
 ['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
 ['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
 ['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
 ['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
 ['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 ['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 ['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
 ['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
 ['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 ['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // grpc codes
 [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 [undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
 [undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // http takes precedence over grpc
 ['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 [400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ];

 it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET

 if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
 expect(actual).toEqual(expected);
 });

 it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
 const span = createSpan('test-span');

 span.setStatus({ code: 0 }); // UNSET
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

 const actual = mapStatus(span);
 expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns ok span status when is UNSET present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns ok span status when already present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 1 }); // OK
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns error status when span already has error status', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns error status when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });

 it('infers error status form attributes when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 });

 it('returns unknown error status when code is unknown', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: -1 as 0 });
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });
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(opentelemetry): Remove deprecated new Span() usage in tests#15702

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

mydea
merged 3 commits into

from

Mar 17, 2025
 Merged


test(opentelemetry): Remove deprecated new Span() usage in tests
#15702
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a67c3e8

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


mydea Mar 17, 2025
2f84350

test cleanup


mydea Mar 17, 2025
9bb5c81

formatting


mydea Mar 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
packages/node/src/integrations/tracing/graphql.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

 if (options.useOperationNameForRootSpan && operationType) {
 const rootSpan = getRootSpan(span);

 // We guard to only do this on http.server spans

 const rootSpanAttributes = spanToJSON(rootSpan).data;

 const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down

40 changes: 0 additions & 40 deletions
packages/opentelemetry/test/helpers/createSpan.ts

View file


Open in desktop


This file was deleted.


33 changes: 26 additions & 7 deletions
packages/opentelemetry/test/utils/getRequestSpanData.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 it('works with basic span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 const data = getRequestSpanData(span);

 expect(data).toEqual({});
 });

 it('works with http span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
 });

 it('works without method', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com',
 });
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
 });

 it('works with incorrect URL', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'malformed-url-here',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down

81 changes: 65 additions & 16 deletions
packages/opentelemetry/test/utils/groupSpansWithParents.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 it('works with no spans', () => {
 const actual = groupSpansWithParents([]);
 expect(actual).toEqual([]);
 });

 it('works with a single root span & in-order spans', () => {
 const rootSpan = createSpan('root', { spanId: 'rootId' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.

 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
 });

 it('works with a spans with missing root span', () => {
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');

 // We create this root span here, but we do not pass it to `groupSpansWithParents` below
 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);

 // Ensure parent & span is correctly set
 const rootRef = actual.find(ref => ref.id === 'rootId');
 const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
 const parent1Ref = actual.find(ref => ref.span === parentSpan1);
 const parent2Ref = actual.find(ref => ref.span === parentSpan2);
 const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
 });

 it('works with multiple root spans & out-of-order spans', () => {
 const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
 const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
 const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
 const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
 const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan1 as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan2 as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const childSpan1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
 expect(actual).toHaveLength(5);
Expand Down

66 changes: 41 additions & 25 deletions
packages/opentelemetry/test/utils/mapStatus.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
 // http codes
 [400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
 [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 ['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
 ['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
 ['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
 ['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
 ['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
 ['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 ['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 ['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
 ['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
 ['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 ['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // grpc codes
 [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 [undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
 [undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // http takes precedence over grpc
 ['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 [400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ];

 it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET

 if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
 expect(actual).toEqual(expected);
 });

 it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
 const span = createSpan('test-span');

 span.setStatus({ code: 0 }); // UNSET
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

 const actual = mapStatus(span);
 expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns ok span status when is UNSET present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns ok span status when already present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 1 }); // OK
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns error status when span already has error status', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns error status when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });

 it('infers error status form attributes when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 });

 it('returns unknown error status when code is unknown', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: -1 as 0 });
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });
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(opentelemetry): Remove deprecated new Span() usage in tests#15702

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

mydea
merged 3 commits into

from

Mar 17, 2025
 Merged


test(opentelemetry): Remove deprecated new Span() usage in tests
#15702
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a67c3e8

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


mydea Mar 17, 2025
2f84350

test cleanup


mydea Mar 17, 2025
9bb5c81

formatting


mydea Mar 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
packages/node/src/integrations/tracing/graphql.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

 if (options.useOperationNameForRootSpan && operationType) {
 const rootSpan = getRootSpan(span);

 // We guard to only do this on http.server spans

 const rootSpanAttributes = spanToJSON(rootSpan).data;

 const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down

40 changes: 0 additions & 40 deletions
packages/opentelemetry/test/helpers/createSpan.ts

View file


Open in desktop


This file was deleted.


33 changes: 26 additions & 7 deletions
packages/opentelemetry/test/utils/getRequestSpanData.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 it('works with basic span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 const data = getRequestSpanData(span);

 expect(data).toEqual({});
 });

 it('works with http span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
 });

 it('works without method', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com',
 });
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
 });

 it('works with incorrect URL', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'malformed-url-here',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down

81 changes: 65 additions & 16 deletions
packages/opentelemetry/test/utils/groupSpansWithParents.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 it('works with no spans', () => {
 const actual = groupSpansWithParents([]);
 expect(actual).toEqual([]);
 });

 it('works with a single root span & in-order spans', () => {
 const rootSpan = createSpan('root', { spanId: 'rootId' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.

 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
 });

 it('works with a spans with missing root span', () => {
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');

 // We create this root span here, but we do not pass it to `groupSpansWithParents` below
 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);

 // Ensure parent & span is correctly set
 const rootRef = actual.find(ref => ref.id === 'rootId');
 const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
 const parent1Ref = actual.find(ref => ref.span === parentSpan1);
 const parent2Ref = actual.find(ref => ref.span === parentSpan2);
 const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
 });

 it('works with multiple root spans & out-of-order spans', () => {
 const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
 const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
 const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
 const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
 const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan1 as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan2 as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const childSpan1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
 expect(actual).toHaveLength(5);
Expand Down

66 changes: 41 additions & 25 deletions
packages/opentelemetry/test/utils/mapStatus.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
 // http codes
 [400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
 [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 ['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
 ['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
 ['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
 ['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
 ['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
 ['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 ['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 ['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
 ['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
 ['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 ['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // grpc codes
 [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 [undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
 [undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // http takes precedence over grpc
 ['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 [400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ];

 it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET

 if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
 expect(actual).toEqual(expected);
 });

 it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
 const span = createSpan('test-span');

 span.setStatus({ code: 0 }); // UNSET
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

 const actual = mapStatus(span);
 expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns ok span status when is UNSET present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns ok span status when already present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 1 }); // OK
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns error status when span already has error status', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns error status when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });

 it('infers error status form attributes when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 });

 it('returns unknown error status when code is unknown', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: -1 as 0 });
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });
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(opentelemetry): Remove deprecated new Span() usage in tests#15702

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

mydea
merged 3 commits into

from

Mar 17, 2025
 Merged


test(opentelemetry): Remove deprecated new Span() usage in tests
#15702
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a67c3e8

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


mydea Mar 17, 2025
2f84350

test cleanup


mydea Mar 17, 2025
9bb5c81

formatting


mydea Mar 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
packages/node/src/integrations/tracing/graphql.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

 if (options.useOperationNameForRootSpan && operationType) {
 const rootSpan = getRootSpan(span);

 // We guard to only do this on http.server spans

 const rootSpanAttributes = spanToJSON(rootSpan).data;

 const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down

40 changes: 0 additions & 40 deletions
packages/opentelemetry/test/helpers/createSpan.ts

View file


Open in desktop


This file was deleted.


33 changes: 26 additions & 7 deletions
packages/opentelemetry/test/utils/getRequestSpanData.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 it('works with basic span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 const data = getRequestSpanData(span);

 expect(data).toEqual({});
 });

 it('works with http span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
 });

 it('works without method', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com',
 });
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
 });

 it('works with incorrect URL', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'malformed-url-here',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down

81 changes: 65 additions & 16 deletions
packages/opentelemetry/test/utils/groupSpansWithParents.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 it('works with no spans', () => {
 const actual = groupSpansWithParents([]);
 expect(actual).toEqual([]);
 });

 it('works with a single root span & in-order spans', () => {
 const rootSpan = createSpan('root', { spanId: 'rootId' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.

 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
 });

 it('works with a spans with missing root span', () => {
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');

 // We create this root span here, but we do not pass it to `groupSpansWithParents` below
 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);

 // Ensure parent & span is correctly set
 const rootRef = actual.find(ref => ref.id === 'rootId');
 const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
 const parent1Ref = actual.find(ref => ref.span === parentSpan1);
 const parent2Ref = actual.find(ref => ref.span === parentSpan2);
 const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
 });

 it('works with multiple root spans & out-of-order spans', () => {
 const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
 const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
 const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
 const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
 const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan1 as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan2 as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const childSpan1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
 expect(actual).toHaveLength(5);
Expand Down

66 changes: 41 additions & 25 deletions
packages/opentelemetry/test/utils/mapStatus.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
 // http codes
 [400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
 [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 ['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
 ['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
 ['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
 ['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
 ['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
 ['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 ['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 ['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
 ['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
 ['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 ['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // grpc codes
 [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 [undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
 [undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // http takes precedence over grpc
 ['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 [400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ];

 it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET

 if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
 expect(actual).toEqual(expected);
 });

 it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
 const span = createSpan('test-span');

 span.setStatus({ code: 0 }); // UNSET
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

 const actual = mapStatus(span);
 expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns ok span status when is UNSET present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns ok span status when already present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 1 }); // OK
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns error status when span already has error status', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns error status when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });

 it('infers error status form attributes when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 });

 it('returns unknown error status when code is unknown', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: -1 as 0 });
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });
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(opentelemetry): Remove deprecated new Span() usage in tests#15702

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

mydea
merged 3 commits into

from

Mar 17, 2025
 Merged


test(opentelemetry): Remove deprecated new Span() usage in tests
#15702
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a67c3e8

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


mydea Mar 17, 2025
2f84350

test cleanup


mydea Mar 17, 2025
9bb5c81

formatting


mydea Mar 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
packages/node/src/integrations/tracing/graphql.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

 if (options.useOperationNameForRootSpan && operationType) {
 const rootSpan = getRootSpan(span);

 // We guard to only do this on http.server spans

 const rootSpanAttributes = spanToJSON(rootSpan).data;

 const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down

40 changes: 0 additions & 40 deletions
packages/opentelemetry/test/helpers/createSpan.ts

View file


Open in desktop


This file was deleted.


33 changes: 26 additions & 7 deletions
packages/opentelemetry/test/utils/getRequestSpanData.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 it('works with basic span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 const data = getRequestSpanData(span);

 expect(data).toEqual({});
 });

 it('works with http span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
 });

 it('works without method', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com',
 });
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
 });

 it('works with incorrect URL', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'malformed-url-here',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down

81 changes: 65 additions & 16 deletions
packages/opentelemetry/test/utils/groupSpansWithParents.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 it('works with no spans', () => {
 const actual = groupSpansWithParents([]);
 expect(actual).toEqual([]);
 });

 it('works with a single root span & in-order spans', () => {
 const rootSpan = createSpan('root', { spanId: 'rootId' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.

 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
 });

 it('works with a spans with missing root span', () => {
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');

 // We create this root span here, but we do not pass it to `groupSpansWithParents` below
 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);

 // Ensure parent & span is correctly set
 const rootRef = actual.find(ref => ref.id === 'rootId');
 const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
 const parent1Ref = actual.find(ref => ref.span === parentSpan1);
 const parent2Ref = actual.find(ref => ref.span === parentSpan2);
 const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
 });

 it('works with multiple root spans & out-of-order spans', () => {
 const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
 const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
 const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
 const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
 const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan1 as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan2 as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const childSpan1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
 expect(actual).toHaveLength(5);
Expand Down

66 changes: 41 additions & 25 deletions
packages/opentelemetry/test/utils/mapStatus.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
 // http codes
 [400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
 [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 ['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
 ['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
 ['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
 ['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
 ['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
 ['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 ['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 ['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
 ['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
 ['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 ['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // grpc codes
 [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 [undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
 [undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // http takes precedence over grpc
 ['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 [400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ];

 it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET

 if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
 expect(actual).toEqual(expected);
 });

 it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
 const span = createSpan('test-span');

 span.setStatus({ code: 0 }); // UNSET
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

 const actual = mapStatus(span);
 expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns ok span status when is UNSET present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns ok span status when already present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 1 }); // OK
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns error status when span already has error status', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns error status when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });

 it('infers error status form attributes when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 });

 it('returns unknown error status when code is unknown', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: -1 as 0 });
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });
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(opentelemetry): Remove deprecated new Span() usage in tests#15702

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

mydea
merged 3 commits into

from

Mar 17, 2025
 Merged


test(opentelemetry): Remove deprecated new Span() usage in tests
#15702
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a67c3e8

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


mydea Mar 17, 2025
2f84350

test cleanup


mydea Mar 17, 2025
9bb5c81

formatting


mydea Mar 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
packages/node/src/integrations/tracing/graphql.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,6 @@ export const instrumentGraphql = generateInstrumentOnce<GraphqlOptions>(

 if (options.useOperationNameForRootSpan && operationType) {
 const rootSpan = getRootSpan(span);

 // We guard to only do this on http.server spans

 const rootSpanAttributes = spanToJSON(rootSpan).data;

 const existingOperations = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION] || [];
Expand Down

40 changes: 0 additions & 40 deletions
packages/opentelemetry/test/helpers/createSpan.ts

View file


Open in desktop


This file was deleted.


33 changes: 26 additions & 7 deletions
packages/opentelemetry/test/utils/getRequestSpanData.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { describe, expect, it } from 'vitest';

import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('getRequestSpanData', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 it('works with basic span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 const data = getRequestSpanData(span);

 expect(data).toEqual({});
 });

 it('works with http span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com?foo=bar#baz',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand All@@ -31,7 +50,7 @@ describe('getRequestSpanData', () => {
 });

 it('works without method', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'http://example.com',
 });
Expand All@@ -45,7 +64,7 @@ describe('getRequestSpanData', () => {
 });

 it('works with incorrect URL', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttributes({
 [SEMATTRS_HTTP_URL]: 'malformed-url-here',
 [SEMATTRS_HTTP_METHOD]: 'GET',
Expand Down

81 changes: 65 additions & 16 deletions
packages/opentelemetry/test/utils/groupSpansWithParents.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,19 +1,45 @@
import { describe, expect, it } from 'vitest';

import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('groupSpansWithParents', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 it('works with no spans', () => {
 const actual = groupSpansWithParents([]);
 expect(actual).toEqual([]);
 });

 it('works with a single root span & in-order spans', () => {
 const rootSpan = createSpan('root', { spanId: 'rootId' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
Comment thread
mydea marked this conversation as resolved.

 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([rootSpan, parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);
Expand DownExpand Up@@ -46,15 +72,28 @@ describe('groupSpansWithParents', () => {
 });

 it('works with a spans with missing root span', () => {
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'rootId' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'rootId' });
 const child1 = createSpan('child1', { spanId: 'child1', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');

 // We create this root span here, but we do not pass it to `groupSpansWithParents` below
 const rootSpan = tracer.startSpan('root') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const child1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([parentSpan1, parentSpan2, child1]);
 expect(actual).toHaveLength(4);

 // Ensure parent & span is correctly set
 const rootRef = actual.find(ref => ref.id === 'rootId');
 const rootRef = actual.find(ref => ref.id === rootSpan.spanContext().spanId);
 const parent1Ref = actual.find(ref => ref.span === parentSpan1);
 const parent2Ref = actual.find(ref => ref.span === parentSpan2);
 const child1Ref = actual.find(ref => ref.span === child1);
Expand DownExpand Up@@ -82,11 +121,21 @@ describe('groupSpansWithParents', () => {
 });

 it('works with multiple root spans & out-of-order spans', () => {
 const rootSpan1 = createSpan('root1', { spanId: 'root1Id' });
 const rootSpan2 = createSpan('root2', { spanId: 'root2Id' });
 const parentSpan1 = createSpan('parent1', { spanId: 'parent1Id', parentSpanId: 'root1Id' });
 const parentSpan2 = createSpan('parent2', { spanId: 'parent2Id', parentSpanId: 'root2Id' });
 const childSpan1 = createSpan('child1', { spanId: 'child1Id', parentSpanId: 'parent1Id' });
 const tracer = trace.getTracer('test');
 const rootSpan1 = tracer.startSpan('root1') as unknown as ReadableSpan;
 const rootSpan2 = tracer.startSpan('root2') as unknown as ReadableSpan;
 const parentSpan1 = withActiveSpan(
 rootSpan1 as unknown as Span,
 () => tracer.startSpan('parent1') as unknown as ReadableSpan,
 );
 const parentSpan2 = withActiveSpan(
 rootSpan2 as unknown as Span,
 () => tracer.startSpan('parent2') as unknown as ReadableSpan,
 );
 const childSpan1 = withActiveSpan(
 parentSpan1 as unknown as Span,
 () => tracer.startSpan('child1') as unknown as ReadableSpan,
 );

 const actual = groupSpansWithParents([childSpan1, parentSpan1, parentSpan2, rootSpan2, rootSpan1]);
 expect(actual).toHaveLength(5);
Expand Down

66 changes: 41 additions & 25 deletions
packages/opentelemetry/test/utils/mapStatus.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
/* eslint-disable deprecation/deprecation */
import type { Span } from '@opentelemetry/api';
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { SpanStatus } from '@sentry/core';
import { describe, expect, it } from 'vitest';

import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
import { createSpan } from '../helpers/createSpan';
import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';

describe('mapStatus', () => {
 let provider: BasicTracerProvider | undefined;

 beforeEach(() => {
 const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
 provider = setupOtel(client);
 });

 afterEach(() => {
 cleanupOtel(provider);
 });

 function createSpan(name: string): Span {
 return trace.getTracer('test').startSpan(name);
 }

 const statusTestTable: [undefined | number | string, undefined | string, SpanStatus][] = [
 // http codes
 [400, undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
Expand All@@ -23,19 +42,6 @@ describe('mapStatus', () => {
 [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 ['400', undefined, { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ['401', undefined, { code: SPAN_STATUS_ERROR, message: 'unauthenticated' }],
 ['403', undefined, { code: SPAN_STATUS_ERROR, message: 'permission_denied' }],
 ['404', undefined, { code: SPAN_STATUS_ERROR, message: 'not_found' }],
 ['409', undefined, { code: SPAN_STATUS_ERROR, message: 'already_exists' }],
 ['429', undefined, { code: SPAN_STATUS_ERROR, message: 'resource_exhausted' }],
 ['499', undefined, { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 ['500', undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 ['501', undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
 ['503', undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
 ['504', undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
 ['999', undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // grpc codes
 [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
 [undefined, '2', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
Expand All@@ -56,11 +62,11 @@ describe('mapStatus', () => {
 [undefined, '999', { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],

 // http takes precedence over grpc
 ['400', '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 [400, '2', { code: SPAN_STATUS_ERROR, message: 'invalid_argument' }],
 ];

 it.each(statusTestTable)('works with httpCode=%s, grpcCode=%s', (httpCode, grpcCode, expected) => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET

 if (httpCode) {
Expand All@@ -75,39 +81,49 @@ describe('mapStatus', () => {
 expect(actual).toEqual(expected);
 });

 it('works with string SEMATTRS_HTTP_STATUS_CODE xxx', () => {
 const span = createSpan('test-span');

 span.setStatus({ code: 0 }); // UNSET
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, '400');

 const actual = mapStatus(span);
 expect(actual).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns ok span status when is UNSET present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 0 }); // UNSET
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns ok span status when already present on span', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 1 }); // OK
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_OK });
 });

 it('returns error status when span already has error status', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2, message: 'invalid_argument' }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'invalid_argument' });
 });

 it('returns error status when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });

 it('infers error status form attributes when span already has error status without message', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setAttribute(SEMATTRS_HTTP_STATUS_CODE, 500);
 span.setStatus({ code: 2 }); // ERROR
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
 });

 it('returns unknown error status when code is unknown', () => {
 const span = createSpan();
 const span = createSpan('test-span');
 span.setStatus({ code: -1 as 0 });
 expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
 });
Expand Down
Loading