From 82aa22d608347d0ec033f89680cb8cde3f087992 Mon Sep 17 00:00:00 2001 From: Marco Saia Date: Fri, 5 Sep 2025 17:49:14 +0200 Subject: [PATCH] Fix circular dependency (undefined DdBabelInteractionTracking) --- .../DdBabelInteractionTracking.ts | 13 +++++++++++-- .../DdRumUserInteractionTracking.tsx | 4 ++-- packages/core/src/utils/telemetry.ts | 17 ----------------- 3 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 packages/core/src/utils/telemetry.ts diff --git a/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts b/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts index 8d36cb806..c14ef4b0b 100644 --- a/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts +++ b/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts @@ -8,7 +8,6 @@ import { InternalLog } from '../../../InternalLog'; import { SdkVerbosity } from '../../../SdkVerbosity'; import DdNativeRum from '../../../specs/NativeDdRum'; import DdSdk from '../../../specs/NativeDdSdk'; -import { getBabelTelemetryConfig } from '../../../utils/telemetry'; import { DefaultTimeProvider } from '../../../utils/time-provider/DefaultTimeProvider'; import type { TimeProvider } from '../../../utils/time-provider/TimeProvider'; import { BABEL_PLUGIN_TELEMETRY } from '../../constants'; @@ -65,6 +64,16 @@ export class DdBabelInteractionTracking { return DdBabelInteractionTracking.instance; } + static getTelemetryConfig() { + return { + babel_plugin: { + enabled: !!globalThis.__DD_RN_BABEL_PLUGIN_ENABLED__, + track_interactions: !!DdBabelInteractionTracking.config + .trackInteractions + } + }; + } + private getTargetName(targetObject: TargetObject) { const { getContent, @@ -129,7 +138,7 @@ export class DdBabelInteractionTracking { if (!this.telemetrySent) { DdSdk?.sendTelemetryLog( BABEL_PLUGIN_TELEMETRY, - getBabelTelemetryConfig(), + DdBabelInteractionTracking.getTelemetryConfig(), { onlyOnce: true } ); diff --git a/packages/core/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx b/packages/core/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx index 122f80a56..03fe98262 100644 --- a/packages/core/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx +++ b/packages/core/src/rum/instrumentation/interactionTracking/DdRumUserInteractionTracking.tsx @@ -10,9 +10,9 @@ import { InternalLog } from '../../../InternalLog'; import { SdkVerbosity } from '../../../SdkVerbosity'; import { DdSdk } from '../../../sdk/DdSdk'; import { getErrorMessage } from '../../../utils/errorUtils'; -import { getBabelTelemetryConfig } from '../../../utils/telemetry'; import { BABEL_PLUGIN_TELEMETRY } from '../../constants'; +import { DdBabelInteractionTracking } from './DdBabelInteractionTracking'; import type { DdEventsInterceptorOptions } from './DdEventsInterceptor'; import { DdEventsInterceptor } from './DdEventsInterceptor'; import type { EventsInterceptor } from './EventsInterceptor'; @@ -74,7 +74,7 @@ export class DdRumUserInteractionTracking { DdSdk?.sendTelemetryLog( BABEL_PLUGIN_TELEMETRY, - getBabelTelemetryConfig(), + DdBabelInteractionTracking.getTelemetryConfig(), { onlyOnce: true } ); diff --git a/packages/core/src/utils/telemetry.ts b/packages/core/src/utils/telemetry.ts deleted file mode 100644 index 745fb1a3b..000000000 --- a/packages/core/src/utils/telemetry.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. - * This product includes software developed at Datadog (https://www.datadoghq.com/). - * Copyright 2016-Present Datadog, Inc. - */ - -import { DdBabelInteractionTracking } from '../rum/instrumentation/interactionTracking/DdBabelInteractionTracking'; - -export const getBabelTelemetryConfig = () => { - return { - babel_plugin: { - enabled: !!globalThis.__DD_RN_BABEL_PLUGIN_ENABLED__, - track_interactions: !!DdBabelInteractionTracking.config - .trackInteractions - } - }; -};