Create a "RUM" batch for telemetry events in logs

DataDog · Feb 23, 2022 · 8fd540d · 8fd540d
1 parent 057dcde
commit 8fd540d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/packages/logs/src/boot/logsPublicApi.ts b/packages/logs/src/boot/logsPublicApi.ts
@@ -13,6 +13,7 @@ import type { LogsInitConfiguration } from '../domain/configuration'
 import { validateAndBuildLogsConfiguration } from '../domain/configuration'
 import type { HandlerType, LogsMessage, StatusType } from '../domain/logger'
 import { Logger } from '../domain/logger'
+import { startLogsInternalMonitoring } from '../domain/internalMonitoring'
 import type { startLogs } from './startLogs'
 import { buildEnv } from './buildEnv'
 
@@ -56,7 +57,9 @@ export function makeLogsPublicApi(startLogsImpl: StartLogs) {
         return
       }
 
-      sendLogStrategy = startLogsImpl(configuration, logger)
+      const internalMonitoring = startLogsInternalMonitoring(configuration)
+
+      sendLogStrategy = startLogsImpl(configuration, logger, internalMonitoring)
       getInitConfigurationStrategy = () => deepClone(initConfiguration)
       beforeInitSendLog.drain()
 

diff --git a/packages/logs/src/boot/startLogs.spec.ts b/packages/logs/src/boot/startLogs.spec.ts
@@ -195,7 +195,7 @@ describe('logs', () => {
       const consoleLogSpy = spyOn(console, 'log').and.callFake(() => true)
 
       updateExperimentalFeatures(['forward-logs'])
-      originalStartLogs({ ...baseConfiguration, forwardConsoleLogs: ['log'] }, logger)
+      originalStartLogs({ ...baseConfiguration, forwardConsoleLogs: ['log'] }, logger, internalMonitoringStub)
 
       /* eslint-disable-next-line no-console */
       console.log('foo', 'bar')
@@ -212,13 +212,13 @@ describe('logs', () => {
       const sendSpy = spyOn(initEventBridgeStub(), 'send')
 
       let configuration = { ...baseConfiguration, sampleRate: 0 }
-      let sendLog = originalStartLogs(configuration, new Logger(noop))
+      let sendLog = originalStartLogs(configuration, new Logger(noop), internalMonitoringStub)
       sendLog(DEFAULT_MESSAGE, {})
 
       expect(sendSpy).not.toHaveBeenCalled()
 
       configuration = { ...baseConfiguration, sampleRate: 100 }
-      sendLog = originalStartLogs(configuration, new Logger(noop))
+      sendLog = originalStartLogs(configuration, new Logger(noop), internalMonitoringStub)
       sendLog(DEFAULT_MESSAGE, {})
 
       expect(sendSpy).toHaveBeenCalled()

diff --git a/packages/logs/src/boot/startLogs.ts b/packages/logs/src/boot/startLogs.ts
@@ -8,7 +8,6 @@ import {
   canUseEventBridge,
   getEventBridge,
   getRelativeTime,
-  startInternalMonitoring,
   initConsoleObservable,
   ConsoleApiName,
   ErrorSource,
@@ -30,9 +29,7 @@ const LogStatusForApi = {
   [ConsoleApiName.error]: StatusType.error,
 }
 
-export function startLogs(configuration: LogsConfiguration, logger: Logger) {
-  const internalMonitoring = startInternalMonitoring(configuration)
-
+export function startLogs(configuration: LogsConfiguration, logger: Logger, internalMonitoring: InternalMonitoring) {
   const rawErrorObservable = new Observable<RawError>()
 
   if (configuration.forwardErrorsToLogs) {
@@ -62,6 +59,20 @@ export function doStartLogs(
       view: { name: null, url: null, referrer: null },
     })
   )
+  internalMonitoring.setTelemetryContextProvider(() => ({
+    application: {
+      id: getRUMInternalContext()?.application_id,
+    },
+    session: {
+      id: sessionManager.findTrackedSession()?.id,
+    },
+    view: {
+      id: (getRUMInternalContext()?.view as Context)?.id,
+    },
+    action: {
+      id: (getRUMInternalContext()?.user_action as Context)?.id,
+    },
+  }))
 
   const assemble = buildAssemble(sessionManager, configuration, reportRawError)
 

diff --git a/packages/logs/src/domain/internalMonitoring.ts b/packages/logs/src/domain/internalMonitoring.ts
@@ -0,0 +1,16 @@
+import type { Configuration, InternalMonitoring } from '@datadog/browser-core'
+import { startInternalMonitoring, Batch, HttpRequest } from '@datadog/browser-core'
+
+export function startLogsInternalMonitoring(configuration: Configuration): InternalMonitoring {
+  const internalMonitoring = startInternalMonitoring(configuration)
+  const monitoringBatch = new Batch(
+    new HttpRequest(configuration.rumEndpointBuilder, configuration.batchBytesLimit),
+    configuration.maxBatchSize,
+    configuration.batchBytesLimit,
+    configuration.maxMessageSize,
+    configuration.flushTimeout
+  )
+  // TODO handle replica
+  internalMonitoring.telemetryEventObservable.subscribe((event) => monitoringBatch.add(event))
+  return internalMonitoring
+}