From 273d94a007fc092a1bf7755e8ecca4d2b04774c3 Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Wed, 20 May 2026 17:05:48 +0200 Subject: [PATCH 1/3] migrate --- packages/core/src/tracing/spans/envelope.ts | 2 +- .../test/lib/tracing/spans/envelope.test.ts | 29 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/packages/core/src/tracing/spans/envelope.ts b/packages/core/src/tracing/spans/envelope.ts index 1be30768aa9c..1bd99b03fd68 100644 --- a/packages/core/src/tracing/spans/envelope.ts +++ b/packages/core/src/tracing/spans/envelope.ts @@ -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' }, diff --git a/packages/core/test/lib/tracing/spans/envelope.test.ts b/packages/core/test/lib/tracing/spans/envelope.test.ts index eb0ec478c5d7..11b532888e61 100644 --- a/packages/core/test/lib/tracing/spans/envelope.test.ts +++ b/packages/core/test/lib/tracing/spans/envelope.test.ts @@ -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 = {}; const envelopeItems = createStreamedSpanEnvelope([mockSpan], dsc, mockClient)[1]; @@ -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 = {}; const envelopeItems = createStreamedSpanEnvelope([mockSpan], dsc, mockClient)[1]; @@ -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 = {}; + + 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 bridged to dataCollection.userInfo', () => { + vi.mocked(isBrowser).mockReturnValue(true); + const mockSpan = createMockSerializedSpan(); const mockClient = new TestClient(getDefaultTestClientOptions({ sendDefaultPii: true })); const dsc: Partial = {}; @@ -294,6 +314,7 @@ 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' }, items: [mockSpan], }, ], From e80f1504fcd2b5fca9a5151e8ff776cf28abad20 Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Thu, 21 May 2026 10:47:55 +0200 Subject: [PATCH 2/3] more tests --- .../test/lib/tracing/spans/envelope.test.ts | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/core/test/lib/tracing/spans/envelope.test.ts b/packages/core/test/lib/tracing/spans/envelope.test.ts index 11b532888e61..102baed16c49 100644 --- a/packages/core/test/lib/tracing/spans/envelope.test.ts +++ b/packages/core/test/lib/tracing/spans/envelope.test.ts @@ -300,7 +300,7 @@ describe('createStreamedSpanEnvelope', () => { ]); }); - it('respects sendDefaultPii bridged to dataCollection.userInfo', () => { + it("respects sendDefaultPii: true bridged to dataCollection.userInfo", () => { vi.mocked(isBrowser).mockReturnValue(true); const mockSpan = createMockSerializedSpan(); @@ -320,5 +320,26 @@ describe('createStreamedSpanEnvelope', () => { ], ]); }); + + 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 = {}; + + 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], + }, + ], + ]); + }); }); }); From 429e4b81fa4e8fbacff3c9257c141a1929a2f4eb Mon Sep 17 00:00:00 2001 From: Charly Gomez Date: Thu, 21 May 2026 10:48:15 +0200 Subject: [PATCH 3/3] fmt --- packages/core/test/lib/tracing/spans/envelope.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/test/lib/tracing/spans/envelope.test.ts b/packages/core/test/lib/tracing/spans/envelope.test.ts index 102baed16c49..97955850131b 100644 --- a/packages/core/test/lib/tracing/spans/envelope.test.ts +++ b/packages/core/test/lib/tracing/spans/envelope.test.ts @@ -300,7 +300,7 @@ describe('createStreamedSpanEnvelope', () => { ]); }); - it("respects sendDefaultPii: true bridged to dataCollection.userInfo", () => { + it('respects sendDefaultPii: true bridged to dataCollection.userInfo', () => { vi.mocked(isBrowser).mockReturnValue(true); const mockSpan = createMockSerializedSpan(); @@ -321,7 +321,7 @@ describe('createStreamedSpanEnvelope', () => { ]); }); - it("respects sendDefaultPii: false bridged to dataCollection.userInfo", () => { + it('respects sendDefaultPii: false bridged to dataCollection.userInfo', () => { vi.mocked(isBrowser).mockReturnValue(true); const mockSpan = createMockSerializedSpan();