Skip to content

fix(core): Set production as default sentry.environment attribute value on streamed spans #21637

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 3 commits into from
Jun 18, 2026
Merged

fix(core): Set production as default sentry.environment attribute value on streamed spans #21637

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
63a0925
fix(core): Set `production` as default `sentry.environment` attribute…
Lms24 Jun 18, 2026
696195b
|| instead of ??
Lms24 Jun 18, 2026
770ae3a
adjust integration and unit tests
Lms24 Jun 18, 2026
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
17 changes: 17 additions & 0 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
@@ -1,6 +1,7 @@
import { expect } from '@playwright/test';
import {
SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
Expand Down Expand Up @@ -94,6 +95,10 @@ sentryTest(
type: 'string',
value: 'test-span',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: false,
Expand Down Expand Up @@ -126,6 +131,10 @@ sentryTest(
type: 'string',
value: 'test-span',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: false,
Expand Down Expand Up @@ -158,6 +167,10 @@ sentryTest(
type: 'string',
value: 'test-span',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: false,
Expand Down Expand Up @@ -230,6 +243,10 @@ sentryTest(
type: 'string',
value: 'custom',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: true,
Expand Down
9 changes: 9 additions & 0 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
@@ -1,6 +1,7 @@
import { expect } from '@playwright/test';
import {
SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
Expand Down Expand Up @@ -101,6 +102,10 @@ sentryTest('captures streamed interaction span tree. @firefox', async ({ browser
type: 'string',
value: 'url',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: true,
Expand Down Expand Up @@ -141,6 +146,10 @@ sentryTest('captures streamed interaction span tree. @firefox', async ({ browser
type: 'string',
value: '/index.html',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: false,
Expand Down
5 changes: 5 additions & 0 deletions ...er-integration-tests/suites/tracing/browserTracingIntegration/navigation-streamed/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { expect } from '@playwright/test';
import {
SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
Expand Down Expand Up @@ -152,6 +153,10 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: 'url',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: true,
Expand Down
5 changes: 5 additions & 0 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
@@ -1,6 +1,7 @@
import { expect } from '@playwright/test';
import {
SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
Expand Down Expand Up @@ -159,6 +160,10 @@ sentryTest(
type: 'string',
value: 'url',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
end_timestamp: expect.any(Number),
is_segment: true,
Expand Down
6 changes: 6 additions & 0 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
@@ -1,6 +1,7 @@
import type { Envelope, SerializedStreamedSpanContainer } from '@sentry/core';
import {
SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_RELEASE,
Expand Down Expand Up @@ -86,6 +87,7 @@ it('sends a streamed span envelope with correct spans for a manually started spa
[SEMANTIC_ATTRIBUTE_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' },
},
name: 'test-child-span',
is_segment: false,
Expand All @@ -107,6 +109,7 @@ it('sends a streamed span envelope with correct spans for a manually started spa
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
links: [
{
Expand Down Expand Up @@ -141,6 +144,7 @@ it('sends a streamed span envelope with correct spans for a manually started spa
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
name: 'test-manual-span',
is_segment: false,
Expand All @@ -161,6 +165,7 @@ it('sends a streamed span envelope with correct spans for a manually started spa
[SEMANTIC_ATTRIBUTE_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' },
},
name: 'test-span',
is_segment: false,
Expand All @@ -187,6 +192,7 @@ it('sends a streamed span envelope with correct spans for a manually started spa
[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' },
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { type: 'string', value: 'production' },
'sentry.span.source': { type: 'string', value: 'route' },
'server.address': {
type: 'string',
Expand Down
5 changes: 5 additions & 0 deletions ...ages/node-core-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_RELEASE,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
Expand Down Expand Up @@ -60,6 +61,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
name: 'test-child-span',
is_segment: false,
Expand All @@ -80,6 +82,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
links: [
{
Expand Down Expand Up @@ -113,6 +116,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
name: 'test-manual-span',
is_segment: false,
Expand All @@ -136,6 +140,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
'process.runtime.engine.name': { type: 'string', value: 'v8' },
'process.runtime.engine.version': { type: 'string', value: expect.any(String) },
'app.start_time': { type: 'string', value: expect.any(String) },
Expand Down
5 changes: 5 additions & 0 deletions dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
SDK_VERSION,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_RELEASE,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
Expand Down Expand Up @@ -60,6 +61,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
name: 'test-child-span',
is_segment: false,
Expand All @@ -80,6 +82,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
links: [
{
Expand Down Expand Up @@ -113,6 +116,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
},
name: 'test-manual-span',
is_segment: false,
Expand All @@ -136,6 +140,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
[SEMANTIC_ATTRIBUTE_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' },
'process.runtime.engine.name': { type: 'string', value: 'v8' },
'process.runtime.engine.version': { type: 'string', value: expect.any(String) },
'app.start_time': { type: 'string', value: expect.any(String) },
Expand Down
10 changes: 9 additions & 1 deletion packages/browser/test/integrations/spanstreaming.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import * as SentryCore from '@sentry/core/browser';
import { debug, SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS } from '@sentry/core/browser';
import {
debug,
SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
} from '@sentry/core/browser';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient, spanStreamingIntegration } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
Expand Down Expand Up @@ -157,6 +161,10 @@ describe('spanStreamingIntegration', () => {
type: 'string',
value: 'test',
},
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: {
type: 'string',
value: 'production',
},
},
});
});
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/tracing/spans/captureSpan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
import { getCapturedScopesOnSpan } from '../utils';
import { isStreamedBeforeSendSpanCallback } from './beforeSendSpan';
import { scopeContextsToSpanAttributes } from './scopeContextAttributes';
import { DEFAULT_ENVIRONMENT } from '../../constants';

export type SerializedStreamedSpanWithSegmentSpan = SerializedStreamedSpan & {
_segmentSpan: Span;
Expand Down Expand Up @@ -142,7 +143,7 @@ function applyCommonSpanAttributes(
// avoid overwriting any previously set attributes (from users or potentially our SDK instrumentation)
safeSetSpanJSONAttributes(spanJSON, {
[SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: release,
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: environment,
[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,
Expand Down
72 changes: 72 additions & 0 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,78 @@ describe('captureSpan', () => {
});
});

it('falls back to "production" environment if not provided', () => {
const client = new TestClient(
getDefaultTestClientOptions({
dsn: 'https://dsn@ingest.f00.f00/1',
tracesSampleRate: 1,
release: '1.0.0',
// environment: undefined,
}),
);
client.init();

const span = withScope(scope => {
scope.setClient(client);

const span = startInactiveSpan({ name: 'my-span', attributes: { 'sentry.op': 'http.client' } });
span.end();

return span;
});

expect(captureSpan(span, client)).toStrictEqual({
span_id: expect.stringMatching(/^[\da-f]{16}$/),
parent_span_id: undefined,
trace_id: expect.stringMatching(/^[\da-f]{32}$/),
links: undefined,
start_timestamp: expect.any(Number),
name: 'my-span',
end_timestamp: expect.any(Number),
status: 'ok',
is_segment: true,
attributes: {
[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.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: 'production',
type: 'string',
},
},
_segmentSpan: span,
});
});

it('adds sentry.sdk.integrations to segment spans as an array attribute', () => {
const client = new TestClient(
getDefaultTestClientOptions({
Expand Down
Loading