Merge pull request #824 from DataDog/marcosaia/dev/fix-ios-issue

[FIX] iOS: Fix build error on new architecture

Author: marco-saia-datadog

packages/core/ios/Sources/DdSdk.h

@@ -5,22 +5,23 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <React/RCTEventEmitter.h>
+
 @class DdSdkImplementation;
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import <DdSdkReactNative/DdSdkReactNative.h>
-@interface DdSdk: NSObject <NativeDdSdkSpec>
+@interface DdSdk : RCTEventEmitter <NativeDdSdkSpec>
 
 #else
 
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
 @interface DdSdk : RCTEventEmitter <RCTBridgeModule>
 
 #endif
 
-@property (nonatomic, strong) DdSdkImplementation* ddSdkImplementation;
+@property(nonatomic, strong) DdSdkImplementation *ddSdkImplementation;
 
 + (void)initFromNative;
 

packages/core/src/rum/DdRum.ts

@@ -3,9 +3,8 @@
  * This product includes software developed at Datadog (https://www.datadoghq.com/).
  * Copyright 2016-Present Datadog, Inc.
  */
-
 import type { GestureResponderEvent } from 'react-native';
-import { NativeEventEmitter, NativeModules } from 'react-native';
+import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
 
 import { InternalLog } from '../InternalLog';
 import { SdkVerbosity } from '../SdkVerbosity';
@@ -42,7 +41,10 @@ import type {
 
 const generateEmptyPromise = () => new Promise<void>(resolve => resolve());
 
-const nativeEventEmitter = new NativeEventEmitter(NativeModules.DdSdk);
+const nativeEventEmitter =
+    Platform.OS === 'android'
+        ? new NativeEventEmitter()
+        : new NativeEventEmitter(NativeModules.DdSdk);
 
 class DdRumWrapper implements DdRumType {
     // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires

packages/core/src/specs/NativeDdSdk.ts

@@ -62,6 +62,13 @@ export interface Spec extends TurboModule {
      * Clears all data that has not already been sent to Datadog servers
      */
     clearAllData(): Promise<void>;
+
+    /**
+     * Required definitions, because of:
+     * https://github.com/react-native-community/RNNewArchitectureLibraries/tree/feat/swift-event-emitter?tab=readme-ov-file#codegen-update-codegen-specs)
+     */
+    addListener: (eventType: string) => void;
+    removeListeners: (count: number) => void;
 }
 
 // eslint-disable-next-line import/no-default-export