diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts index 851f830d6955..9209426b744f 100644 --- a/packages/browser/src/client.ts +++ b/packages/browser/src/client.ts @@ -122,7 +122,6 @@ export class BrowserClient extends BaseClient { const envelope = createUserFeedbackEnvelope(feedback, { metadata: this.getSdkMetadata(), dsn: this.getDsn(), - tunnel: this.getOptions().tunnel, }); // sendEnvelope should not throw diff --git a/packages/browser/src/userfeedback.ts b/packages/browser/src/userfeedback.ts index c2c8b0a116fc..5fa80e499fbf 100644 --- a/packages/browser/src/userfeedback.ts +++ b/packages/browser/src/userfeedback.ts @@ -12,7 +12,7 @@ export function createUserFeedbackEnvelope( dsn, }: { metadata: SdkMetadata | undefined; - tunnel: string | undefined; + tunnel?: string | undefined; dsn: DsnComponents | undefined; }, ): EventEnvelope { diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts index db79df0d1c16..a2fe9f33c58a 100644 --- a/packages/core/src/baseclient.ts +++ b/packages/core/src/baseclient.ts @@ -141,11 +141,10 @@ export abstract class BaseClient implements Client { if (this._dsn) { const url = getEnvelopeEndpointWithUrlEncodedAuth( this._dsn, - options.tunnel, + undefined, options._metadata ? options._metadata.sdk : undefined, ); this._transport = options.transport({ - tunnel: this._options.tunnel, recordDroppedEvent: this.recordDroppedEvent.bind(this), ...options.transportOptions, url, @@ -353,7 +352,7 @@ export abstract class BaseClient implements Client { public sendEvent(event: Event, hint: EventHint = {}): void { this.emit('beforeSendEvent', event, hint); - let env = createEventEnvelope(event, this._dsn, this._options._metadata, this._options.tunnel); + let env = createEventEnvelope(event, this._dsn, this._options._metadata); for (const attachment of hint.attachments || []) { env = addItemToEnvelope(env, createAttachmentEnvelopeItem(attachment)); @@ -369,7 +368,7 @@ export abstract class BaseClient implements Client { * @inheritDoc */ public sendSession(session: Session | SessionAggregates): void { - const env = createSessionEnvelope(session, this._dsn, this._options._metadata, this._options.tunnel); + const env = createSessionEnvelope(session, this._dsn, this._options._metadata); // sendEnvelope should not throw // eslint-disable-next-line @typescript-eslint/no-floating-promises @@ -915,7 +914,7 @@ export abstract class BaseClient implements Client { DEBUG_BUILD && logger.log('Sending outcomes:', outcomes); - const envelope = createClientReportEnvelope(outcomes, this._options.tunnel && dsnToString(this._dsn)); + const envelope = createClientReportEnvelope(outcomes); // sendEnvelope should not throw // eslint-disable-next-line @typescript-eslint/no-floating-promises diff --git a/packages/core/src/envelope.ts b/packages/core/src/envelope.ts index efe55ab685ac..4d8c91af599f 100644 --- a/packages/core/src/envelope.ts +++ b/packages/core/src/envelope.ts @@ -111,13 +111,9 @@ export function createSpanEnvelope(spans: [SentrySpan, ...SentrySpan[]], client? // different segments in one envelope const dsc = getDynamicSamplingContextFromSpan(spans[0]); - const dsn = client && client.getDsn(); - const tunnel = client && client.getOptions().tunnel; - const headers: SpanEnvelope[0] = { sent_at: new Date().toISOString(), ...(dscHasRequiredProps(dsc) && { trace: dsc }), - ...(!!tunnel && dsn && { dsn: dsnToString(dsn) }), }; const beforeSendSpan = client && client.getOptions().beforeSendSpan; diff --git a/packages/core/src/metrics/envelope.ts b/packages/core/src/metrics/envelope.ts index f3bd67b27ec6..d59a79547c62 100644 --- a/packages/core/src/metrics/envelope.ts +++ b/packages/core/src/metrics/envelope.ts @@ -9,9 +9,8 @@ export function captureAggregateMetrics(client: Client, metricBucketItems: Array logger.log(`Flushing aggregated metrics, number of metrics: ${metricBucketItems.length}`); const dsn = client.getDsn(); const metadata = client.getSdkMetadata(); - const tunnel = client.getOptions().tunnel; - const metricsEnvelope = createMetricEnvelope(metricBucketItems, dsn, metadata, tunnel); + const metricsEnvelope = createMetricEnvelope(metricBucketItems, dsn, metadata); // sendEnvelope should not throw // eslint-disable-next-line @typescript-eslint/no-floating-promises diff --git a/packages/core/src/transports/multiplexed.ts b/packages/core/src/transports/multiplexed.ts index 6b58637025dd..6fde1ce62463 100644 --- a/packages/core/src/transports/multiplexed.ts +++ b/packages/core/src/transports/multiplexed.ts @@ -106,7 +106,7 @@ export function makeMultiplexedTransport( if (!validatedDsn) { return undefined; } - const url = getEnvelopeEndpointWithUrlEncodedAuth(validatedDsn, options.tunnel); + const url = getEnvelopeEndpointWithUrlEncodedAuth(validatedDsn); transport = release ? makeOverrideReleaseTransport(createTransport, release)({ ...options, url }) diff --git a/packages/core/src/utils/isSentryRequestUrl.ts b/packages/core/src/utils/isSentryRequestUrl.ts index a3f3e08be3e0..b1586654aee0 100644 --- a/packages/core/src/utils/isSentryRequestUrl.ts +++ b/packages/core/src/utils/isSentryRequestUrl.ts @@ -7,22 +7,9 @@ import type { Client, DsnComponents } from '@sentry/types'; */ export function isSentryRequestUrl(url: string, client: Client | undefined): boolean { const dsn = client && client.getDsn(); - const tunnel = client && client.getOptions().tunnel; - return checkDsn(url, dsn) || checkTunnel(url, tunnel); -} - -function checkTunnel(url: string, tunnel: string | undefined): boolean { - if (!tunnel) { - return false; - } - - return removeTrailingSlash(url) === removeTrailingSlash(tunnel); + return checkDsn(url, dsn); } function checkDsn(url: string, dsn: DsnComponents | undefined): boolean { return dsn ? url.includes(dsn.host) : false; } - -function removeTrailingSlash(str: string): string { - return str[str.length - 1] === '/' ? str.slice(0, -1) : str; -}