From bb5050ecb91a9b50d4ce52e19986c7c78641f24f Mon Sep 17 00:00:00 2001
From: Carlos Nogueira <carlos.nogueira@datadoghq.com>
Date: Mon, 15 Sep 2025 08:11:08 +0100
Subject: [PATCH] Fix babel auto instrumented actions

- Actions should now be interceptable by `actionEventMapper`
- Actions should now be buffered to account for delayed SDK
initialization
---
 packages/core/src/DdSdkReactNative.tsx        |  2 +
 .../DdBabelInteractionTracking.ts             | 45 ++++++++++++-------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/packages/core/src/DdSdkReactNative.tsx b/packages/core/src/DdSdkReactNative.tsx
index 209fc9501..aa7e2ec36 100644
--- a/packages/core/src/DdSdkReactNative.tsx
+++ b/packages/core/src/DdSdkReactNative.tsx
@@ -367,6 +367,8 @@ export class DdSdkReactNative {
                 trackInteractions: configuration.trackInteractions,
                 useAccessibilityLabel: configuration.useAccessibilityLabel
             };
+
+            DdBabelInteractionTracking.getInstance(DdRum);
         }
 
         if (DdSdkReactNative.wasAutoInstrumented) {
diff --git a/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts b/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts
index c14ef4b0b..0657378d2 100644
--- a/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts
+++ b/packages/core/src/rum/instrumentation/interactionTracking/DdBabelInteractionTracking.ts
@@ -4,12 +4,10 @@
  * Copyright 2016-Present Datadog, Inc.
  */
 
-import { InternalLog } from '../../../InternalLog';
-import { SdkVerbosity } from '../../../SdkVerbosity';
-import DdNativeRum from '../../../specs/NativeDdRum';
 import DdSdk from '../../../specs/NativeDdSdk';
 import { DefaultTimeProvider } from '../../../utils/time-provider/DefaultTimeProvider';
 import type { TimeProvider } from '../../../utils/time-provider/TimeProvider';
+import type { DdRum } from '../../DdRum';
 import { BABEL_PLUGIN_TELEMETRY } from '../../constants';
 import type { RumActionType } from '../../types';
 import { ActionSource } from '../../types';
@@ -46,19 +44,27 @@ export class DdBabelInteractionTracking {
 
     private telemetrySent: boolean = false;
 
+    private ddRum: typeof DdRum | null = null;
+
     isInitialized: boolean = false;
 
-    private constructor() {
+    private constructor(ddRum?: typeof DdRum) {
         if (DdBabelInteractionTracking.instance) {
             throw new Error(StateErrors.ALREADY_INITIALIZED);
         }
 
+        if (ddRum) {
+            this.ddRum = ddRum;
+        }
+
         DdBabelInteractionTracking.instance = this;
     }
 
-    static getInstance() {
+    static getInstance(ddRum?: typeof DdRum) {
         if (!DdBabelInteractionTracking.instance) {
-            DdBabelInteractionTracking.instance = new DdBabelInteractionTracking();
+            DdBabelInteractionTracking.instance = new DdBabelInteractionTracking(
+                ddRum
+            );
         }
 
         return DdBabelInteractionTracking.instance;
@@ -150,17 +156,22 @@ export class DdBabelInteractionTracking {
             const { trackInteractions } = DdBabelInteractionTracking.config;
 
             if (trackInteractions) {
-                InternalLog.log(
-                    `Adding RUM Action “${targetName}” (${action}, auto)`,
-                    SdkVerbosity.DEBUG
-                );
-
-                DdNativeRum?.addAction(
-                    action,
-                    targetName,
-                    { '__dd.action_source': ActionSource.BABEL },
-                    this.timeProvider.now()
-                );
+                this.ddRum
+                    ?.addAction(
+                        action,
+                        targetName,
+                        { '__dd.action_source': ActionSource.BABEL },
+                        this.timeProvider.now()
+                    )
+                    .catch(e => {
+                        if (e instanceof Error) {
+                            DdSdk?.telemetryError(
+                                e.message,
+                                e.stack || '',
+                                'BabelActionTrack'
+                            );
+                        }
+                    });
             }
 
             return result;