diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/streamed/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/streamed/test.ts index 624f565a9369..6498acb5109b 100644 --- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/streamed/test.ts +++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/streamed/test.ts @@ -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', @@ -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', }, @@ -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', }, @@ -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', }, @@ -233,11 +235,11 @@ 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, }, @@ -245,11 +247,11 @@ sentryTest( 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', }, diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions-streamed/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions-streamed/test.ts index bcd9e0a7a9ba..6426afe12a9c 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions-streamed/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions-streamed/test.ts @@ -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'; @@ -79,11 +81,11 @@ 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, }, @@ -91,11 +93,11 @@ sentryTest('captures streamed interaction span tree. @firefox', async ({ browser 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', }, @@ -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', }, diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-streamed/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-streamed/test.ts index 16791d22a212..9b26e78ee7f2 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-streamed/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-streamed/test.ts @@ -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'; @@ -133,11 +135,11 @@ 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, }, @@ -145,11 +147,11 @@ sentryTest( 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', }, diff --git a/dev-packages/cloudflare-integration-tests/suites/public-api/startSpan-streamed/test.ts b/dev-packages/cloudflare-integration-tests/suites/public-api/startSpan-streamed/test.ts index 9d1280f64034..84d66bf88f0b 100644 --- a/dev-packages/cloudflare-integration-tests/suites/public-api/startSpan-streamed/test.ts +++ b/dev-packages/cloudflare-integration-tests/suites/public-api/startSpan-streamed/test.ts @@ -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'; @@ -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' }, @@ -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' }, }, @@ -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' }, }, @@ -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' }, @@ -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' }, diff --git a/dev-packages/node-core-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts b/dev-packages/node-core-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts index 567fea6f81d4..6e4de612fa8e 100644 --- a/dev-packages/node-core-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts +++ b/dev-packages/node-core-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts @@ -5,13 +5,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_SEGMENT_ID, + SENTRY_SEGMENT_NAME, + SENTRY_SDK_NAME, + SENTRY_SDK_VERSION, + SENTRY_TRACE_LIFECYCLE, +} from '@sentry/conventions/attributes'; import { expect, test } from 'vitest'; import { createRunner } from '../../../../utils/runner'; @@ -59,10 +61,10 @@ test('sends a streamed span envelope with correct spans for a manually started s type: 'string', value: 'test-child', }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, - [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: 'test-span' }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: { type: 'string', value: 'custom' }, @@ -83,10 +85,10 @@ test('sends a streamed span envelope with correct spans for a manually started s expect(inactiveSpan).toEqual({ attributes: { [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, - [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: 'test-span' }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: { type: 'string', value: 'custom' }, @@ -120,10 +122,10 @@ test('sends a streamed span envelope with correct spans for a manually started s expect(manualSpan).toEqual({ attributes: { [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, - [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: 'test-span' }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: { type: 'string', value: 'custom' }, @@ -143,14 +145,14 @@ test('sends a streamed span envelope with correct spans for a manually started s [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' }, [SEMANTIC_ATTRIBUTE_SENTRY_OP]: { type: 'string', value: 'test' }, [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: { type: 'integer', value: 1 }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node-core' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, [SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: { type: 'array', value: expect.arrayContaining(['SpanStreaming']), }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: { type: 'string', value: 'custom' }, diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts index 4bd43379f914..d64fe0becf9c 100644 --- a/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts +++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts @@ -6,13 +6,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_SEGMENT_ID, + SENTRY_SEGMENT_NAME, + SENTRY_SDK_NAME, + SENTRY_SDK_VERSION, + SENTRY_TRACE_LIFECYCLE, +} from '@sentry/conventions/attributes'; import { expect, test } from 'vitest'; import { createRunner } from '../../../../utils/runner'; @@ -60,10 +62,10 @@ test('sends a streamed span envelope with correct spans for a manually started s type: 'string', value: 'test-child', }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, - [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: 'test-span' }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' }, @@ -85,10 +87,10 @@ test('sends a streamed span envelope with correct spans for a manually started s expect(inactiveSpan).toEqual({ attributes: { [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, - [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: 'test-span' }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' }, @@ -123,10 +125,10 @@ test('sends a streamed span envelope with correct spans for a manually started s expect(manualSpan).toEqual({ attributes: { [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, - [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: 'test-span' }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' }, @@ -147,14 +149,14 @@ test('sends a streamed span envelope with correct spans for a manually started s [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' }, [SEMANTIC_ATTRIBUTE_SENTRY_OP]: { type: 'string', value: 'test' }, [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: { type: 'integer', value: 1 }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, + [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' }, + [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION }, [SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: { type: 'array', value: expect.arrayContaining(['SpanStreaming']), }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, + [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId }, + [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { type: 'string', value: '1.0.0' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' }, [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' }, diff --git a/packages/core/src/semanticAttributes.ts b/packages/core/src/semanticAttributes.ts index 8df3b5e8b013..46f37fa902c2 100644 --- a/packages/core/src/semanticAttributes.ts +++ b/packages/core/src/semanticAttributes.ts @@ -54,13 +54,25 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE = 'sentry.measurement_v export const SEMANTIC_ATTRIBUTE_SENTRY_RELEASE = 'sentry.release'; /** The environment name (e.g., "production", "staging", "development") */ export const SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT = 'sentry.environment'; -/** The segment name (e.g., "GET /users") */ +/** + * The segment name (e.g., "GET /users") + * @deprecated Use `SENTRY_SEGMENT_NAME` `@sentry/conventions/attributes` instead. + */ export const SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME = 'sentry.segment.name'; -/** The id of the segment that this span belongs to. */ +/** + * The id of the segment that this span belongs to. + * @deprecated Use `SENTRY_SEGMENT_ID` `@sentry/conventions/attributes` instead. + */ export const SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID = 'sentry.segment.id'; -/** The name of the Sentry SDK (e.g., "sentry.php", "sentry.javascript") */ +/** + * The name of the Sentry SDK (e.g., "sentry.php", "sentry.javascript") + * @deprecated Use `SENTRY_SDK_NAME` `@sentry/conventions/attributes` instead. + */ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME = 'sentry.sdk.name'; -/** The version of the Sentry SDK */ +/** + * The version of the Sentry SDK + * @deprecated Use `SENTRY_SDK_VERSION` `@sentry/conventions/attributes` instead. + */ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version'; /** The list of integrations enabled in the Sentry SDK (e.g., ["InboundFilters", "BrowserTracing"]) */ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations'; diff --git a/packages/core/src/tracing/spans/captureSpan.ts b/packages/core/src/tracing/spans/captureSpan.ts index 748c90f5c615..dd1ecb1f3fb8 100644 --- a/packages/core/src/tracing/spans/captureSpan.ts +++ b/packages/core/src/tracing/spans/captureSpan.ts @@ -5,10 +5,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT, SEMANTIC_ATTRIBUTE_SENTRY_RELEASE, 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_USER_EMAIL, SEMANTIC_ATTRIBUTE_USER_ID, @@ -27,7 +23,14 @@ import { getCapturedScopesOnSpan } from '../utils'; import { isStreamedBeforeSendSpanCallback } from './beforeSendSpan'; import { scopeContextsToSpanAttributes } from './scopeContextAttributes'; import { DEFAULT_ENVIRONMENT } from '../../constants'; -import { SENTRY_SPAN_SOURCE, SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes'; +import { + SENTRY_SDK_NAME, + SENTRY_SDK_VERSION, + SENTRY_SEGMENT_ID, + SENTRY_SEGMENT_NAME, + SENTRY_SPAN_SOURCE, + SENTRY_TRACE_LIFECYCLE, +} from '@sentry/conventions/attributes'; export type SerializedStreamedSpanWithSegmentSpan = SerializedStreamedSpan & { _segmentSpan: Span; @@ -139,12 +142,12 @@ function applyCommonSpanAttributes( // avoid overwriting any previously set attributes (from users or potentially our SDK instrumentation) safeSetSpanJSONAttributes(spanJSON, { [SENTRY_TRACE_LIFECYCLE]: 'stream', + [SENTRY_SEGMENT_NAME]: serializedSegmentSpan.name, + [SENTRY_SEGMENT_ID]: serializedSegmentSpan.span_id, + [SENTRY_SDK_NAME]: sdk?.sdk?.name, + [SENTRY_SDK_VERSION]: sdk?.sdk?.version, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: release, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: environment || DEFAULT_ENVIRONMENT, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: serializedSegmentSpan.name, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: serializedSegmentSpan.span_id, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: sdk?.sdk?.name, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: sdk?.sdk?.version, [SEMANTIC_ATTRIBUTE_USER_ID]: scopeData.user?.id, [SEMANTIC_ATTRIBUTE_USER_EMAIL]: scopeData.user?.email, [SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS]: scopeData.user?.ip_address, diff --git a/packages/core/test/lib/tracing/spans/captureSpan.test.ts b/packages/core/test/lib/tracing/spans/captureSpan.test.ts index e2b81fbd85df..04f6d4ebafbf 100644 --- a/packages/core/test/lib/tracing/spans/captureSpan.test.ts +++ b/packages/core/test/lib/tracing/spans/captureSpan.test.ts @@ -8,10 +8,6 @@ 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, SEMANTIC_ATTRIBUTE_USER_EMAIL, SEMANTIC_ATTRIBUTE_USER_ID, @@ -25,7 +21,14 @@ import { import { safeSetSpanJSONAttributes } from '../../../../src/tracing/spans/captureSpan'; import { scopeContextsToSpanAttributes } from '../../../../src/tracing/spans/scopeContextAttributes'; import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client'; -import { SENTRY_SPAN_SOURCE, SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes'; +import { + SENTRY_SEGMENT_ID, + SENTRY_SEGMENT_NAME, + SENTRY_SPAN_SOURCE, + SENTRY_SDK_NAME, + SENTRY_SDK_VERSION, + SENTRY_TRACE_LIFECYCLE, +} from '@sentry/conventions/attributes'; describe('captureSpan', () => { it.each([true, false, undefined])( @@ -83,11 +86,11 @@ describe('captureSpan', () => { type: 'integer', value: 1, }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { + [SENTRY_SEGMENT_NAME]: { value: 'my-span', type: 'string', }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { + [SENTRY_SEGMENT_ID]: { value: span.spanContext().spanId, type: 'string', }, @@ -184,11 +187,11 @@ describe('captureSpan', () => { type: 'integer', value: 1, }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { + [SENTRY_SEGMENT_NAME]: { value: 'my-span', type: 'string', }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { + [SENTRY_SEGMENT_ID]: { value: span.spanContext().spanId, type: 'string', }, @@ -212,11 +215,11 @@ describe('captureSpan', () => { value: 'stream', type: 'string', }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { + [SENTRY_SDK_NAME]: { value: 'sentry.javascript.node', type: 'string', }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { + [SENTRY_SDK_VERSION]: { value: '1.0.0', type: 'string', }, @@ -284,11 +287,11 @@ describe('captureSpan', () => { type: 'integer', value: 1, }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { + [SENTRY_SEGMENT_NAME]: { value: 'my-span', type: 'string', }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { + [SENTRY_SEGMENT_ID]: { value: span.spanContext().spanId, type: 'string', }, @@ -360,14 +363,14 @@ describe('captureSpan', () => { [SEMANTIC_ATTRIBUTE_SENTRY_OP]: { type: 'string', value: 'http.client' }, [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: { type: 'string', value: 'manual' }, [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: { type: 'integer', value: 1 }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { value: 'my-span', type: 'string' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { value: span.spanContext().spanId, type: 'string' }, + [SENTRY_SEGMENT_NAME]: { value: 'my-span', type: 'string' }, + [SENTRY_SEGMENT_ID]: { value: span.spanContext().spanId, type: 'string' }, [SENTRY_SPAN_SOURCE]: { value: 'custom', type: 'string' }, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: { value: 'custom', type: 'string' }, [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { value: '1.0.0', type: 'string' }, [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { value: 'staging', type: 'string' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_NAME]: { value: 'sentry.javascript.browser', type: 'string' }, - [SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' }, + [SENTRY_SDK_NAME]: { value: 'sentry.javascript.browser', type: 'string' }, + [SENTRY_SDK_VERSION]: { value: '9.0.0', type: 'string' }, [SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: { type: 'array', value: ['InboundFilters', 'BrowserTracing'],