♻️ [RUMF-1190] cleanup telemetry

packages/core/src/boot/init.ts

@@ -1,4 +1,4 @@
-import { setDebugMode } from '../domain/internalMonitoring'
+import { setDebugMode } from '../domain/telemetry'
 import { catchUserErrors } from '../tools/catchUserErrors'
 import { assign } from '../tools/utils'
 

packages/core/src/browser/fetchObservable.ts

@@ -1,4 +1,4 @@
-import { monitor, callMonitored } from '../domain/internalMonitoring'
+import { monitor, callMonitored } from '../domain/telemetry'
 import { instrumentMethod } from '../tools/instrumentMethod'
 import { Observable } from '../tools/observable'
 import type { Duration, ClocksState } from '../tools/timeUtils'

packages/core/src/browser/xhrObservable.ts

@@ -1,4 +1,4 @@
-import { monitor } from '../domain/internalMonitoring'
+import { monitor } from '../domain/telemetry'
 import { instrumentMethodAndCallOriginal } from '../tools/instrumentMethod'
 import { Observable } from '../tools/observable'
 import type { Duration, RelativeTime, ClocksState } from '../tools/timeUtils'

packages/core/src/domain/configuration/configuration.ts

@@ -38,7 +38,6 @@ export interface InitConfiguration {
 
   // internal options
   enableExperimentalFeatures?: string[] | undefined
-  internalMonitoringApiKey?: string | undefined
   replica?: ReplicaUserConfiguration | undefined
   datacenter?: string
 }
