Skip to content

ref(core): Use common span attribute keys from Sentry conventions #22081

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
Lms24 merged 1 commit into from
Jul 8, 2026
Merged

ref(core): Use common span attribute keys from Sentry conventions #22081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions dev-packages/browser-integration-tests/suites/public-api/startSpan/streamed/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
SEMANTIC_ATTRIBUTE_SENTRY_STATUS_MESSAGE,
} from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import { waitForStreamedSpanEnvelope } from '../../../../utils/spanUtils';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import {
SENTRY_SEGMENT_ID,
SENTRY_SEGMENT_NAME,
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
} from '@sentry/conventions/attributes';

sentryTest(
'sends a streamed span envelope if spanStreamingIntegration is enabled',
Expand Down Expand Up @@ -81,19 +83,19 @@ sentryTest(
type: 'string',
value: 'manual',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: {
[SENTRY_SDK_NAME]: {
type: 'string',
value: 'sentry.javascript.browser',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: {
[SENTRY_SDK_VERSION]: {
type: 'string',
value: SDK_VERSION,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: {
[SENTRY_SEGMENT_ID]: {
type: 'string',
value: segmentSpanId,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: {
[SENTRY_SEGMENT_NAME]: {
type: 'string',
value: 'test-span',
},
Expand Down Expand Up @@ -121,19 +123,19 @@ sentryTest(
type: 'string',
value: 'manual',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: {
[SENTRY_SDK_NAME]: {
type: 'string',
value: 'sentry.javascript.browser',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: {
[SENTRY_SDK_VERSION]: {
type: 'string',
value: SDK_VERSION,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: {
[SENTRY_SEGMENT_ID]: {
type: 'string',
value: segmentSpanId,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: {
[SENTRY_SEGMENT_NAME]: {
type: 'string',
value: 'test-span',
},
Expand Down Expand Up @@ -161,19 +163,19 @@ sentryTest(
type: 'string',
value: 'manual',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: {
[SENTRY_SDK_NAME]: {
type: 'string',
value: 'sentry.javascript.browser',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: {
[SENTRY_SDK_VERSION]: {
type: 'string',
value: SDK_VERSION,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: {
[SENTRY_SEGMENT_ID]: {
type: 'string',
value: segmentSpanId,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: {
[SENTRY_SEGMENT_NAME]: {
type: 'string',
value: 'test-span',
},
Expand Down Expand Up @@ -233,23 +235,23 @@ sentryTest(
type: 'integer',
value: 1,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: {
[SENTRY_SDK_NAME]: {
type: 'string',
value: 'sentry.javascript.browser',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: {
[SENTRY_SDK_VERSION]: {
type: 'string',
value: SDK_VERSION,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: expect.arrayContaining(['SpanStreaming']),
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: {
[SENTRY_SEGMENT_ID]: {
type: 'string',
value: segmentSpanId,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: {
[SENTRY_SEGMENT_NAME]: {
type: 'string',
value: 'test-span',
},
Expand Down
28 changes: 15 additions & 13 deletions ...-integration-tests/suites/tracing/browserTracingIntegration/interactions-streamed/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import {
SENTRY_SEGMENT_ID,
SENTRY_SEGMENT_NAME,
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpan, waitForStreamedSpans } from '../../../../utils/spanUtils';
Expand Down Expand Up @@ -79,23 +81,23 @@ sentryTest('captures streamed interaction span tree. @firefox', async ({ browser
type: 'string',
value: 'manual', // TODO: This is incorrect but not from span streaming.
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: {
[SENTRY_SDK_NAME]: {
type: 'string',
value: 'sentry.javascript.browser',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: {
[SENTRY_SDK_VERSION]: {
type: 'string',
value: SDK_VERSION,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: expect.arrayContaining(['BrowserTracing', 'SpanStreaming']),
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: {
[SENTRY_SEGMENT_ID]: {
type: 'string',
value: interactionSegmentSpan!.span_id,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: {
[SENTRY_SEGMENT_NAME]: {
type: 'string',
value: '/index.html',
},
Expand Down Expand Up @@ -139,19 +141,19 @@ sentryTest('captures streamed interaction span tree. @firefox', async ({ browser
type: 'string',
value: 'auto.ui.browser.metrics',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: {
[SENTRY_SDK_NAME]: {
type: 'string',
value: 'sentry.javascript.browser',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: {
[SENTRY_SDK_VERSION]: {
type: 'string',
value: SDK_VERSION,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: {
[SENTRY_SEGMENT_ID]: {
type: 'string',
value: interactionSegmentSpan!.span_id,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: {
[SENTRY_SEGMENT_NAME]: {
type: 'string',
value: '/index.html',
},
Expand Down
20 changes: 11 additions & 9 deletions ...wser-integration-tests/suites/tracing/browserTracingIntegration/pageload-streamed/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import {
SENTRY_SEGMENT_ID,
SENTRY_SEGMENT_NAME,
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import { getSpanOp, getSpansFromEnvelope, waitForStreamedSpanEnvelope } from '../../../../utils/spanUtils';
Expand Down Expand Up @@ -133,23 +135,23 @@ sentryTest(
type: 'integer',
value: 1,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: {
[SENTRY_SDK_NAME]: {
type: 'string',
value: 'sentry.javascript.browser',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: {
[SENTRY_SDK_VERSION]: {
type: 'string',
value: SDK_VERSION,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: expect.arrayContaining(['BrowserTracing', 'SpanStreaming']),
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: {
[SENTRY_SEGMENT_ID]: {
type: 'string',
value: pageloadSpan?.span_id,
},
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: {
[SENTRY_SEGMENT_NAME]: {
type: 'string',
value: '/index.html',
},
Expand Down
52 changes: 27 additions & 25 deletions dev-packages/cloudflare-integration-tests/suites/public-api/startSpan-streamed/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_RELEASE,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID,
SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_SEGMENT_ID,
SENTRY_SEGMENT_NAME,
SENTRY_TRACE_LIFECYCLE,
} from '@sentry/conventions/attributes';
import { expect, it } from 'vitest';
import { createRunner } from '../../../runner';

Expand Down Expand Up @@ -83,10 +85,10 @@ it('sends a streamed span envelope with correct spans for a manually started spa
type: 'string',
value: 'test-child',
},
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' },
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' },
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' },
Expand All @@ -107,10 +109,10 @@ it('sends a streamed span envelope with correct spans for a manually started spa
attributes: {
[SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' },
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' },
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' },
},
Expand Down Expand Up @@ -143,10 +145,10 @@ it('sends a streamed span envelope with correct spans for a manually started spa
attributes: {
[SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' },
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' },
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' },
},
Expand All @@ -164,10 +166,10 @@ it('sends a streamed span envelope with correct spans for a manually started spa
attributes: {
[SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' },
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: { type: 'string', value: 'test' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' },
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' },
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' },
Expand All @@ -185,16 +187,16 @@ it('sends a streamed span envelope with correct spans for a manually started spa
expect(segmentSpan).toEqual({
attributes: {
[SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SENTRY_SDK_NAME]: { type: 'string', value: CLOUDFLARE_SDK },
[SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
[SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
type: 'array',
value: expect.arrayContaining(['SpanStreaming']),
},
[SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' },
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'auto.http.cloudflare' },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SENTRY_SEGMENT_NAME]: { type: 'string', value: segmentName },
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: { type: 'string', value: 'http.server' },
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: { type: 'integer', value: 1 },
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: { type: 'string', value: 'route' },
Expand Down
Loading
Loading