✨ add simulation label to events during simulation

DataDog · Oct 4, 2022 · 29fda3d · 29fda3d
1 parent b2e7c67
commit 29fda3d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/packages/core/src/domain/telemetry/telemetry.ts b/packages/core/src/domain/telemetry/telemetry.ts
@@ -3,7 +3,13 @@ import { ConsoleApiName } from '../../tools/display'
 import { toStackTraceString } from '../../tools/error'
 import { assign, combine, jsonStringify, performDraw, includes, startsWith, arrayFrom } from '../../tools/utils'
 import type { Configuration } from '../configuration'
-import { getExperimentalFeatures, INTAKE_SITE_STAGING, INTAKE_SITE_US1_FED } from '../configuration'
+import {
+  getExperimentalFeatures,
+  getSimulationLabel,
+  INTAKE_SITE_STAGING,
+  INTAKE_SITE_US1_FED,
+  isSimulationActive,
+} from '../configuration'
 import type { StackTrace } from '../tracekit'
 import { computeStackTrace } from '../tracekit'
 import { Observable } from '../../tools/observable'
@@ -82,7 +88,8 @@ export function startTelemetry(configuration: Configuration): Telemetry {
         telemetry: event as any, // https://github.com/microsoft/TypeScript/issues/48457
         experimental_features: arrayFrom(getExperimentalFeatures()),
       },
-      contextProvider !== undefined ? contextProvider() : {}
+      contextProvider !== undefined ? contextProvider() : {},
+      isSimulationActive() ? { simulation_label: getSimulationLabel() } : {}
     )
   }
 

diff --git a/packages/logs/src/domain/assembly.ts b/packages/logs/src/domain/assembly.ts
@@ -8,6 +8,8 @@ import {
   combine,
   createEventRateLimiter,
   getRelativeTime,
+  isSimulationActive,
+  getSimulationLabel,
 } from '@datadog/browser-core'
 import type { CommonContext } from '../rawLogsEvent.types'
 import type { LogsConfiguration } from './configuration'
@@ -52,6 +54,10 @@ export function startLogsAssembly(
         messageContext
       )
 
+      if (isSimulationActive()) {
+        log.simulation_label = getSimulationLabel()
+      }
+
       if (
         // Todo: [RUMF-1230] Move this check to the logger collection in the next major release
         !isAuthorized(rawLogsEvent.status, HandlerType.http, logger) ||

diff --git a/packages/rum-core/src/domain/assembly.ts b/packages/rum-core/src/domain/assembly.ts
@@ -8,6 +8,8 @@ import {
   display,
   createEventRateLimiter,
   canUseEventBridge,
+  isSimulationActive,
+  getSimulationLabel,
 } from '@datadog/browser-core'
 import type { RumEventDomainContext } from '../domainContext.types'
 import type {
@@ -133,6 +135,10 @@ export function startRumAssembly(
         const serverRumEvent = combine(rumContext as RumContext & Context, rawRumEvent) as RumEvent & Context
         serverRumEvent.context = combine(commonContext.context, customerContext)
 
+        if (isSimulationActive()) {
+          serverRumEvent.context.simulation_label = getSimulationLabel()
+        }
+
         if (!('has_replay' in serverRumEvent.session)) {
           ;(serverRumEvent.session as Mutable<RumEvent['session']>).has_replay = commonContext.hasReplay
         }