diff --git a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts index 0588e165604e..c6483e2cdea0 100644 --- a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts +++ b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts @@ -36,7 +36,7 @@ sentryTest( await page.evaluate(() => { const scope = (window as unknown as TestWindow).Sentry.getCurrentScope(); - scope.setUser({ id: 'user123', segment: 'segmentB' }); + scope.setUser({ id: 'user123' }); scope.addEventProcessor(event => { event.transaction = 'testTransactionDSC'; return event; @@ -53,7 +53,6 @@ sentryTest( expect(envHeader.trace).toBeDefined(); expect(envHeader.trace).toEqual({ environment: 'production', - user_segment: 'segmentB', sample_rate: '1', trace_id: expect.any(String), public_key: 'public', @@ -84,7 +83,7 @@ sentryTest( await page.evaluate(() => { const scope = (window as unknown as TestWindow).Sentry.getCurrentScope(); - scope.setUser({ id: 'user123', segment: 'segmentB' }); + scope.setUser({ id: 'user123' }); scope.addEventProcessor(event => { event.transaction = 'testTransactionDSC'; return event; @@ -101,7 +100,6 @@ sentryTest( expect(envHeader.trace).toBeDefined(); expect(envHeader.trace).toEqual({ environment: 'production', - user_segment: 'segmentB', sample_rate: '1', trace_id: expect.any(String), public_key: 'public', @@ -144,7 +142,7 @@ sentryTest( await page.evaluate(() => { const scope = (window as unknown as TestWindow).Sentry.getCurrentScope(); - scope.setUser({ id: 'user123', segment: 'segmentB' }); + scope.setUser({ id: 'user123' }); scope.addEventProcessor(event => { event.transaction = 'testTransactionDSC'; return event; @@ -162,7 +160,6 @@ sentryTest( expect(envHeader.trace).toBeDefined(); expect(envHeader.trace).toEqual({ environment: 'production', - user_segment: 'segmentB', sample_rate: '1', trace_id: expect.any(String), public_key: 'public', @@ -195,7 +192,7 @@ sentryTest( await page.evaluate(async () => { const scope = (window as unknown as TestWindow).Sentry.getCurrentScope(); - scope.setUser({ id: 'user123', segment: 'segmentB' }); + scope.setUser({ id: 'user123' }); scope.addEventProcessor(event => { event.transaction = 'testTransactionDSC'; return event; @@ -213,7 +210,6 @@ sentryTest( expect(envHeader.trace).toBeDefined(); expect(envHeader.trace).toEqual({ environment: 'production', - user_segment: 'segmentB', sample_rate: '1', trace_id: expect.any(String), public_key: 'public', diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js index c2fcbb33a24c..e28325fcf78e 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js +++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js @@ -12,7 +12,7 @@ Sentry.init({ }); const scope = Sentry.getCurrentScope(); -scope.setUser({ id: 'user123', segment: 'segmentB' }); +scope.setUser({ id: 'user123' }); scope.addEventProcessor(event => { event.transaction = 'testTransactionDSC'; return event; diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts index b244768f7f82..6126a6728ca5 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts @@ -22,7 +22,6 @@ sentryTest( expect(envHeader.trace).toBeDefined(); expect(envHeader.trace).toEqual({ environment: 'production', - user_segment: 'segmentB', sample_rate: '1', transaction: expect.stringContaining('/index.html'), trace_id: expect.any(String), diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js index 1528306fcbde..1ecbb8351cb9 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js +++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js @@ -12,7 +12,7 @@ Sentry.init({ }); const scope = Sentry.getCurrentScope(); -scope.setUser({ id: 'user123', segment: 'segmentB' }); +scope.setUser({ id: 'user123' }); scope.addEventProcessor(event => { event.transaction = 'testTransactionDSC'; return event; diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts index 71adc007385c..0d7e2b793553 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts +++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts @@ -26,7 +26,6 @@ sentryTest( expect(envHeader.trace).toBeDefined(); expect(envHeader.trace).toEqual({ environment: 'production', - user_segment: 'segmentB', sample_rate: '1', trace_id: expect.any(String), public_key: 'public', diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts index 7e9ee87a1a2a..8669c5bb21b8 100644 --- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts +++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts @@ -20,7 +20,7 @@ Sentry.init({ transport: loggingTransport, }); -Sentry.setUser({ id: 'user123', segment: 'SegmentA' }); +Sentry.setUser({ id: 'user123' }); app.use(Sentry.Handlers.requestHandler()); app.use(Sentry.Handlers.tracingHandler()); diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts index 395fd4861076..3cd2e9984685 100644 --- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts +++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts @@ -15,7 +15,7 @@ test('should attach a baggage header to an outgoing request.', async () => { test_data: { host: 'somewhere.not.sentry', baggage: - 'sentry-environment=prod,sentry-release=1.0,sentry-user_segment=SegmentA,sentry-public_key=public' + + 'sentry-environment=prod,sentry-release=1.0,sentry-public_key=public' + ',sentry-trace_id=86f39e84263a4de99c326acab3bfe3bd,sentry-sample_rate=1,sentry-transaction=GET%20%2Ftest%2Fexpress' + ',sentry-sampled=true', }, diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts index 153b7351b594..92d2f8a0195a 100644 --- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts +++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts @@ -24,7 +24,7 @@ Sentry.init({ transport: loggingTransport, }); -Sentry.setUser({ id: 'user123', segment: 'SegmentA' }); +Sentry.setUser({ id: 'user123' }); app.use(Sentry.Handlers.requestHandler()); app.use(Sentry.Handlers.tracingHandler()); diff --git a/packages/astro/src/server/meta.ts b/packages/astro/src/server/meta.ts index dd591c15d966..42d50c9d865d 100644 --- a/packages/astro/src/server/meta.ts +++ b/packages/astro/src/server/meta.ts @@ -42,7 +42,7 @@ export function getTracingMetaTags( : dsc ? dsc : client - ? getDynamicSamplingContextFromClient(traceId, client, scope) + ? getDynamicSamplingContextFromClient(traceId, client) : undefined; const baggage = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext); diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts index 2c08ba45e20d..b54e1887fd2b 100644 --- a/packages/core/src/baseclient.ts +++ b/packages/core/src/baseclient.ts @@ -679,7 +679,7 @@ export abstract class BaseClient implements Client { ...evt.contexts, }; - const dynamicSamplingContext = dsc ? dsc : getDynamicSamplingContextFromClient(trace_id, this, scope); + const dynamicSamplingContext = dsc ? dsc : getDynamicSamplingContextFromClient(trace_id, this); evt.sdkProcessingMetadata = { dynamicSamplingContext, diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts index 9298637fae68..43e200ede516 100644 --- a/packages/core/src/scope.ts +++ b/packages/core/src/scope.ts @@ -193,7 +193,6 @@ export class Scope implements ScopeInterface { email: undefined, id: undefined, ip_address: undefined, - segment: undefined, username: undefined, }; diff --git a/packages/core/src/server-runtime-client.ts b/packages/core/src/server-runtime-client.ts index b415a392d4cc..e4dfb135abdf 100644 --- a/packages/core/src/server-runtime-client.ts +++ b/packages/core/src/server-runtime-client.ts @@ -275,6 +275,6 @@ export class ServerRuntimeClient< return [dsc, traceContext]; } - return [getDynamicSamplingContextFromClient(traceId, this, scope), traceContext]; + return [getDynamicSamplingContextFromClient(traceId, this), traceContext]; } } diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts index a51c2362c437..93acfe77d10a 100644 --- a/packages/core/src/tracing/dynamicSamplingContext.ts +++ b/packages/core/src/tracing/dynamicSamplingContext.ts @@ -1,8 +1,8 @@ -import type { Client, DynamicSamplingContext, Scope, Span, Transaction } from '@sentry/types'; +import type { Client, DynamicSamplingContext, Span, Transaction } from '@sentry/types'; import { dropUndefinedKeys } from '@sentry/utils'; import { DEFAULT_ENVIRONMENT } from '../constants'; -import { getClient, getCurrentScope } from '../exports'; +import { getClient } from '../exports'; import { getRootSpan } from '../utils/getRootSpan'; import { spanIsSampled, spanToJSON } from '../utils/spanUtils'; @@ -11,22 +11,14 @@ import { spanIsSampled, spanToJSON } from '../utils/spanUtils'; * * Dispatches the `createDsc` lifecycle hook as a side effect. */ -export function getDynamicSamplingContextFromClient( - trace_id: string, - client: Client, - scope?: Scope, -): DynamicSamplingContext { +export function getDynamicSamplingContextFromClient(trace_id: string, client: Client): DynamicSamplingContext { const options = client.getOptions(); const { publicKey: public_key } = client.getDsn() || {}; - // TODO(v8): Remove segment from User - // eslint-disable-next-line deprecation/deprecation - const { segment: user_segment } = (scope && scope.getUser()) || {}; const dsc = dropUndefinedKeys({ environment: options.environment || DEFAULT_ENVIRONMENT, release: options.release, - user_segment, public_key, trace_id, }) as DynamicSamplingContext; @@ -55,7 +47,7 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly { environment: 'prod', release: '1.0.0', transaction: 'TX', - user_segment: 'segmentA', sample_rate: '0.95', public_key: 'pubKey123', trace_id: '1234', @@ -52,7 +51,6 @@ describe('createEventEnvelope', () => { environment: 'prod', release: '1.0.0', transaction: 'TX', - user_segment: 'segmentA', sample_rate: '0.95', public_key: 'pubKey123', trace_id: '1234', diff --git a/packages/node/src/integrations/http.ts b/packages/node/src/integrations/http.ts index f572fcc160f2..407f7da6a43d 100644 --- a/packages/node/src/integrations/http.ts +++ b/packages/node/src/integrations/http.ts @@ -354,7 +354,7 @@ function _createWrappedRequestMethodFactory( dsc || (requestSpan ? getDynamicSamplingContextFromSpan(requestSpan) - : getDynamicSamplingContextFromClient(traceId, client, scope)), + : getDynamicSamplingContextFromClient(traceId, client)), ); addHeadersToRequestOptions(requestOptions, requestUrl, sentryTraceHeader, sentryBaggageHeader); diff --git a/packages/node/src/integrations/undici/index.ts b/packages/node/src/integrations/undici/index.ts index a2616deb920b..ed34a3fc0fb7 100644 --- a/packages/node/src/integrations/undici/index.ts +++ b/packages/node/src/integrations/undici/index.ts @@ -214,10 +214,7 @@ export class Undici implements Integration { const sentryTraceHeader = span ? spanToTraceHeader(span) : generateSentryTraceHeader(traceId, spanId, sampled); const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader( - dsc || - (span - ? getDynamicSamplingContextFromSpan(span) - : getDynamicSamplingContextFromClient(traceId, client, scope)), + dsc || (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client)), ); setHeadersOnRequest(request, sentryTraceHeader, sentryBaggageHeader); diff --git a/packages/node/test/integrations/http.test.ts b/packages/node/test/integrations/http.test.ts index 527ef48c3f0f..dc2fbc69a37f 100644 --- a/packages/node/test/integrations/http.test.ts +++ b/packages/node/test/integrations/http.test.ts @@ -39,7 +39,6 @@ describe('tracing', () => { setUser({ id: 'uid123', - segment: 'segmentA', }); const transaction = startInactiveSpan({ @@ -139,7 +138,7 @@ describe('tracing', () => { expect(baggageHeader).toEqual( 'sentry-environment=production,sentry-release=1.0.0,' + - 'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' + + 'sentry-public_key=dogsarebadatkeepingsecrets,' + 'sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,' + 'sentry-transaction=dogpark,sentry-sampled=true', ); @@ -155,7 +154,7 @@ describe('tracing', () => { expect(baggageHeader[0]).toEqual('dog=great'); expect(baggageHeader[1]).toEqual( - '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', + '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', ); }); @@ -169,7 +168,7 @@ describe('tracing', () => { expect(baggageHeader).toEqual([ 'dog=great', - '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', + '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', ]); }); @@ -183,7 +182,7 @@ describe('tracing', () => { expect(baggageHeader).toEqual([ 'dog=great', - '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', + 'sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=12312012123120121231201212312012,sentry-sample_rate=1,sentry-sampled=true', ]); }); @@ -220,7 +219,7 @@ describe('tracing', () => { expect(parts[1]).toEqual(expect.any(String)); expect(baggageHeader).toEqual( - `sentry-environment=production,sentry-release=1.0.0,sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=${traceId}`, + `sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=${traceId}`, ); }); diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts index 5ab31e3f4804..80c71c7cac3c 100644 --- a/packages/opentelemetry/src/propagator.ts +++ b/packages/opentelemetry/src/propagator.ts @@ -7,7 +7,6 @@ import { SENTRY_BAGGAGE_KEY_PREFIX, generateSentryTraceHeader, propagationContex import { SENTRY_BAGGAGE_HEADER, SENTRY_TRACE_HEADER } from './constants'; import { getPropagationContextFromContext, setPropagationContextOnContext } from './utils/contextData'; -import { getSpanScope } from './utils/spanData'; /** * Injects and extracts `sentry-trace` and `baggage` headers from carriers. @@ -25,7 +24,7 @@ export class SentryPropagator extends W3CBaggagePropagator { const propagationContext = getPropagationContextFromContext(context); const { spanId, traceId, sampled } = getSentryTraceData(context, propagationContext); - const dynamicSamplingContext = propagationContext ? getDsc(context, propagationContext, traceId) : undefined; + const dynamicSamplingContext = propagationContext ? getDsc(propagationContext, traceId) : undefined; if (dynamicSamplingContext) { baggage = Object.entries(dynamicSamplingContext).reduce((b, [dscKey, dscValue]) => { @@ -79,7 +78,6 @@ export class SentryPropagator extends W3CBaggagePropagator { } function getDsc( - context: Context, propagationContext: PropagationContext, traceId: string | undefined, ): Partial | undefined { @@ -90,11 +88,9 @@ function getDsc( // Else, we try to generate a new one const client = getClient(); - const activeSpan = trace.getSpan(context); - const scope = activeSpan ? getSpanScope(activeSpan) : undefined; if (client) { - return getDynamicSamplingContextFromClient(traceId || propagationContext.traceId, client, scope); + return getDynamicSamplingContextFromClient(traceId || propagationContext.traceId, client); } return undefined; diff --git a/packages/profiling-node/clang-format.js b/packages/profiling-node/clang-format.js index 7deb9fb97993..dd001cf28ad7 100644 --- a/packages/profiling-node/clang-format.js +++ b/packages/profiling-node/clang-format.js @@ -3,7 +3,13 @@ const child_process = require('child_process'); const args = ['--Werror', '-i', '--style=file', 'bindings/cpu_profiler.cc']; const cmd = `./node_modules/.bin/clang-format ${args.join(' ')}`; -child_process.execSync(cmd); +try { + child_process.execSync(cmd); +} catch (e) { + // This fails on linux_arm64 + // eslint-disable-next-line no-console + console.log('Running clang format command failed.'); +} // eslint-disable-next-line no-console console.log('clang-format: done, checking tree...'); diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts index 6465cbfe5da5..53dad5a23c0c 100644 --- a/packages/sveltekit/test/server/handle.test.ts +++ b/packages/sveltekit/test/server/handle.test.ts @@ -228,7 +228,7 @@ describe('handleSentry', () => { if (key === 'baggage') { return ( 'sentry-environment=production,sentry-release=1.0.0,sentry-transaction=dogpark,' + - 'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' + + 'sentry-public_key=dogsarebadatkeepingsecrets,' + 'sentry-trace_id=1234567890abcdef1234567890abcdef,sentry-sample_rate=1' ); } @@ -258,7 +258,6 @@ describe('handleSentry', () => { sample_rate: '1', trace_id: '1234567890abcdef1234567890abcdef', transaction: 'dogpark', - user_segment: 'segmentA', }); }); diff --git a/packages/sveltekit/test/server/load.test.ts b/packages/sveltekit/test/server/load.test.ts index 2656b22f685a..388541a8d884 100644 --- a/packages/sveltekit/test/server/load.test.ts +++ b/packages/sveltekit/test/server/load.test.ts @@ -56,7 +56,7 @@ function getServerOnlyArgs() { if (key === 'baggage') { return ( 'sentry-environment=production,sentry-release=1.0.0,sentry-transaction=dogpark,' + - 'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' + + 'sentry-public_key=dogsarebadatkeepingsecrets,' + 'sentry-trace_id=1234567890abcdef1234567890abcdef,sentry-sample_rate=1' ); } @@ -274,7 +274,6 @@ describe('wrapServerLoadWithSentry calls trace', () => { sample_rate: '1', trace_id: '1234567890abcdef1234567890abcdef', transaction: 'dogpark', - user_segment: 'segmentA', }, source: 'route', }, @@ -365,7 +364,6 @@ describe('wrapServerLoadWithSentry calls trace', () => { sample_rate: '1', trace_id: '1234567890abcdef1234567890abcdef', transaction: 'dogpark', - user_segment: 'segmentA', }, source: 'url', }, diff --git a/packages/sveltekit/test/server/utils.test.ts b/packages/sveltekit/test/server/utils.test.ts index 8e5c064c338c..3543a1128835 100644 --- a/packages/sveltekit/test/server/utils.test.ts +++ b/packages/sveltekit/test/server/utils.test.ts @@ -11,7 +11,7 @@ const MOCK_REQUEST_EVENT: any = { if (key === 'baggage') { return ( 'sentry-environment=production,sentry-release=1.0.0,sentry-transaction=dogpark,' + - 'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' + + 'sentry-public_key=dogsarebadatkeepingsecrets,' + 'sentry-trace_id=1234567890abcdef1234567890abcdef,sentry-sample_rate=1' ); } @@ -41,7 +41,6 @@ describe('getTracePropagationData', () => { sample_rate: '1', trace_id: '1234567890abcdef1234567890abcdef', transaction: 'dogpark', - user_segment: 'segmentA', }); }); diff --git a/packages/tracing-internal/src/browser/request.ts b/packages/tracing-internal/src/browser/request.ts index d072188bb2af..57307917cbef 100644 --- a/packages/tracing-internal/src/browser/request.ts +++ b/packages/tracing-internal/src/browser/request.ts @@ -309,8 +309,7 @@ export function xhrCallback( const sentryTraceHeader = span ? spanToTraceHeader(span) : generateSentryTraceHeader(traceId, spanId, sampled); const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader( - dsc || - (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client, scope)), + dsc || (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client)), ); setHeaderOnXhr(xhr, sentryTraceHeader, sentryBaggageHeader); diff --git a/packages/tracing-internal/src/common/fetch.ts b/packages/tracing-internal/src/common/fetch.ts index e12ca3cf1b97..e3650c13e788 100644 --- a/packages/tracing-internal/src/common/fetch.ts +++ b/packages/tracing-internal/src/common/fetch.ts @@ -145,8 +145,7 @@ export function addTracingHeadersToFetchRequest( const sentryTraceHeader = span ? spanToTraceHeader(span) : generateSentryTraceHeader(traceId, spanId, sampled); const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader( - dsc || - (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client, scope)), + dsc || (span ? getDynamicSamplingContextFromSpan(span) : getDynamicSamplingContextFromClient(traceId, client)), ); const headers = diff --git a/packages/types/src/envelope.ts b/packages/types/src/envelope.ts index 98bb9145a547..05db8f118c70 100644 --- a/packages/types/src/envelope.ts +++ b/packages/types/src/envelope.ts @@ -20,10 +20,6 @@ export type DynamicSamplingContext = { release?: string; environment?: string; transaction?: string; - /** - * @deprecated Functonality for segment has been removed. - */ - user_segment?: string; replay_id?: string; sampled?: string; }; diff --git a/packages/types/src/user.ts b/packages/types/src/user.ts index c9eeac18ce51..afbb42261ab3 100644 --- a/packages/types/src/user.ts +++ b/packages/types/src/user.ts @@ -7,10 +7,6 @@ export interface User { ip_address?: string; email?: string; username?: string; - /** - * @deprecated Functonality for segment has been removed. Use a custom tag or context instead to capture this information. - */ - segment?: string; } export interface UserFeedback {