Skip to content

Commit 245a9fa

Browse files
author
Luca Forstner
authored
ref: Remove user segment (#10575)
1 parent 737fb0e commit 245a9fa

File tree

26 files changed

+37
-70
lines changed

26 files changed

+37
-70
lines changed

‎dev-packages/browser-integration-tests/suites/replay/dsc/test.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sentryTest(
3636

3737
await page.evaluate(() => {
3838
const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
39-
scope.setUser({ id: 'user123', segment: 'segmentB' });
39+
scope.setUser({ id: 'user123' });
4040
scope.addEventProcessor(event => {
4141
event.transaction = 'testTransactionDSC';
4242
return event;
@@ -53,7 +53,6 @@ sentryTest(
5353
expect(envHeader.trace).toBeDefined();
5454
expect(envHeader.trace).toEqual({
5555
environment: 'production',
56-
user_segment: 'segmentB',
5756
sample_rate: '1',
5857
trace_id: expect.any(String),
5958
public_key: 'public',
@@ -84,7 +83,7 @@ sentryTest(
8483

8584
await page.evaluate(() => {
8685
const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
87-
scope.setUser({ id: 'user123', segment: 'segmentB' });
86+
scope.setUser({ id: 'user123' });
8887
scope.addEventProcessor(event => {
8988
event.transaction = 'testTransactionDSC';
9089
return event;
@@ -101,7 +100,6 @@ sentryTest(
101100
expect(envHeader.trace).toBeDefined();
102101
expect(envHeader.trace).toEqual({
103102
environment: 'production',
104-
user_segment: 'segmentB',
105103
sample_rate: '1',
106104
trace_id: expect.any(String),
107105
public_key: 'public',
@@ -144,7 +142,7 @@ sentryTest(
144142

145143
await page.evaluate(() => {
146144
const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
147-
scope.setUser({ id: 'user123', segment: 'segmentB' });
145+
scope.setUser({ id: 'user123' });
148146
scope.addEventProcessor(event => {
149147
event.transaction = 'testTransactionDSC';
150148
return event;
@@ -162,7 +160,6 @@ sentryTest(
162160
expect(envHeader.trace).toBeDefined();
163161
expect(envHeader.trace).toEqual({
164162
environment: 'production',
165-
user_segment: 'segmentB',
166163
sample_rate: '1',
167164
trace_id: expect.any(String),
168165
public_key: 'public',
@@ -195,7 +192,7 @@ sentryTest(
195192

196193
await page.evaluate(async () => {
197194
const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
198-
scope.setUser({ id: 'user123', segment: 'segmentB' });
195+
scope.setUser({ id: 'user123' });
199196
scope.addEventProcessor(event => {
200197
event.transaction = 'testTransactionDSC';
201198
return event;
@@ -213,7 +210,6 @@ sentryTest(
213210
expect(envHeader.trace).toBeDefined();
214211
expect(envHeader.trace).toEqual({
215212
environment: 'production',
216-
user_segment: 'segmentB',
217213
sample_rate: '1',
218214
trace_id: expect.any(String),
219215
public_key: 'public',

‎dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Sentry.init({
1212
});
1313

1414
const scope = Sentry.getCurrentScope();
15-
scope.setUser({ id: 'user123', segment: 'segmentB' });
15+
scope.setUser({ id: 'user123' });
1616
scope.addEventProcessor(event => {
1717
event.transaction = 'testTransactionDSC';
1818
return event;

‎dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ sentryTest(
2222
expect(envHeader.trace).toBeDefined();
2323
expect(envHeader.trace).toEqual({
2424
environment: 'production',
25-
user_segment: 'segmentB',
2625
sample_rate: '1',
2726
transaction: expect.stringContaining('/index.html'),
2827
trace_id: expect.any(String),

‎dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Sentry.init({
1212
});
1313

1414
const scope = Sentry.getCurrentScope();
15-
scope.setUser({ id: 'user123', segment: 'segmentB' });
15+
scope.setUser({ id: 'user123' });
1616
scope.addEventProcessor(event => {
1717
event.transaction = 'testTransactionDSC';
1818
return event;

‎dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ sentryTest(
2626
expect(envHeader.trace).toBeDefined();
2727
expect(envHeader.trace).toEqual({
2828
environment: 'production',
29-
user_segment: 'segmentB',
3029
sample_rate: '1',
3130
trace_id: expect.any(String),
3231
public_key: 'public',

‎dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Sentry.init({
2020
transport: loggingTransport,
2121
});
2222

23-
Sentry.setUser({ id: 'user123', segment: 'SegmentA' });
23+
Sentry.setUser({ id: 'user123' });
2424

2525
app.use(Sentry.Handlers.requestHandler());
2626
app.use(Sentry.Handlers.tracingHandler());

‎dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test('should attach a baggage header to an outgoing request.', async () => {
1515
test_data: {
1616
host: 'somewhere.not.sentry',
1717
baggage:
18-
'sentry-environment=prod,sentry-release=1.0,sentry-user_segment=SegmentA,sentry-public_key=public' +
18+
'sentry-environment=prod,sentry-release=1.0,sentry-public_key=public' +
1919
',sentry-trace_id=86f39e84263a4de99c326acab3bfe3bd,sentry-sample_rate=1,sentry-transaction=GET%20%2Ftest%2Fexpress' +
2020
',sentry-sampled=true',
2121
},

‎dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Sentry.init({
2424
transport: loggingTransport,
2525
});
2626

27-
Sentry.setUser({ id: 'user123', segment: 'SegmentA' });
27+
Sentry.setUser({ id: 'user123' });
2828

2929
app.use(Sentry.Handlers.requestHandler());
3030
app.use(Sentry.Handlers.tracingHandler());

‎packages/astro/src/server/meta.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function getTracingMetaTags(
4242
: dsc
4343
? dsc
4444
: client
45-
? getDynamicSamplingContextFromClient(traceId, client, scope)
45+
? getDynamicSamplingContextFromClient(traceId, client)
4646
: undefined;
4747

4848
const baggage = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);

‎packages/core/src/baseclient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
679679
...evt.contexts,
680680
};
681681

682-
const dynamicSamplingContext = dsc ? dsc : getDynamicSamplingContextFromClient(trace_id, this, scope);
682+
const dynamicSamplingContext = dsc ? dsc : getDynamicSamplingContextFromClient(trace_id, this);
683683

684684
evt.sdkProcessingMetadata = {
685685
dynamicSamplingContext,

‎packages/core/src/scope.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ export class Scope implements ScopeInterface {
193193
email: undefined,
194194
id: undefined,
195195
ip_address: undefined,
196-
segment: undefined,
197196
username: undefined,
198197
};
199198

‎packages/core/src/server-runtime-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,6 @@ export class ServerRuntimeClient<
275275
return [dsc, traceContext];
276276
}
277277

278-
return [getDynamicSamplingContextFromClient(traceId, this, scope), traceContext];
278+
return [getDynamicSamplingContextFromClient(traceId, this), traceContext];
279279
}
280280
}

‎packages/core/src/tracing/dynamicSamplingContext.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { Client, DynamicSamplingContext, Scope, Span, Transaction } from '@sentry/types';
1+
import type { Client, DynamicSamplingContext, Span, Transaction } from '@sentry/types';
22
import { dropUndefinedKeys } from '@sentry/utils';
33

44
import { DEFAULT_ENVIRONMENT } from '../constants';
5-
import { getClient, getCurrentScope } from '../exports';
5+
import { getClient } from '../exports';
66
import { getRootSpan } from '../utils/getRootSpan';
77
import { spanIsSampled, spanToJSON } from '../utils/spanUtils';
88

@@ -11,22 +11,14 @@ import { spanIsSampled, spanToJSON } from '../utils/spanUtils';
1111
*
1212
* Dispatches the `createDsc` lifecycle hook as a side effect.
1313
*/
14-
export function getDynamicSamplingContextFromClient(
15-
trace_id: string,
16-
client: Client,
17-
scope?: Scope,
18-
): DynamicSamplingContext {
14+
export function getDynamicSamplingContextFromClient(trace_id: string, client: Client): DynamicSamplingContext {
1915
const options = client.getOptions();
2016

2117
const { publicKey: public_key } = client.getDsn() || {};
22-
// TODO(v8): Remove segment from User
23-
// eslint-disable-next-line deprecation/deprecation
24-
const { segment: user_segment } = (scope && scope.getUser()) || {};
2518

2619
const dsc = dropUndefinedKeys({
2720
environment: options.environment || DEFAULT_ENVIRONMENT,
2821
release: options.release,
29-
user_segment,
3022
public_key,
3123
trace_id,
3224
}) as DynamicSamplingContext;
@@ -55,7 +47,7 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
5547
}
5648

5749
// passing emit=false here to only emit later once the DSC is actually populated
58-
const dsc = getDynamicSamplingContextFromClient(spanToJSON(span).trace_id || '', client, getCurrentScope());
50+
const dsc = getDynamicSamplingContextFromClient(spanToJSON(span).trace_id || '', client);
5951

6052
// TODO (v8): Remove v7FrozenDsc as a Transaction will no longer have _frozenDynamicSamplingContext
6153
const txn = getRootSpan(span) as TransactionWithV7FrozenDsc | undefined;

‎packages/core/test/lib/envelope.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ describe('createEventEnvelope', () => {
4141
environment: 'prod',
4242
release: '1.0.0',
4343
transaction: 'TX',
44-
user_segment: 'segmentA',
4544
sample_rate: '0.95',
4645
public_key: 'pubKey123',
4746
trace_id: '1234',
@@ -52,7 +51,6 @@ describe('createEventEnvelope', () => {
5251
environment: 'prod',
5352
release: '1.0.0',
5453
transaction: 'TX',
55-
user_segment: 'segmentA',
5654
sample_rate: '0.95',
5755
public_key: 'pubKey123',
5856
trace_id: '1234',

‎packages/node/src/integrations/http.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ function _createWrappedRequestMethodFactory(
354354
dsc ||
355355
(requestSpan
356356
? getDynamicSamplingContextFromSpan(requestSpan)
357-
: getDynamicSamplingContextFromClient(traceId, client, scope)),
357+
: getDynamicSamplingContextFromClient(traceId, client)),
358358
);
359359

360360
addHeadersToRequestOptions(requestOptions, requestUrl, sentryTraceHeader, sentryBaggageHeader);

‎packages/node/src/integrations/undici/index.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,7 @@ export class Undici implements Integration {
214214
const sentryTraceHeader = span ? spanToTraceHeader(span) : generateSentryTraceHeader(traceId, spanId, sampled);
215215

216216
const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(
217-
dsc ||
218-
(span
219-
? getDynamicSamplingContextFromSpan(span)
220-
: getDynamicSamplingContextFromClient(traceId, client, scope)),
217+
dsc || (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client)),
221218
);
222219

223220
setHeadersOnRequest(request, sentryTraceHeader, sentryBaggageHeader);

‎packages/node/test/integrations/http.test.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ describe('tracing', () => {
3939

4040
setUser({
4141
id: 'uid123',
42-
segment: 'segmentA',
4342
});
4443

4544
const transaction = startInactiveSpan({
@@ -139,7 +138,7 @@ describe('tracing', () => {
139138

140139
expect(baggageHeader).toEqual(
141140
'sentry-environment=production,sentry-release=1.0.0,' +
142-
'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' +
141+
'sentry-public_key=dogsarebadatkeepingsecrets,' +
143142
'sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,' +
144143
'sentry-transaction=dogpark,sentry-sampled=true',
145144
);
@@ -155,7 +154,7 @@ describe('tracing', () => {
155154

156155
expect(baggageHeader[0]).toEqual('dog=great');
157156
expect(baggageHeader[1]).toEqual(
158-
'sentry-environment=production,sentry-release=1.0.0,sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,sentry-transaction=dogpark,sentry-sampled=true',
157+
'sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,sentry-transaction=dogpark,sentry-sampled=true',
159158
);
160159
});
161160

@@ -169,7 +168,7 @@ describe('tracing', () => {
169168

170169
expect(baggageHeader).toEqual([
171170
'dog=great',
172-
'sentry-environment=production,sentry-release=1.0.0,sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,sentry-transaction=dogpark,sentry-sampled=true',
171+
'sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,sentry-transaction=dogpark,sentry-sampled=true',
173172
]);
174173
});
175174

@@ -183,7 +182,7 @@ describe('tracing', () => {
183182

184183
expect(baggageHeader).toEqual([
185184
'dog=great',
186-
'sentry-environment=production,sentry-release=1.0.0,sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,sentry-sampled=true',
185+
'sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,sentry-sampled=true',
187186
]);
188187
});
189188

@@ -220,7 +219,7 @@ describe('tracing', () => {
220219
expect(parts[1]).toEqual(expect.any(String));
221220

222221
expect(baggageHeader).toEqual(
223-
`sentry-environment=production,sentry-release=1.0.0,sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=${traceId}`,
222+
`sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=${traceId}`,
224223
);
225224
});
226225

‎packages/opentelemetry/src/propagator.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { SENTRY_BAGGAGE_KEY_PREFIX, generateSentryTraceHeader, propagationContex
77

88
import { SENTRY_BAGGAGE_HEADER, SENTRY_TRACE_HEADER } from './constants';
99
import { getPropagationContextFromContext, setPropagationContextOnContext } from './utils/contextData';
10-
import { getSpanScope } from './utils/spanData';
1110

1211
/**
1312
* Injects and extracts `sentry-trace` and `baggage` headers from carriers.
@@ -25,7 +24,7 @@ export class SentryPropagator extends W3CBaggagePropagator {
2524

2625
const propagationContext = getPropagationContextFromContext(context);
2726
const { spanId, traceId, sampled } = getSentryTraceData(context, propagationContext);
28-
const dynamicSamplingContext = propagationContext ? getDsc(context, propagationContext, traceId) : undefined;
27+
const dynamicSamplingContext = propagationContext ? getDsc(propagationContext, traceId) : undefined;
2928

3029
if (dynamicSamplingContext) {
3130
baggage = Object.entries(dynamicSamplingContext).reduce<Baggage>((b, [dscKey, dscValue]) => {
@@ -79,7 +78,6 @@ export class SentryPropagator extends W3CBaggagePropagator {
7978
}
8079

8180
function getDsc(
82-
context: Context,
8381
propagationContext: PropagationContext,
8482
traceId: string | undefined,
8583
): Partial<DynamicSamplingContext> | undefined {
@@ -90,11 +88,9 @@ function getDsc(
9088

9189
// Else, we try to generate a new one
9290
const client = getClient();
93-
const activeSpan = trace.getSpan(context);
94-
const scope = activeSpan ? getSpanScope(activeSpan) : undefined;
9591

9692
if (client) {
97-
return getDynamicSamplingContextFromClient(traceId || propagationContext.traceId, client, scope);
93+
return getDynamicSamplingContextFromClient(traceId || propagationContext.traceId, client);
9894
}
9995

10096
return undefined;

‎packages/profiling-node/clang-format.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ const child_process = require('child_process');
33
const args = ['--Werror', '-i', '--style=file', 'bindings/cpu_profiler.cc'];
44
const cmd = `./node_modules/.bin/clang-format ${args.join(' ')}`;
55

6-
child_process.execSync(cmd);
6+
try {
7+
child_process.execSync(cmd);
8+
} catch (e) {
9+
// This fails on linux_arm64
10+
// eslint-disable-next-line no-console
11+
console.log('Running clang format command failed.');
12+
}
713

814
// eslint-disable-next-line no-console
915
console.log('clang-format: done, checking tree...');

‎packages/sveltekit/test/server/handle.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ describe('handleSentry', () => {
228228
if (key === 'baggage') {
229229
return (
230230
'sentry-environment=production,sentry-release=1.0.0,sentry-transaction=dogpark,' +
231-
'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' +
231+
'sentry-public_key=dogsarebadatkeepingsecrets,' +
232232
'sentry-trace_id=1234567890abcdef1234567890abcdef,sentry-sample_rate=1'
233233
);
234234
}
@@ -258,7 +258,6 @@ describe('handleSentry', () => {
258258
sample_rate: '1',
259259
trace_id: '1234567890abcdef1234567890abcdef',
260260
transaction: 'dogpark',
261-
user_segment: 'segmentA',
262261
});
263262
});
264263

‎packages/sveltekit/test/server/load.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function getServerOnlyArgs() {
5656
if (key === 'baggage') {
5757
return (
5858
'sentry-environment=production,sentry-release=1.0.0,sentry-transaction=dogpark,' +
59-
'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' +
59+
'sentry-public_key=dogsarebadatkeepingsecrets,' +
6060
'sentry-trace_id=1234567890abcdef1234567890abcdef,sentry-sample_rate=1'
6161
);
6262
}
@@ -274,7 +274,6 @@ describe('wrapServerLoadWithSentry calls trace', () => {
274274
sample_rate: '1',
275275
trace_id: '1234567890abcdef1234567890abcdef',
276276
transaction: 'dogpark',
277-
user_segment: 'segmentA',
278277
},
279278
source: 'route',
280279
},
@@ -365,7 +364,6 @@ describe('wrapServerLoadWithSentry calls trace', () => {
365364
sample_rate: '1',
366365
trace_id: '1234567890abcdef1234567890abcdef',
367366
transaction: 'dogpark',
368-
user_segment: 'segmentA',
369367
},
370368
source: 'url',
371369
},

0 commit comments

Comments
 (0)