Skip to content

feat(core): Migrate span streaming envelope to dataCollection #21080

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
chargome merged 3 commits into from
May 21, 2026
+47 −5
Merged

feat(core): Migrate span streaming envelope to dataCollection #21080

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
273d94a
migrate
chargome May 20, 2026
e80f150
more tests
chargome May 21, 2026
429e4b8
fmt
chargome May 21, 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
2 changes: 1 addition & 1 deletion packages/core/src/tracing/spans/envelope.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function createStreamedSpanEnvelope(
...(!!tunnel && dsn && { dsn: dsnToString(dsn) }),
};

const inferSetting = options.sendDefaultPii ? 'auto' : 'never';
const inferSetting = client.getDataCollectionOptions().userInfo ? 'auto' : 'never';

const spanContainer: SpanContainerItem = [
{ type: 'span', item_count: serializedSpans.length, content_type: 'application/vnd.sentry.items.span.v2+json' },
Expand Down
50 changes: 46 additions & 4 deletions packages/core/test/lib/tracing/spans/envelope.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,11 @@ describe('createStreamedSpanEnvelope', () => {
]);
});

it("includes ingest_settings with 'auto' values when in browser and sendDefaultPii is true", () => {
it("includes ingest_settings with 'auto' values when in browser and dataCollection.userInfo is true", () => {
vi.mocked(isBrowser).mockReturnValue(true);

const mockSpan = createMockSerializedSpan();
const mockClient = new TestClient(getDefaultTestClientOptions({ sendDefaultPii: true }));
const mockClient = new TestClient(getDefaultTestClientOptions({ dataCollection: { userInfo: true } }));
const dsc: Partial<DynamicSamplingContext> = {};

const envelopeItems = createStreamedSpanEnvelope([mockSpan], dsc, mockClient)[1];
Expand All @@ -261,11 +261,11 @@ describe('createStreamedSpanEnvelope', () => {
]);
});

it("includes ingest_settings with 'never' values when in browser and sendDefaultPii is false", () => {
it("includes ingest_settings with 'never' values when in browser and dataCollection.userInfo is false", () => {
vi.mocked(isBrowser).mockReturnValue(true);

const mockSpan = createMockSerializedSpan();
const mockClient = new TestClient(getDefaultTestClientOptions({ sendDefaultPii: false }));
const mockClient = new TestClient(getDefaultTestClientOptions({ dataCollection: { userInfo: false } }));
const dsc: Partial<DynamicSamplingContext> = {};

const envelopeItems = createStreamedSpanEnvelope([mockSpan], dsc, mockClient)[1];
Expand All @@ -283,6 +283,26 @@ describe('createStreamedSpanEnvelope', () => {
});

it('omits ingest_settings when not in browser', () => {
const mockSpan = createMockSerializedSpan();
const mockClient = new TestClient(getDefaultTestClientOptions({ dataCollection: { userInfo: true } }));
const dsc: Partial<DynamicSamplingContext> = {};

const envelopeItems = createStreamedSpanEnvelope([mockSpan], dsc, mockClient)[1];

expect(envelopeItems).toEqual([
[
{ type: 'span', item_count: 1, content_type: 'application/vnd.sentry.items.span.v2+json' },
{
version: 2,
items: [mockSpan],
},
],
]);
});

it('respects sendDefaultPii: true bridged to dataCollection.userInfo', () => {
vi.mocked(isBrowser).mockReturnValue(true);

const mockSpan = createMockSerializedSpan();
const mockClient = new TestClient(getDefaultTestClientOptions({ sendDefaultPii: true }));
const dsc: Partial<DynamicSamplingContext> = {};
Expand All @@ -294,6 +314,28 @@ describe('createStreamedSpanEnvelope', () => {
{ type: 'span', item_count: 1, content_type: 'application/vnd.sentry.items.span.v2+json' },
{
version: 2,
ingest_settings: { infer_ip: 'auto', infer_user_agent: 'auto' },
Comment thread
chargome marked this conversation as resolved.
items: [mockSpan],
},
],
]);
});

it('respects sendDefaultPii: false bridged to dataCollection.userInfo', () => {
vi.mocked(isBrowser).mockReturnValue(true);

const mockSpan = createMockSerializedSpan();
const mockClient = new TestClient(getDefaultTestClientOptions({ sendDefaultPii: false }));
const dsc: Partial<DynamicSamplingContext> = {};

const envelopeItems = createStreamedSpanEnvelope([mockSpan], dsc, mockClient)[1];

expect(envelopeItems).toEqual([
[
{ type: 'span', item_count: 1, content_type: 'application/vnd.sentry.items.span.v2+json' },
{
version: 2,
ingest_settings: { infer_ip: 'never', infer_user_agent: 'never' },
items: [mockSpan],
},
],
Expand Down
Loading