🐛 fix beforeSend type definition for logs (#2686)

DataDog · Apr 5, 2024 · 975b2e0 · 975b2e0
1 parent c47a9dd
commit 975b2e0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/packages/logs/src/domain/configuration.ts b/packages/logs/src/domain/configuration.ts
@@ -12,9 +12,10 @@ import {
   objectValues,
 } from '@datadog/browser-core'
 import type { LogsEvent } from '../logsEvent.types'
+import type { LogsEventDomainContext } from '../domainContext.types'
 
 export interface LogsInitConfiguration extends InitConfiguration {
-  beforeSend?: ((event: LogsEvent) => boolean) | undefined
+  beforeSend?: ((event: LogsEvent, context: LogsEventDomainContext) => boolean) | undefined
   forwardErrorsToLogs?: boolean | undefined
   forwardConsoleLogs?: ConsoleApiName[] | 'all' | undefined
   forwardReports?: RawReportType[] | 'all' | undefined

diff --git a/packages/logs/src/domain/lifeCycle.ts b/packages/logs/src/domain/lifeCycle.ts
@@ -1,7 +1,8 @@
 import { AbstractLifeCycle } from '@datadog/browser-core'
-import type { Context, ErrorSource } from '@datadog/browser-core'
+import type { Context } from '@datadog/browser-core'
 import type { LogsEvent } from '../logsEvent.types'
 import type { CommonContext, RawLogsEvent } from '../rawLogsEvent.types'
+import type { LogsEventDomainContext } from '../domainContext.types'
 
 export const enum LifeCycleEventType {
   RAW_LOG_COLLECTED,
@@ -16,14 +17,6 @@ interface LifeCycleEventMap {
 export const LifeCycle = AbstractLifeCycle<LifeCycleEventMap>
 export type LifeCycle = AbstractLifeCycle<LifeCycleEventMap>
 
-export type LogsEventDomainContext<T extends ErrorSource> = T extends typeof ErrorSource.NETWORK
-  ? NetworkLogsEventDomainContext
-  : never
-
-type NetworkLogsEventDomainContext = {
-  isAborted: boolean
-}
-
 export interface RawLogsEventCollectedData<E extends RawLogsEvent = RawLogsEvent> {
   rawLogsEvent: E
   messageContext?: object

diff --git a/packages/logs/src/domain/networkError/networkErrorCollection.ts b/packages/logs/src/domain/networkError/networkErrorCollection.ts
@@ -13,7 +13,8 @@ import {
   isServerError,
 } from '@datadog/browser-core'
 import type { LogsConfiguration } from '../configuration'
-import type { LifeCycle, LogsEventDomainContext } from '../lifeCycle'
+import type { LifeCycle } from '../lifeCycle'
+import type { LogsEventDomainContext } from '../../domainContext.types'
 import { LifeCycleEventType } from '../lifeCycle'
 import { StatusType } from '../logger'
 

diff --git a/packages/logs/src/domainContext.types.ts b/packages/logs/src/domainContext.types.ts
@@ -0,0 +1,9 @@
+import type { ErrorSource } from '@datadog/browser-core'
+
+export type LogsEventDomainContext<T extends ErrorSource = any> = T extends typeof ErrorSource.NETWORK
+  ? NetworkLogsEventDomainContext
+  : never
+
+export type NetworkLogsEventDomainContext = {
+  isAborted: boolean
+}