diff --git a/packages/core/src/domain/configuration/configuration.ts b/packages/core/src/domain/configuration/configuration.ts index 0ca9d5a6d2..225d51f34a 100644 --- a/packages/core/src/domain/configuration/configuration.ts +++ b/packages/core/src/domain/configuration/configuration.ts @@ -226,14 +226,6 @@ export interface InitConfiguration { */ datacenter?: string - /** - * [Internal option] Datadog internal analytics subdomain - * - * @internal - */ - // TODO next major: remove this option and replace usages by proxyFn - internalAnalyticsSubdomain?: string - /** * [Internal option] The percentage of telemetry configuration sent. A value between 0 and 100. * diff --git a/packages/core/src/domain/configuration/endpointBuilder.spec.ts b/packages/core/src/domain/configuration/endpointBuilder.spec.ts index 9090c0da48..4f281422c4 100644 --- a/packages/core/src/domain/configuration/endpointBuilder.spec.ts +++ b/packages/core/src/domain/configuration/endpointBuilder.spec.ts @@ -38,15 +38,6 @@ describe('endpointBuilder', () => { ).toContain('&dd-evp-encoding=deflate') }) - it('should not start with ddsource for internal analytics mode', () => { - const url = createEndpointBuilder({ ...initConfiguration, internalAnalyticsSubdomain: 'foo' }, 'rum').build( - 'fetch', - DEFAULT_PAYLOAD - ) - expect(url).not.toContain('/rum?ddsource') - expect(url).toContain('ddsource=browser') - }) - it('accepts extra parameters', () => { const extraParameters = ['application.id=1234', 'application.version=1.0.0'] const url = createEndpointBuilder(initConfiguration, 'rum', extraParameters).build('fetch', DEFAULT_PAYLOAD) diff --git a/packages/core/src/domain/configuration/endpointBuilder.ts b/packages/core/src/domain/configuration/endpointBuilder.ts index 0a4cef55ec..22e4334017 100644 --- a/packages/core/src/domain/configuration/endpointBuilder.ts +++ b/packages/core/src/domain/configuration/endpointBuilder.ts @@ -2,7 +2,7 @@ import type { Payload } from '../../transport' import { timeStampNow } from '../../tools/utils/timeUtils' import { normalizeUrl } from '../../tools/utils/urlPolyfill' import { generateUUID } from '../../tools/utils/stringUtils' -import { INTAKE_SITE_FED_STAGING, INTAKE_SITE_US1 } from '../intakeSites' +import { INTAKE_SITE_US1 } from '../intakeSites' import type { InitConfiguration } from './configuration' // replaced at build time @@ -57,15 +57,7 @@ function createEndpointUrlWithParametersBuilder( } export function buildEndpointHost(initConfiguration: InitConfiguration) { - const { site = INTAKE_SITE_US1, internalAnalyticsSubdomain } = initConfiguration - - if (internalAnalyticsSubdomain && site === INTAKE_SITE_US1) { - return `${internalAnalyticsSubdomain}.${INTAKE_SITE_US1}` - } - - if (site === INTAKE_SITE_FED_STAGING) { - return `http-intake.logs.${site}` - } + const { site = INTAKE_SITE_US1 } = initConfiguration const domainParts = site.split('.') const extension = domainParts.pop() @@ -77,7 +69,7 @@ export function buildEndpointHost(initConfiguration: InitConfiguration) { * request, as they change randomly. */ function buildEndpointParameters( - { clientToken, internalAnalyticsSubdomain, source = 'browser' }: InitConfiguration, + { clientToken, source = 'browser' }: InitConfiguration, trackType: TrackType, api: ApiType, { retry, encoding }: Payload, @@ -103,9 +95,5 @@ function buildEndpointParameters( } } - if (internalAnalyticsSubdomain) { - parameters.reverse() - } - return parameters.join('&') } diff --git a/packages/core/src/domain/configuration/transportConfiguration.spec.ts b/packages/core/src/domain/configuration/transportConfiguration.spec.ts index 48980d5e26..0b435f150c 100644 --- a/packages/core/src/domain/configuration/transportConfiguration.spec.ts +++ b/packages/core/src/domain/configuration/transportConfiguration.spec.ts @@ -1,4 +1,3 @@ -import { INTAKE_SITE_FED_STAGING } from '../intakeSites' import type { Payload } from '../../transport' import { computeTransportConfiguration, isIntakeUrl } from './transportConfiguration' @@ -6,7 +5,6 @@ const DEFAULT_PAYLOAD = {} as Payload describe('transportConfiguration', () => { const clientToken = 'some_client_token' - const internalAnalyticsSubdomain = 'ia-rum-intake' const intakeParameters = 'ddsource=browser&dd-api-key=xxxx&dd-request-id=1234567890' describe('site', () => { @@ -16,14 +14,6 @@ describe('transportConfiguration', () => { expect(configuration.site).toBe('datadoghq.com') }) - it('should use logs intake domain for fed staging', () => { - const configuration = computeTransportConfiguration({ clientToken, site: INTAKE_SITE_FED_STAGING }) - expect(configuration.rumEndpointBuilder.build('fetch', DEFAULT_PAYLOAD)).toContain( - 'http-intake.logs.dd0g-gov.com' - ) - expect(configuration.site).toBe(INTAKE_SITE_FED_STAGING) - }) - it('should use site value when set', () => { const configuration = computeTransportConfiguration({ clientToken, site: 'datadoghq.com' }) expect(configuration.rumEndpointBuilder.build('fetch', DEFAULT_PAYLOAD)).toContain('datadoghq.com') @@ -31,25 +21,6 @@ describe('transportConfiguration', () => { }) }) - describe('internalAnalyticsSubdomain', () => { - it('should use internal analytics subdomain value when set for datadoghq.com site', () => { - const configuration = computeTransportConfiguration({ - clientToken, - internalAnalyticsSubdomain, - }) - expect(configuration.rumEndpointBuilder.build('fetch', DEFAULT_PAYLOAD)).toContain(internalAnalyticsSubdomain) - }) - - it('should not use internal analytics subdomain value when set for other sites', () => { - const configuration = computeTransportConfiguration({ - clientToken, - site: 'us3.datadoghq.com', - internalAnalyticsSubdomain, - }) - expect(configuration.rumEndpointBuilder.build('fetch', DEFAULT_PAYLOAD)).not.toContain(internalAnalyticsSubdomain) - }) - }) - it('adds the replica application id to the rum replica endpoint', () => { const replicaApplicationId = 'replica-application-id' const configuration = computeTransportConfiguration({ @@ -74,7 +45,6 @@ describe('transportConfiguration', () => { { site: 'ap1.datadoghq.com', intakeDomain: 'browser-intake-ap1-datadoghq.com' }, { site: 'ddog-gov.com', intakeDomain: 'browser-intake-ddog-gov.com' }, { site: 'datad0g.com', intakeDomain: 'browser-intake-datad0g.com' }, - { site: 'dd0g-gov.com', intakeDomain: 'http-intake.logs.dd0g-gov.com' }, ].forEach(({ site, intakeDomain }) => { it(`should detect intake request to ${intakeDomain} for site ${site}`, () => { expect(isIntakeUrl(`https://${intakeDomain}/api/v2/rum?${intakeParameters}`)).toBe(true) @@ -96,12 +66,6 @@ describe('transportConfiguration', () => { }) }) - it('should detect internal analytics intake request for datadoghq.com site', () => { - expect(isIntakeUrl(`https://${internalAnalyticsSubdomain}.datadoghq.com/api/v2/rum?${intakeParameters}`)).toBe( - true - ) - }) - it('should not detect non intake request', () => { expect(isIntakeUrl('https://www.foo.com')).toBe(false) }) @@ -129,15 +93,9 @@ describe('transportConfiguration', () => { { site: 'ap1.datadoghq.com' }, ].forEach(({ site }) => { it(`should detect replica intake request for site ${site}`, () => { - expect(isIntakeUrl(`https://${internalAnalyticsSubdomain}.datadoghq.com/api/v2/rum?${intakeParameters}`)).toBe( - true - ) - expect(isIntakeUrl(`https://${internalAnalyticsSubdomain}.datadoghq.com/api/v2/logs?${intakeParameters}`)).toBe( - true - ) - expect( - isIntakeUrl(`https://${internalAnalyticsSubdomain}.datadoghq.com/api/v2/replay?${intakeParameters}`) - ).toBe(true) + expect(isIntakeUrl(`https://browser-intake-datadoghq.com/api/v2/rum?${intakeParameters}`)).toBe(true) + expect(isIntakeUrl(`https://browser-intake-datadoghq.com/api/v2/logs?${intakeParameters}`)).toBe(true) + expect(isIntakeUrl(`https://browser-intake-datadoghq.com/api/v2/replay?${intakeParameters}`)).toBe(true) }) }) }) diff --git a/packages/core/src/domain/intakeSites.ts b/packages/core/src/domain/intakeSites.ts index d03225b18c..301585dfdd 100644 --- a/packages/core/src/domain/intakeSites.ts +++ b/packages/core/src/domain/intakeSites.ts @@ -9,7 +9,6 @@ export type Site = | (string & {}) export const INTAKE_SITE_STAGING: Site = 'datad0g.com' -export const INTAKE_SITE_FED_STAGING: Site = 'dd0g-gov.com' export const INTAKE_SITE_US1: Site = 'datadoghq.com' export const INTAKE_SITE_EU1: Site = 'datadoghq.eu' export const INTAKE_SITE_US1_FED: Site = 'ddog-gov.com' diff --git a/packages/core/test/coreConfiguration.ts b/packages/core/test/coreConfiguration.ts index aaf86a8157..944271132d 100644 --- a/packages/core/test/coreConfiguration.ts +++ b/packages/core/test/coreConfiguration.ts @@ -33,7 +33,6 @@ export const EXHAUSTIVE_INIT_CONFIGURATION: Required = { clientToken: 'yes', }, datacenter: 'datacenter', - internalAnalyticsSubdomain: 'internal-analytics-subdomain.com', telemetryConfigurationSampleRate: 70, telemetryUsageSampleRate: 80, allowedTrackingOrigins: ['chrome-extension://example'], @@ -79,7 +78,6 @@ export type MapInitConfigurationKey = | 'env' | 'version' | 'datacenter' - | 'internalAnalyticsSubdomain' | 'replica' | 'enableExperimentalFeatures' ? never