@@ -63,7 +62,7 @@ export interface Configuration extends TransportConfiguration {
 
   // Event limits
   eventRateLimiterThreshold: number // Limit the maximum number of actions, errors and logs per minutes
-  maxInternalMonitoringMessagesPerPage: number
+  maxTelemetryEventsPerPage: number
 
   // Batch configuration
   batchBytesLimit: number
@@ -108,7 +107,7 @@ export function validateAndBuildConfiguration(initConfiguration: InitConfigurati
       batchBytesLimit: isExperimentalFeatureEnabled('lower-batch-size') ? 10 * ONE_KILO_BYTE : 16 * ONE_KILO_BYTE,
 
       eventRateLimiterThreshold: 3000,
-      maxInternalMonitoringMessagesPerPage: 15,
+      maxTelemetryEventsPerPage: 15,
 
       /**
        * flush automatically, aim to be lower than ALB connection timeout

packages/core/src/domain/configuration/endpointBuilder.ts

@@ -2,7 +2,7 @@ import { timeStampNow } from '../../tools/timeUtils'
 import { normalizeUrl } from '../../tools/urlPolyfill'
 import { generateUUID } from '../../tools/utils'
 import type { InitConfiguration } from './configuration'
-import { INTAKE_SITE_US } from './intakeSites'
+import { INTAKE_SITE_US1 } from './intakeSites'
 
 // replaced at build time
 declare const __BUILD_ENV__SDK_VERSION__: string
@@ -29,7 +29,7 @@ export function createEndpointBuilder(
   tags: string[],
   source?: string
 ) {
-  const { site = INTAKE_SITE_US, clientToken } = initConfiguration
+  const { site = INTAKE_SITE_US1, clientToken } = initConfiguration
 
   const domainParts = site.split('.')
   const extension = domainParts.pop()

packages/core/src/domain/configuration/intakeSites.ts

@@ -1,5 +1,3 @@
 export const INTAKE_SITE_STAGING = 'datad0g.com'
-export const INTAKE_SITE_US = 'datadoghq.com'
-export const INTAKE_SITE_US3 = 'us3.datadoghq.com'
-export const INTAKE_SITE_US5 = 'us5.datadoghq.com'
-export const INTAKE_SITE_EU = 'datadoghq.eu'
+export const INTAKE_SITE_US1 = 'datadoghq.com'
+export const INTAKE_SITE_US1_FED = 'ddog-gov.com'

packages/core/src/domain/configuration/transportConfiguration.spec.ts

@@ -3,22 +3,11 @@ import { computeTransportConfiguration } from './transportConfiguration'
 
 describe('transportConfiguration', () => {
   const clientToken = 'some_client_token'
-  const otherClientToken = 'some_other_client_token'
 
   beforeEach(() => {
     ;(window as unknown as BuildEnvWindow).__BUILD_ENV__SDK_VERSION__ = 'some_version'
   })
 
-  describe('internal monitoring endpoint', () => {
-    it('should only be defined when api key is provided', () => {
-      let configuration = computeTransportConfiguration({ clientToken })
-      expect(configuration.internalMonitoringEndpointBuilder).toBeUndefined()
-
-      configuration = computeTransportConfiguration({ clientToken, internalMonitoringApiKey: otherClientToken })
-      expect(configuration.internalMonitoringEndpointBuilder?.build()).toContain(otherClientToken)
-    })
-  })
-
   describe('site', () => {
     it('should use US site by default', () => {
       const configuration = computeTransportConfiguration({ clientToken })

packages/core/src/domain/configuration/transportConfiguration.ts

@@ -3,13 +3,12 @@ import type { InitConfiguration } from './configuration'
 import type { EndpointBuilder } from './endpointBuilder'
 import { createEndpointBuilder } from './endpointBuilder'
 import { buildTags } from './tags'
-import { INTAKE_SITE_US } from './intakeSites'
+import { INTAKE_SITE_US1 } from './intakeSites'
 
 export interface TransportConfiguration {
   logsEndpointBuilder: EndpointBuilder
   rumEndpointBuilder: EndpointBuilder
   sessionReplayEndpointBuilder: EndpointBuilder
-  internalMonitoringEndpointBuilder?: EndpointBuilder
   isIntakeUrl: (url: string) => boolean
   replica?: ReplicaConfiguration
   site: string
@@ -19,7 +18,6 @@ export interface ReplicaConfiguration {
   applicationId?: string
   logsEndpointBuilder: EndpointBuilder
   rumEndpointBuilder: EndpointBuilder
-  internalMonitoringEndpointBuilder: EndpointBuilder
 }
 
 export function computeTransportConfiguration(initConfiguration: InitConfiguration): TransportConfiguration {
@@ -34,31 +32,18 @@ export function computeTransportConfiguration(initConfiguration: InitConfigurati
     {
       isIntakeUrl: (url: string) => intakeEndpoints.some((intakeEndpoint) => url.indexOf(intakeEndpoint) === 0),
       replica: replicaConfiguration,
-      site: initConfiguration.site || INTAKE_SITE_US,
+      site: initConfiguration.site || INTAKE_SITE_US1,
     },
     endpointBuilders
   )
 }
 
 function computeEndpointBuilders(initConfiguration: InitConfiguration, tags: string[]) {
-  const endpointBuilders = {
+  return {
     logsEndpointBuilder: createEndpointBuilder(initConfiguration, 'logs', tags),
     rumEndpointBuilder: createEndpointBuilder(initConfiguration, 'rum', tags),
     sessionReplayEndpointBuilder: createEndpointBuilder(initConfiguration, 'sessionReplay', tags),
   }
-
-  if (initConfiguration.internalMonitoringApiKey) {
-    return assign(endpointBuilders, {
-      internalMonitoringEndpointBuilder: createEndpointBuilder(
-        assign({}, initConfiguration, { clientToken: initConfiguration.internalMonitoringApiKey }),
-        'logs',
-        tags,
-        'browser-agent-internal-monitoring'
-      ),
-    })
-  }
-
-  return endpointBuilders
 }
 
 function computeReplicaConfiguration(
@@ -71,19 +56,13 @@ function computeReplicaConfiguration(
   }
 
   const replicaConfiguration: InitConfiguration = assign({}, initConfiguration, {
-    site: INTAKE_SITE_US,
+    site: INTAKE_SITE_US1,
     clientToken: initConfiguration.replica.clientToken,
   })
 
   const replicaEndpointBuilders = {
     logsEndpointBuilder: createEndpointBuilder(replicaConfiguration, 'logs', tags),
     rumEndpointBuilder: createEndpointBuilder(replicaConfiguration, 'rum', tags),
-    internalMonitoringEndpointBuilder: createEndpointBuilder(
-      replicaConfiguration,
-      'logs',
-      tags,
-      'browser-agent-internal-monitoring'
-    ),
   }
 
   intakeEndpoints.push(...objectValues(replicaEndpointBuilders).map((builder) => builder.buildIntakeUrl()))

packages/core/src/domain/console/consoleObservable.ts

@@ -1,4 +1,4 @@
-import { callMonitored } from '../internalMonitoring'
+import { callMonitored } from '../telemetry'
 import { computeStackTrace } from '../tracekit'
 import { createHandlingStack, formatErrorMessage, toStackTraceString } from '../../tools/error'
 import { mergeObservables, Observable } from '../../tools/observable'