🐛 add missing ddtags to telemetry events (#3873)

Author: thomas-lebeau

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

@@ -9,4 +9,3 @@ export {
 export type { EndpointBuilder, TrackType } from './endpointBuilder'
 export { createEndpointBuilder, buildEndpointHost } from './endpointBuilder'
 export { computeTransportConfiguration, isIntakeUrl } from './transportConfiguration'
-export { buildTags, buildTag, sanitizeTag } from './tags'

…re/src/domain/configuration/tags.spec.ts packages/core/src/domain/tags.spec.tspackages/core/src/domain/configuration/tags.spec.ts renamed to packages/core/src/domain/tags.spec.ts packages/core/src/domain/configuration/tags.spec.ts renamed to packages/core/src/domain/tags.spec.ts

@@ -1,4 +1,4 @@
-import { display } from '../../tools/display'
+import { display } from '../tools/display'
 import type { Configuration } from './configuration'
 import { buildTag, buildTags, supportUnicodePropertyEscapes, TAG_SIZE_LIMIT } from './tags'
 

…es/core/src/domain/configuration/tags.ts packages/core/src/domain/tags.tspackages/core/src/domain/configuration/tags.ts renamed to packages/core/src/domain/tags.ts packages/core/src/domain/configuration/tags.ts renamed to packages/core/src/domain/tags.ts

@@ -1,4 +1,4 @@
-import { DOCS_ORIGIN, MORE_DETAILS, display } from '../../tools/display'
+import { DOCS_ORIGIN, MORE_DETAILS, display } from '../tools/display'
 import type { Configuration } from './configuration'
 
 export const TAG_SIZE_LIMIT = 200

packages/core/src/domain/telemetry/telemetry.spec.ts

@@ -234,6 +234,18 @@ describe('telemetry', () => {
     expect((await getTelemetryEvents()).length).toBe(1)
   })
 
+  it('should collect ddtags', async () => {
+    const { getTelemetryEvents } = startAndSpyTelemetry({
+      service: 'foo',
+      env: 'bar',
+      version: '123',
+    })
+
+    addTelemetryUsage({ feature: 'set-tracking-consent', tracking_consent: 'granted' })
+
+    expect((await getTelemetryEvents())[0].ddtags).toEqual('sdk_version:test,env:bar,service:foo,version:123')
+  })
+
   describe('assemble telemetry hook', () => {
     it('should add default telemetry event attributes', async () => {
       const { getTelemetryEvents, hooks } = startAndSpyTelemetry()

packages/core/src/domain/telemetry/telemetry.ts

@@ -4,6 +4,7 @@ import { NO_ERROR_STACK_PRESENT_MESSAGE, isError } from '../error/error'
 import { toStackTraceString } from '../../tools/stackTrace/handlingStack'
 import { getExperimentalFeatures } from '../../tools/experimentalFeatures'
 import type { Configuration } from '../configuration'
+import { buildTags } from '../tags'
 import { INTAKE_SITE_STAGING, INTAKE_SITE_US1_FED } from '../intakeSites'
 import { BufferedObservable, Observable } from '../../tools/observable'
 import { clocksNow } from '../../tools/utils/timeUtils'
@@ -195,6 +196,7 @@ export function startTelemetryCollection(
         connectivity: getConnectivity(),
         sdk_setup: __BUILD_ENV__SDK_SETUP__,
       }) as TelemetryEvent['telemetry'],
+      ddtags: buildTags(configuration).join(','),
       experimental_features: Array.from(getExperimentalFeatures()),
     }
 

packages/core/src/index.ts

@@ -7,9 +7,6 @@ export {
   isSampleRate,
   buildEndpointHost,
   isIntakeUrl,
-  buildTags,
-  buildTag,
-  sanitizeTag,
 } from './domain/configuration'
 export * from './domain/intakeSites'
 export type { TrackingConsentState } from './domain/trackingConsent'
@@ -164,4 +161,5 @@ export * from './domain/deflate'
 export * from './domain/connectivity'
 export * from './tools/stackTrace/handlingStack'
 export * from './tools/abstractHooks'
+export * from './domain/tags'
 export { WARN_DOES_NOT_HAVE_ALLOWED_TRACKING_ORIGIN } from './domain/allowedTrackingOrigins'

packages/logs/src/domain/logger.spec.ts

@@ -1,6 +1,10 @@
 import type { ErrorWithCause } from '@datadog/browser-core'
-import { display, ErrorHandling, NO_ERROR_STACK_PRESENT_MESSAGE } from '@datadog/browser-core'
-import { supportUnicodePropertyEscapes } from '@datadog/browser-core/src/domain/configuration/tags'
+import {
+  display,
+  ErrorHandling,
+  NO_ERROR_STACK_PRESENT_MESSAGE,
+  supportUnicodePropertyEscapes,
+} from '@datadog/browser-core'
 import type { LogsMessage } from './logger'
 import { HandlerType, Logger, STATUSES } from './logger'
 import { StatusType } from './logger/isAuthorized'