diff --git a/packages/core/src/utils/isSentryRequestUrl.ts b/packages/core/src/utils/isSentryRequestUrl.ts index acc6b0d68cab..a3f3e08be3e0 100644 --- a/packages/core/src/utils/isSentryRequestUrl.ts +++ b/packages/core/src/utils/isSentryRequestUrl.ts @@ -1,20 +1,13 @@ -import type { Client, DsnComponents, Hub } from '@sentry/types'; +import type { Client, DsnComponents } from '@sentry/types'; /** * Checks whether given url points to Sentry server - * @param url url to verify * - * TODO(v8): Remove Hub fallback type + * @param url url to verify */ -export function isSentryRequestUrl(url: string, hubOrClient: Hub | Client | undefined): boolean { - const client = - hubOrClient && isHub(hubOrClient) - ? // eslint-disable-next-line deprecation/deprecation - hubOrClient.getClient() - : hubOrClient; +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); } @@ -33,8 +26,3 @@ function checkDsn(url: string, dsn: DsnComponents | undefined): boolean { function removeTrailingSlash(str: string): string { return str[str.length - 1] === '/' ? str.slice(0, -1) : str; } - -function isHub(hubOrClient: Hub | Client | undefined): hubOrClient is Hub { - // eslint-disable-next-line deprecation/deprecation - return (hubOrClient as Hub).getClient !== undefined; -} diff --git a/packages/core/test/lib/utils/isSentryRequestUrl.test.ts b/packages/core/test/lib/utils/isSentryRequestUrl.test.ts index 98fd7e54207b..b223f856b95e 100644 --- a/packages/core/test/lib/utils/isSentryRequestUrl.test.ts +++ b/packages/core/test/lib/utils/isSentryRequestUrl.test.ts @@ -1,4 +1,4 @@ -import type { Client, Hub } from '@sentry/types'; +import type { Client } from '@sentry/types'; import { isSentryRequestUrl } from '../../../src'; @@ -17,15 +17,6 @@ describe('isSentryRequestUrl', () => { getDsn: () => ({ host: dsn }), } as unknown as Client; - const hub = { - getClient: () => { - return client; - }, - } as unknown as Hub; - - // Works with hub passed - expect(isSentryRequestUrl(url, hub)).toBe(expected); - // Works with client passed expect(isSentryRequestUrl(url, client)).toBe(expected); });