From 2f0f8900d9791f22d8925ae00573d5505288a119 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Tue, 29 Jul 2025 16:15:10 +0200 Subject: [PATCH 1/9] Modularized Logs and exposed .enable --- example/app.json | 2 +- example/ios/Podfile.lock | 106 +++++++++--------- example/src/ddUtils.tsx | 13 ++- .../datadog/reactnative/DatadogSDKWrapper.kt | 4 - .../com/datadog/reactnative/DatadogWrapper.kt | 9 -- .../reactnative/DdLogsImplementation.kt | 22 ++++ .../reactnative/DdSdkNativeInitialization.kt | 15 +-- .../kotlin/com/datadog/reactnative/DdLogs.kt | 9 ++ .../kotlin/com/datadog/reactnative/DdLogs.kt | 9 ++ .../core/ios/Sources/DatadogSDKWrapper.swift | 19 ++-- packages/core/ios/Sources/DdLogs.mm | 10 ++ .../ios/Sources/DdLogsImplementation.swift | 34 ++++-- .../Sources/DdSdkNativeInitialization.swift | 32 +++--- packages/core/src/DdSdkReactNative.tsx | 9 +- packages/core/src/logs/DdLogs.ts | 36 ++++++ packages/core/src/logs/types.ts | 6 + packages/core/src/specs/NativeDdLogs.ts | 6 + 17 files changed, 216 insertions(+), 125 deletions(-) diff --git a/example/app.json b/example/app.json index f0f0c83d7..70b08eb89 100644 --- a/example/app.json +++ b/example/app.json @@ -1,5 +1,5 @@ { "name": "DdSdkReactNativeExample", "displayName": "DD RN Sample", - "navigation": "react-native-navigation" + "navigation": "react-navigation" } diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 31b1ad3fd..6f781820b 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1993,9 +1993,9 @@ SPEC CHECKSUMS: DatadogInternal: f98c60cc5b44db688692e2b560ea273182cde022 DatadogLogs: c314b15a97bfc7e0728ea253d3638b0513032d88 DatadogRUM: 6ec371f477a1022fd5aad6ccb5407b85a04db399 - DatadogSDKReactNative: 6bcecc6492aa0cbbe77a4eea9ab2056ec53ad0d3 - DatadogSDKReactNativeSessionReplay: 89475adadb47b2e7f18f9f5f2a82793cc9471fcd - DatadogSDKReactNativeWebView: 5369bb452fb77e4a7de3efc8fb7307a5bf17c73e + DatadogSDKReactNative: 81f50b5238dcf7732ebca0151d4e6d5555121b1b + DatadogSDKReactNativeSessionReplay: 207aba83107a37ed08162790aa27a449a486addd + DatadogSDKReactNativeWebView: ac2d200b50ce67146a86ed84883667a4ab270d15 DatadogSessionReplay: 1f2f70afa2fc5870ce7304a02749f73529d3e6cb DatadogTrace: f0de55334db1630938ef980b5e054964652c4606 DatadogWebViewTracking: f637f0e36cf62b713cd6673690d94072e6223570 @@ -2008,69 +2008,69 @@ SPEC CHECKSUMS: HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352 OpenTelemetrySwiftApi: aaee576ed961e0c348af78df58b61300e95bd104 PLCrashReporter: db59ef96fa3d25f3650040d02ec2798cffee75f2 - RCT-Folly: 7b4f73a92ad9571b9dbdb05bb30fad927fa971e1 + RCT-Folly: ea9d9256ba7f9322ef911169a9f696e5857b9e17 RCTDeprecation: ebe712bb05077934b16c6bf25228bdec34b64f83 RCTRequired: ca91e5dd26b64f577b528044c962baf171c6b716 RCTTypeSafety: e7678bd60850ca5a41df9b8dc7154638cb66871f React: 4641770499c39f45d4e7cde1eba30e081f9d8a3d React-callinvoker: 4bef67b5c7f3f68db5929ab6a4d44b8a002998ea - React-Core: 0a06707a0b34982efc4a556aff5dae4b22863455 - React-CoreModules: 907334e94314189c2e5eed4877f3efe7b26d85b0 - React-cxxreact: 3a1d5e8f4faa5e09be26614e9c8bbcae8d11b73d + React-Core: a68cea3e762814e60ecc3fa521c7f14c36c99245 + React-CoreModules: d81b1eaf8066add66299bab9d23c9f00c9484c7c + React-cxxreact: 984f8b1feeca37181d4e95301fcd6f5f6501c6ab React-debug: 817160c07dc8d24d020fbd1eac7b3558ffc08964 - React-defaultsnativemodule: a965cb39fb0a79276ab611793d39f52e59a9a851 - React-domnativemodule: d647f94e503c62c44f54291334b1aa22a30fa08b - React-Fabric: 64586dc191fc1c170372a638b8e722e4f1d0a09b - React-FabricComponents: b0ebd032387468ea700574c581b139f57a7497fb - React-FabricImage: 81f0e0794caf25ad1224fa406d288fbc1986607f + React-defaultsnativemodule: 21f216e8db975897eb32b5f13247f5bbfaa97f41 + React-domnativemodule: 19270ad4b8d33312838d257f24731a0026809d49 + React-Fabric: f6dade7007533daeb785ba5925039d83f343be4b + React-FabricComponents: b0655cc3e1b5ae12a4a1119aa7d8308f0ad33520 + React-FabricImage: 9b157c4c01ac2bf433f834f0e1e5fe234113a576 React-featureflags: f2792b067a351d86fdc7bec23db3b9a2f2c8d26c - React-featureflagsnativemodule: 95a02d895475de8ace78fedd76143866838bb720 - React-graphics: cbebe910e4a15b65b0bff94a4d3ed278894d6386 - React-hermes: ec18c10f5a69d49fb9b5e17ae95494e9ea13d4d3 - React-idlecallbacksnativemodule: 0c1ae840cc5587197cd926a3cb76828ad059d116 - React-ImageManager: f2a4c01c2ccb2193e60a20c135da74c7ca4d36f2 - React-jserrorhandler: 61d205b5a7cbc57fed3371dd7eed48c97f49fc64 - React-jsi: 95f7676103137861b79b0f319467627bcfa629ee - React-jsiexecutor: 41e0fe87cda9ea3970ffb872ef10f1ff8dbd1932 - React-jsinspector: 15578208796723e5c6f39069b6e8bf36863ef6e2 - React-jsitracing: 3758cdb155ea7711f0e77952572ea62d90c69f0b - React-logger: dbca7bdfd4aa5ef69431362bde6b36d49403cb20 - React-Mapbuffer: 6efad4a606c1fae7e4a93385ee096681ef0300dc - React-microtasksnativemodule: 8732b71aa66045da4bb341ddee1bb539f71e5f38 - react-native-crash-tester: 3ffaa64141427ca362079cb53559fe9a532487ae - react-native-safe-area-context: 04803a01f39f31cc6605a5531280b477b48f8a88 - react-native-webview: 1e12de2fad74c17b4f8b1b53ebd1e3baa0148d71 + React-featureflagsnativemodule: 3a8731d8fd9f755be57e00d9fa8a7f92aa77e87d + React-graphics: 68969e4e49d73f89da7abef4116c9b5f466aa121 + React-hermes: ac0bcba26a5d288ebc99b500e1097da2d0297ddf + React-idlecallbacksnativemodule: 9a2c5b5c174c0c476f039bedc1b9497a8272133e + React-ImageManager: e906eec93a9eb6102a06576b89d48d80a4683020 + React-jserrorhandler: ac5dde01104ff444e043cad8f574ca02756e20d6 + React-jsi: 496fa2b9d63b726aeb07d0ac800064617d71211d + React-jsiexecutor: dd22ab48371b80f37a0a30d0e8915b6d0f43a893 + React-jsinspector: 4629ac376f5765e684d19064f2093e55c97fd086 + React-jsitracing: 7a1c9cd484248870cf660733cd3b8114d54c035f + React-logger: c4052eb941cca9a097ef01b59543a656dc088559 + React-Mapbuffer: 33546a3ebefbccb8770c33a1f8a5554fa96a54de + React-microtasksnativemodule: 5c3d795318c22ab8df55100e50b151384a4a60b3 + react-native-crash-tester: 48bde9d6f5256c61ef2e0c52dfc74256b26e55eb + react-native-safe-area-context: e134b241010ebe2aacdcea013565963d13826faa + react-native-webview: 2ea635bc43fd8a4b89de61133e8cc0607084e9f8 React-nativeconfig: 8efdb1ef1e9158c77098a93085438f7e7b463678 - React-NativeModulesApple: 958d4f6c5c2ace4c0f427cf7ef82e28ae6538a22 - React-perflogger: 9b4f13c0afe56bc7b4a0e93ec74b1150421ee22d - React-performancetimeline: 359db1cb889aa0282fafc5838331b0987c4915a9 + React-NativeModulesApple: cebca2e5320a3d66e123cade23bd90a167ffce5e + React-perflogger: 72e653eb3aba9122f9e57cf012d22d2486f33358 + React-performancetimeline: cd6a9374a72001165995d2ab632f672df04076dc React-RCTActionSheet: aacf2375084dea6e7c221f4a727e579f732ff342 - React-RCTAnimation: d8c82deebebe3aaf7a843affac1b57cb2dc073d4 - React-RCTAppDelegate: 6c0377d9c4058773ea7073bb34bb9ebd6ddf5a84 - React-RCTBlob: 70a58c11a6a3500d1a12f2e51ca4f6c99babcff8 - React-RCTFabric: 7eb6dd2c8fda98cb860a572e3f4e4eb60d62c89e - React-RCTImage: 5e9d655ba6a790c31e3176016f9b47fd0978fbf0 - React-RCTLinking: 2a48338252805091f7521eaf92687206401bdf2a - React-RCTNetwork: 0c1282b377257f6b1c81934f72d8a1d0c010e4c3 - React-RCTSettings: f757b679a74e5962be64ea08d7865a7debd67b40 - React-RCTText: e7d20c490b407d3b4a2daa48db4bcd8ec1032af2 - React-RCTVibration: 8228e37144ca3122a91f1de16ba8e0707159cfec + React-RCTAnimation: 395ab53fd064dff81507c15efb781c8684d9a585 + React-RCTAppDelegate: 1e5b43833e3e36e9fa34eec20be98174bc0e14a2 + React-RCTBlob: 13311e554c1a367de063c10ee7c5e6573b2dd1d6 + React-RCTFabric: bd906861a4e971e21d8df496c2d8f3ca6956f840 + React-RCTImage: 1b1f914bcc12187c49ba5d949dac38c2eb9f5cc8 + React-RCTLinking: 4ac7c42beb65e36fba0376f3498f3cd8dd0be7fa + React-RCTNetwork: 938902773add4381e84426a7aa17a2414f5f94f7 + React-RCTSettings: e848f1ba17a7a18479cf5a31d28145f567da8223 + React-RCTText: 7e98fafdde7d29e888b80f0b35544e0cb07913cf + React-RCTVibration: cd7d80affd97dc7afa62f9acd491419558b64b78 React-rendererconsistency: b4917053ecbaa91469c67a4319701c9dc0d40be6 - React-rendererdebug: 81becbc8852b38d9b1b68672aa504556481330d5 + React-rendererdebug: aa181c36dd6cf5b35511d1ed875d6638fd38f0ec React-rncore: 120d21715c9b4ba8f798bffe986cb769b988dd74 - React-RuntimeApple: 52ed0e9e84a7c2607a901149fb13599a3c057655 - React-RuntimeCore: ca6189d2e53d86db826e2673fe8af6571b8be157 + React-RuntimeApple: d033becbbd1eba6f9f6e3af6f1893030ce203edd + React-RuntimeCore: 38af280bb678e66ba000a3c3d42920b2a138eebb React-runtimeexecutor: 877596f82f5632d073e121cba2d2084b76a76899 - React-RuntimeHermes: 3b752dc5d8a1661c9d1687391d6d96acfa385549 - React-runtimescheduler: 8321bb09175ace2a4f0b3e3834637eb85bf42ebe + React-RuntimeHermes: 37aad735ff21ca6de2d8450a96de1afe9f86c385 + React-runtimescheduler: 8ec34cc885281a34696ea16c4fd86892d631f38d React-timing: 331cbf9f2668c67faddfd2e46bb7f41cbd9320b9 - React-utils: 54df9ada708578c8ad40d92895d6fed03e0e8a9e - ReactCodegen: 21a52ccddc6479448fc91903a437dd23ddc7366c - ReactCommon: bfd3600989d79bc3acbe7704161b171a1480b9fd - ReactNativeNavigation: 50c1eef68b821e7265eff3a391d27ed18fdce459 - RNCAsyncStorage: 23e56519cc41d3bade3c8d4479f7760cb1c11996 - RNGestureHandler: 950dfa674dbf481460ca389c65b9036ac4ab8ada - RNScreens: 606ab1cf68162f7ba0d049a31f2a84089a6fffb4 + React-utils: ed818f19ab445000d6b5c4efa9d462449326cc9f + ReactCodegen: f853a20cc9125c5521c8766b4b49375fec20648b + ReactCommon: 300d8d9c5cb1a6cd79a67cf5d8f91e4d477195f9 + ReactNativeNavigation: 445f86273eb245d15b14023ee4ef9d6e4f891ad6 + RNCAsyncStorage: b44e8a4e798c3e1f56bffccd0f591f674fb9198f + RNGestureHandler: cb711d56ee3b03a5adea1d38324d4459ab55653f + RNScreens: f75b26fd4777848c216e27b0a09e1bf9c9f4760a SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Yoga: feb4910aba9742cfedc059e2b2902e22ffe9954a diff --git a/example/src/ddUtils.tsx b/example/src/ddUtils.tsx index 2cd64d477..3e1956a8c 100644 --- a/example/src/ddUtils.tsx +++ b/example/src/ddUtils.tsx @@ -28,11 +28,14 @@ export function getDatadogConfig(trackingConsent: TrackingConsent) { return config } - export function onDatadogInitialization() { - DdLogs.info('The RN Sdk was properly initialized') - DdSdkReactNative.setUserInfo({id: "1337", name: "Xavier", email: "xg@example.com", extraInfo: { type: "premium" } }) - DdSdkReactNative.setAttributes({campaign: "ad-network"}) -} + export async function onDatadogInitialization() { + + console.log("Datadog SDK was initialized, initializing Logs..."); + await DdLogs.enable({}); + DdLogs.debug('DDLogs was initialized'); + DdSdkReactNative.setUserInfo({id: "w00t", name: "Sergio", email: "modular@sdk.com", extraInfo: { type: "premium" } }) + await DdLogs.enable({}); + DdLogs.debug('DDLogs was initialized again');} // Legacy SDK Setup export function initializeDatadog(trackingConsent: TrackingConsent) { diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt index 7452c40ef..c55102bc1 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt @@ -116,10 +116,6 @@ internal class DatadogSDKWrapper : DatadogWrapper { Rum.enable(configuration, DatadogSDKWrapperStorage.getSdkCore()) } - override fun enableLogs(configuration: LogsConfiguration) { - Logs.enable(configuration, DatadogSDKWrapperStorage.getSdkCore()) - } - override fun enableTrace(configuration: TraceConfiguration) { Trace.enable(configuration, DatadogSDKWrapperStorage.getSdkCore()) } diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt index 41e86f4d5..5348b8272 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogWrapper.kt @@ -73,15 +73,6 @@ interface DatadogWrapper { configuration: RumConfiguration ) - /** - * Enables the Logs feature of the SDK. - * - * @param configuration the configuration for the Logs feature - */ - fun enableLogs( - configuration: LogsConfiguration - ) - /** * Enables the Trace feature of the SDK. * diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt index 7223a2c72..410c8d644 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt @@ -8,6 +8,8 @@ package com.datadog.reactnative import android.util.Log as AndroidLog import com.datadog.android.log.Logger +import com.datadog.android.log.Logs +import com.datadog.android.log.LogsConfiguration import com.facebook.react.bridge.Promise import com.facebook.react.bridge.ReadableMap @@ -30,6 +32,17 @@ class DdLogsImplementation( .build() } + /** + * Enables DdLogs + * @param configuration The logs configuration. + */ + fun enable(configuration: ReadableMap, promise: Promise) { + val ddSdkConfiguration = configuration.asDdSdkConfiguration() + val logsConfiguration = buildLogsConfiguration(ddSdkConfiguration) + + Logs.enable(logsConfiguration, DatadogSDKWrapperStorage.getSdkCore()) + } + /** * Send a log with Debug level. * @param message The message to send. @@ -226,6 +239,15 @@ class DdLogsImplementation( promise.resolve(null) } + private fun buildLogsConfiguration(configuration: DdSdkConfiguration): LogsConfiguration { + val configBuilder = LogsConfiguration.Builder() + configuration.customEndpoints?.logs?.let { + configBuilder.useCustomEndpoint(it) + } + + return configBuilder.build() + } + companion object { private const val SDK_NOT_INITIALIZED_MESSAGE = "DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT" internal const val NAME = "DdLogs" diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt index 67450add7..50efeabe6 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt @@ -42,7 +42,6 @@ class DdSdkNativeInitialization internal constructor( internal fun initialize(ddSdkConfiguration: DdSdkConfiguration) { val sdkConfiguration = buildSdkConfiguration(ddSdkConfiguration) val rumConfiguration = buildRumConfiguration(ddSdkConfiguration) - val logsConfiguration = buildLogsConfiguration(ddSdkConfiguration) val traceConfiguration = buildTraceConfiguration(ddSdkConfiguration) val trackingConsent = buildTrackingConsent(ddSdkConfiguration.trackingConsent) @@ -63,7 +62,8 @@ class DdSdkNativeInitialization internal constructor( datadog.enableTrace(traceConfiguration) - datadog.enableLogs(logsConfiguration) + // REMOVED FOR TEST + // datadog.enableLogs(logsConfiguration) } private fun configureRumAndTracesForLogs(configuration: DdSdkConfiguration) { @@ -223,15 +223,6 @@ class DdSdkNativeInitialization internal constructor( return configBuilder.build() } - private fun buildLogsConfiguration(configuration: DdSdkConfiguration): LogsConfiguration { - val configBuilder = LogsConfiguration.Builder() - configuration.customEndpoints?.logs?.let { - configBuilder.useCustomEndpoint(it) - } - - return configBuilder.build() - } - private fun buildTraceConfiguration(configuration: DdSdkConfiguration): TraceConfiguration { val configBuilder = TraceConfiguration.Builder() configuration.customEndpoints?.trace?.let { @@ -241,7 +232,7 @@ class DdSdkNativeInitialization internal constructor( return configBuilder.build() } - private fun buildSdkConfiguration(configuration: DdSdkConfiguration): Configuration { + fun buildSdkConfiguration(configuration: DdSdkConfiguration): Configuration { val configBuilder = Configuration.Builder( clientToken = configuration.clientToken, env = configuration.env, diff --git a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt b/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt index a9408e227..e8a601b8d 100644 --- a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt +++ b/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt @@ -23,6 +23,15 @@ class DdLogs( override fun getName(): String = DdLogsImplementation.NAME + /** + * Enables DdLogs + * @param configuration The logs configuration. + */ + @ReactMethod + override fun enable(configuration: ReadableMap, promise: Promise) { + implementation.enable(configuration, promise) + } + /** * Send a log with Debug level. * @param message The message to send. diff --git a/packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt b/packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt index cc3ee410d..7ada3f38b 100644 --- a/packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt +++ b/packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt @@ -24,6 +24,15 @@ class DdLogs( override fun getName(): String = DdLogsImplementation.NAME + /** + * Enables DdLogs + * @param configuration The logs configuration. + */ + @ReactMethod + fun enable(configuration: ReadableMap, promise: Promise) { + implementation.enable(configuration, promise) + } + /** * Send a log with Debug level. * @param message The message to send. diff --git a/packages/core/ios/Sources/DatadogSDKWrapper.swift b/packages/core/ios/Sources/DatadogSDKWrapper.swift index 842ee5d89..adb7fff8d 100644 --- a/packages/core/ios/Sources/DatadogSDKWrapper.swift +++ b/packages/core/ios/Sources/DatadogSDKWrapper.swift @@ -23,7 +23,7 @@ public class DatadogSDKWrapper { // Initialization callbacks internal var onCoreInitializedListeners: [OnCoreInitializedListener] = [] - internal var loggerConfiguration = DatadogLogs.Logger.Configuration() + // Core instance private var coreInstance: DatadogCoreProtocol? = nil @@ -42,11 +42,15 @@ public class DatadogSDKWrapper { public func getCoreInstance() -> DatadogCoreProtocol? { return coreInstance } + + public func getCoreInstanceOrDefault() -> DatadogCoreProtocol { + return getCoreInstance() ?? CoreRegistry.default + } // SDK Wrapper internal func initialize( coreConfiguration: Datadog.Configuration, - loggerConfiguration: DatadogLogs.Logger.Configuration, +// loggerConfiguration: DatadogLogs.Logger.Configuration, trackingConsent: TrackingConsent ) -> Void { let core = Datadog.initialize(with: coreConfiguration, trackingConsent: trackingConsent) @@ -55,7 +59,7 @@ public class DatadogSDKWrapper { listener(core) } - self.loggerConfiguration = loggerConfiguration +// self.loggerConfiguration = loggerConfiguration } internal func isInitialized() -> Bool { @@ -102,15 +106,6 @@ public class DatadogSDKWrapper { consolePrint("Core instance was not found when initializing CrashReporting.", .critical) } } - - internal func createLogger() -> LoggerProtocol { - let core = coreInstance ?? { - consolePrint("Core instance was not found when creating Logger.", .critical) - return CoreRegistry.default - }() - - return DatadogLogs.Logger.create(with: loggerConfiguration, in: core) - } // Telemetry internal func sendTelemetryLog(message: String, attributes: [String: any Encodable], config: [String: any Encodable]) { diff --git a/packages/core/ios/Sources/DdLogs.mm b/packages/core/ios/Sources/DdLogs.mm index 6cc530d8d..a83fdf567 100644 --- a/packages/core/ios/Sources/DdLogs.mm +++ b/packages/core/ios/Sources/DdLogs.mm @@ -16,6 +16,13 @@ @implementation DdLogs RCT_EXPORT_MODULE() +RCT_REMAP_METHOD(enable, withConfiguration:(NSDictionary*)configuration + withResolver:(RCTPromiseResolveBlock)resolve + withRejecter:(RCTPromiseRejectBlock)reject) +{ + [self enable:configuration resolve:resolve reject:reject]; +} + RCT_REMAP_METHOD(debug, withDebugMessage:(NSString*)message withContext:(NSDictionary*)context withResolver:(RCTPromiseResolveBlock)resolve @@ -117,6 +124,9 @@ - (dispatch_queue_t)methodQueue { return [RNQueue getSharedQueue]; } +- (void)enable:(NSDictionary *)configuration resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { + [self.ddLogsImplementation enableWithConfiguration:configuration resolve:resolve reject:reject]; +} - (void)debug:(NSString *)message context:(NSDictionary *)context resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { [self.ddLogsImplementation debugWithMessage:message context:context resolve:resolve reject:reject]; diff --git a/packages/core/ios/Sources/DdLogsImplementation.swift b/packages/core/ios/Sources/DdLogsImplementation.swift index 264a3d0b3..7b14b2118 100644 --- a/packages/core/ios/Sources/DdLogsImplementation.swift +++ b/packages/core/ios/Sources/DdLogsImplementation.swift @@ -10,17 +10,16 @@ import DatadogLogs @objc public class DdLogsImplementation: NSObject { private lazy var logger: LoggerProtocol = loggerProvider() - private let loggerProvider: () -> LoggerProtocol - private let isSDKInitialized: () -> Bool + private lazy var loggerProvider: () -> LoggerProtocol = { self.createLogger() }; + private lazy var isSDKInitialized: () -> Bool = { DatadogSDKWrapper.shared.isInitialized() }; + private lazy var loggerConfiguration = DatadogLogs.Logger.Configuration() - internal init(_ loggerProvider: @escaping () -> LoggerProtocol, _ isSDKInitialized: @escaping () -> Bool) { - self.loggerProvider = loggerProvider - self.isSDKInitialized = isSDKInitialized - } - @objc - public override convenience init() { - self.init({ DatadogSDKWrapper.shared.createLogger() }, { DatadogSDKWrapper.shared.isInitialized() }) + public func enable(configuration: NSDictionary, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void { + let logsConfiguration = configuration.asDdSdkConfiguration() + let logsConfig = buildLogsConfiguration(configuration: logsConfiguration) + DatadogSDKWrapper.shared.enableLogs(with: logsConfig) + resolve(nil) } @objc @@ -110,6 +109,23 @@ public class DdLogsImplementation: NSObject { logger._internal.log(level: .error, message: message, errorKind: errorKind, errorMessage: errorMessage, stackTrace: stacktrace, attributes: attributes) resolve(nil) } + + internal func buildLogsConfiguration(configuration: DdSdkConfiguration) -> Logs.Configuration { + var customLogsEndpointURL: URL? = nil + if let customLogsEndpoint = configuration.customEndpoints?.logs as? NSString { + if (customLogsEndpoint != "") { + customLogsEndpointURL = URL(string: "\(customLogsEndpoint)/api/v2/logs" as String) + } + } + + return Logs.Configuration(customEndpoint: customLogsEndpointURL) + } + + internal func createLogger() -> LoggerProtocol { + let core = DatadogSDKWrapper.shared.getCoreInstanceOrDefault() + return DatadogLogs.Logger.create(with: loggerConfiguration, in: core) + } + } internal extension DatadogLogs.Logger.Configuration { diff --git a/packages/core/ios/Sources/DdSdkNativeInitialization.swift b/packages/core/ios/Sources/DdSdkNativeInitialization.swift index d68d89d06..814dcb9da 100644 --- a/packages/core/ios/Sources/DdSdkNativeInitialization.swift +++ b/packages/core/ios/Sources/DdSdkNativeInitialization.swift @@ -7,7 +7,8 @@ import Foundation import DatadogCore import DatadogRUM -import DatadogLogs +// REMOVED FOR TEST +//import DatadogLogs import DatadogTrace import DatadogCrashReporting import DatadogWebViewTracking @@ -49,7 +50,7 @@ public class DdSdkNativeInitialization: NSObject { let coreConfiguration = self.buildSDKConfiguration(configuration: sdkConfiguration) DatadogSDKWrapper.shared.initialize( coreConfiguration: coreConfiguration, - loggerConfiguration: DatadogLogs.Logger.Configuration(sdkConfiguration), +// loggerConfiguration: DatadogLogs.Logger.Configuration(sdkConfiguration), trackingConsent: sdkConfiguration.trackingConsent ) @@ -80,8 +81,9 @@ public class DdSdkNativeInitialization: NSObject { let rumConfig = buildRUMConfiguration(configuration: sdkConfiguration) DatadogSDKWrapper.shared.enableRUM(with: rumConfig) - let logsConfig = buildLogsConfiguration(configuration: sdkConfiguration) - DatadogSDKWrapper.shared.enableLogs(with: logsConfig) +// REMOVED FOR TEST +// let logsConfig = buildLogsConfiguration(configuration: sdkConfiguration) +// DatadogSDKWrapper.shared.enableLogs(with: logsConfig) let traceConfig = buildTraceConfiguration(configuration: sdkConfiguration) DatadogSDKWrapper.shared.enableTrace(with: traceConfig) @@ -192,17 +194,17 @@ public class DdSdkNativeInitialization: NSObject { telemetrySampleRate: (configuration.telemetrySampleRate as? NSNumber)?.floatValue ?? Float(DefaultConfiguration.telemetrySampleRate) ) } - - func buildLogsConfiguration(configuration: DdSdkConfiguration) -> Logs.Configuration { - var customLogsEndpointURL: URL? = nil - if let customLogsEndpoint = configuration.customEndpoints?.logs as? NSString { - if (customLogsEndpoint != "") { - customLogsEndpointURL = URL(string: "\(customLogsEndpoint)/api/v2/logs" as String) - } - } - - return Logs.Configuration(customEndpoint: customLogsEndpointURL) - } +// REMOVED FOR TEST +// func buildLogsConfiguration(configuration: DdSdkConfiguration) -> Logs.Configuration { +// var customLogsEndpointURL: URL? = nil +// if let customLogsEndpoint = configuration.customEndpoints?.logs as? NSString { +// if (customLogsEndpoint != "") { +// customLogsEndpointURL = URL(string: "\(customLogsEndpoint)/api/v2/logs" as String) +// } +// } +// +// return Logs.Configuration(customEndpoint: customLogsEndpointURL) +// } func buildTraceConfiguration(configuration: DdSdkConfiguration) -> Trace.Configuration { diff --git a/packages/core/src/DdSdkReactNative.tsx b/packages/core/src/DdSdkReactNative.tsx index 6969d2c5c..0cd1f5670 100644 --- a/packages/core/src/DdSdkReactNative.tsx +++ b/packages/core/src/DdSdkReactNative.tsx @@ -24,7 +24,6 @@ import type { import { InternalLog } from './InternalLog'; import { SdkVerbosity } from './SdkVerbosity'; import type { TrackingConsent } from './TrackingConsent'; -import { DdLogs } from './logs/DdLogs'; import { DdRum } from './rum/DdRum'; import { DdRumErrorTracking } from './rum/instrumentation/DdRumErrorTracking'; import { DdRumUserInteractionTracking } from './rum/instrumentation/interactionTracking/DdRumUserInteractionTracking'; @@ -388,10 +387,10 @@ export class DdSdkReactNative { if (configuration.trackErrors) { DdRumErrorTracking.startTracking(); } - - if (configuration.logEventMapper) { - DdLogs.registerLogEventMapper(configuration.logEventMapper); - } + // REMOVED FOR TEST + // if (configuration.logEventMapper) { + // DdLogs.registerLogEventMapper(configuration.logEventMapper); + // } if (configuration.errorEventMapper) { DdRum.registerErrorEventMapper(configuration.errorEventMapper); diff --git a/packages/core/src/logs/DdLogs.ts b/packages/core/src/logs/DdLogs.ts index 9ac35fa73..52700df18 100644 --- a/packages/core/src/logs/DdLogs.ts +++ b/packages/core/src/logs/DdLogs.ts @@ -4,6 +4,7 @@ * Copyright 2016-Present Datadog, Inc. */ +import type { AutoInstrumentationParameters } from '../DdSdkReactNativeConfiguration'; import { DATADOG_MESSAGE_PREFIX, InternalLog } from '../InternalLog'; import { SdkVerbosity } from '../SdkVerbosity'; import type { DdNativeLogsType } from '../nativeModulesTypes'; @@ -46,8 +47,25 @@ class DdLogsWrapper implements DdLogsType { private nativeLogs: DdNativeLogsType = require('../specs/NativeDdLogs') .default; private logEventMapper = generateEventMapper(undefined); + private isEnabled = false; + + enable = (configuration: AutoInstrumentationParameters): Promise => { + console.log('DDLOGS ENABLE', configuration); + if (configuration.logEventMapper) { + DdLogs.registerLogEventMapper(configuration.logEventMapper); + } + + this.isEnabled = true; + return this.nativeLogs.enable(configuration); + }; debug = (...args: LogArguments | LogWithErrorArguments): Promise => { + if (!this.isEnabled) { + console.log( + 'DdLogs is not enabled yet. Please call enable() before sending any logs.' + ); + return Promise.resolve(undefined); + } if (isLogWithError(args)) { return this.logWithError( args[0], @@ -63,6 +81,12 @@ class DdLogsWrapper implements DdLogsType { }; info = (...args: LogArguments | LogWithErrorArguments): Promise => { + if (!this.isEnabled) { + console.log( + 'DdLogs is not enabled yet. Please call enable() before sending any logs.' + ); + return Promise.resolve(undefined); + } if (isLogWithError(args)) { return this.logWithError( args[0], @@ -78,6 +102,12 @@ class DdLogsWrapper implements DdLogsType { }; warn = (...args: LogArguments | LogWithErrorArguments): Promise => { + if (!this.isEnabled) { + console.log( + 'DdLogs is not enabled yet. Please call enable() before sending any logs.' + ); + return Promise.resolve(undefined); + } if (isLogWithError(args)) { return this.logWithError( args[0], @@ -93,6 +123,12 @@ class DdLogsWrapper implements DdLogsType { }; error = (...args: LogArguments | LogWithErrorArguments): Promise => { + if (!this.isEnabled) { + console.log( + 'DdLogs is not enabled yet. Please call enable() before sending any logs.' + ); + return Promise.resolve(undefined); + } if (isLogWithError(args)) { return this.logWithError( args[0], diff --git a/packages/core/src/logs/types.ts b/packages/core/src/logs/types.ts index 9c1b3cb09..6d0d84ce9 100644 --- a/packages/core/src/logs/types.ts +++ b/packages/core/src/logs/types.ts @@ -11,6 +11,12 @@ import type { UserInfo } from '../sdk/UserInfoSingleton/types'; * The entry point to use Datadog's Logs feature. */ export type DdLogsType = { + /** + * Enables Logs + * @param configuration: Logs configuration + */ + enable(configuration: object): Promise; + /** * Send a log with debug level. * @param message: The message to send. diff --git a/packages/core/src/specs/NativeDdLogs.ts b/packages/core/src/specs/NativeDdLogs.ts index f1a60f4c7..c12027121 100644 --- a/packages/core/src/specs/NativeDdLogs.ts +++ b/packages/core/src/specs/NativeDdLogs.ts @@ -14,6 +14,12 @@ import { TurboModuleRegistry } from 'react-native'; export interface Spec extends TurboModule { readonly getConstants: () => {}; + /** + * Enables Logs + * @param configuration: Logs configuration + */ + readonly enable: (configuration: Object) => Promise; + /** * Send a log with DEBUG level. * @param message: The message to send. From f958bfdd3be888e04e418ba39438a9ff712a2f17 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Wed, 30 Jul 2025 11:35:31 +0200 Subject: [PATCH 2/9] Got Android working --- example/src/screens/MainScreen.tsx | 1 - .../com/datadog/reactnative/DdLogsImplementation.kt | 13 ++++++++----- .../datadog/reactnative/DdSdkConfigurationExt.kt | 1 + packages/core/ios/Sources/DatadogSDKWrapper.swift | 4 ---- .../core/ios/Sources/DdLogsImplementation.swift | 5 ++++- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/example/src/screens/MainScreen.tsx b/example/src/screens/MainScreen.tsx index 7f0fbdec2..0f44e8315 100644 --- a/example/src/screens/MainScreen.tsx +++ b/example/src/screens/MainScreen.tsx @@ -94,7 +94,6 @@ export default class MainScreen extends Component { componentDidMount() { this.updateTrackingConsent() - DdLogs.debug("[DATADOG SDK] Test React Native Debug Log"); } updateTrackingConsent() { diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt index 410c8d644..e88664b72 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt @@ -6,6 +6,7 @@ package com.datadog.reactnative +import com.datadog.android.Datadog import android.util.Log as AndroidLog import com.datadog.android.log.Logger import com.datadog.android.log.Logs @@ -24,7 +25,7 @@ class DdLogsImplementation( val bundleLogsWithRum = datadog.bundleLogsWithRum val bundleLogsWithTraces = datadog.bundleLogsWithTraces - logger ?: Logger.Builder(DatadogSDKWrapperStorage.getSdkCore()) + logger ?: Logger.Builder(Datadog.getInstance()) .setLogcatLogsEnabled(true) .setBundleWithRumEnabled(bundleLogsWithRum) .setBundleWithTraceEnabled(bundleLogsWithTraces) @@ -37,10 +38,11 @@ class DdLogsImplementation( * @param configuration The logs configuration. */ fun enable(configuration: ReadableMap, promise: Promise) { - val ddSdkConfiguration = configuration.asDdSdkConfiguration() - val logsConfiguration = buildLogsConfiguration(ddSdkConfiguration) + val logsConfiguration = buildLogsConfiguration(configuration) Logs.enable(logsConfiguration, DatadogSDKWrapperStorage.getSdkCore()) + + promise.resolve(null) } /** @@ -239,9 +241,10 @@ class DdLogsImplementation( promise.resolve(null) } - private fun buildLogsConfiguration(configuration: DdSdkConfiguration): LogsConfiguration { + private fun buildLogsConfiguration(configuration: ReadableMap): LogsConfiguration { val configBuilder = LogsConfiguration.Builder() - configuration.customEndpoints?.logs?.let { + val customEndpoints = configuration.getMap("customEndpoints")?.asCustomEndpoints() + customEndpoints?.logs?.let { configBuilder.useCustomEndpoint(it) } diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt index bcffdbbf5..e6d6c16bb 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt @@ -9,6 +9,7 @@ package com.datadog.reactnative import android.util.Log +import com.datadog.android.log.LogsConfiguration import com.datadog.android.trace.TracingHeaderType import com.facebook.react.bridge.ReadableArray import com.facebook.react.bridge.ReadableMap diff --git a/packages/core/ios/Sources/DatadogSDKWrapper.swift b/packages/core/ios/Sources/DatadogSDKWrapper.swift index adb7fff8d..fdd13d320 100644 --- a/packages/core/ios/Sources/DatadogSDKWrapper.swift +++ b/packages/core/ios/Sources/DatadogSDKWrapper.swift @@ -42,10 +42,6 @@ public class DatadogSDKWrapper { public func getCoreInstance() -> DatadogCoreProtocol? { return coreInstance } - - public func getCoreInstanceOrDefault() -> DatadogCoreProtocol { - return getCoreInstance() ?? CoreRegistry.default - } // SDK Wrapper internal func initialize( diff --git a/packages/core/ios/Sources/DdLogsImplementation.swift b/packages/core/ios/Sources/DdLogsImplementation.swift index 7b14b2118..d23084b27 100644 --- a/packages/core/ios/Sources/DdLogsImplementation.swift +++ b/packages/core/ios/Sources/DdLogsImplementation.swift @@ -6,6 +6,8 @@ import Foundation import DatadogLogs +import DatadogCore +import DatadogInternal @objc public class DdLogsImplementation: NSObject { @@ -122,7 +124,8 @@ public class DdLogsImplementation: NSObject { } internal func createLogger() -> LoggerProtocol { - let core = DatadogSDKWrapper.shared.getCoreInstanceOrDefault() +// let core = DatadogSDKWrapper.shared.getCoreInstanceOrDefault() + let core = Datadog.sdkInstance(named: CoreRegistry.defaultInstanceName) return DatadogLogs.Logger.create(with: loggerConfiguration, in: core) } From 206a8e757ab6c926c1dae16b290b06b2e571a4ca Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Fri, 1 Aug 2025 09:11:07 +0200 Subject: [PATCH 3/9] Multiple calls to enable with different config test --- example-new-architecture/ios/Podfile.lock | 88 +++++++++++------------ example/src/ddUtils.tsx | 16 ++++- 2 files changed, 58 insertions(+), 46 deletions(-) diff --git a/example-new-architecture/ios/Podfile.lock b/example-new-architecture/ios/Podfile.lock index ef249f90a..d14cdc7b3 100644 --- a/example-new-architecture/ios/Podfile.lock +++ b/example-new-architecture/ios/Podfile.lock @@ -1855,7 +1855,7 @@ SPEC CHECKSUMS: DatadogInternal: f98c60cc5b44db688692e2b560ea273182cde022 DatadogLogs: c314b15a97bfc7e0728ea253d3638b0513032d88 DatadogRUM: 6ec371f477a1022fd5aad6ccb5407b85a04db399 - DatadogSDKReactNative: 43f2893d67c3e667792f4ba5ca30411acac12cb5 + DatadogSDKReactNative: 227832d8d4c9af1cb0325f594758e813753c35f0 DatadogTrace: f0de55334db1630938ef980b5e054964652c4606 DatadogWebViewTracking: f637f0e36cf62b713cd6673690d94072e6223570 DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385 @@ -1866,62 +1866,62 @@ SPEC CHECKSUMS: hermes-engine: 9e868dc7be781364296d6ee2f56d0c1a9ef0bb11 OpenTelemetrySwiftApi: aaee576ed961e0c348af78df58b61300e95bd104 PLCrashReporter: db59ef96fa3d25f3650040d02ec2798cffee75f2 - RCT-Folly: 7b4f73a92ad9571b9dbdb05bb30fad927fa971e1 + RCT-Folly: ea9d9256ba7f9322ef911169a9f696e5857b9e17 RCTDeprecation: ebe712bb05077934b16c6bf25228bdec34b64f83 RCTRequired: ca91e5dd26b64f577b528044c962baf171c6b716 RCTTypeSafety: e7678bd60850ca5a41df9b8dc7154638cb66871f React: 4641770499c39f45d4e7cde1eba30e081f9d8a3d React-callinvoker: 4bef67b5c7f3f68db5929ab6a4d44b8a002998ea - React-Core: 0a06707a0b34982efc4a556aff5dae4b22863455 - React-CoreModules: 907334e94314189c2e5eed4877f3efe7b26d85b0 - React-cxxreact: 3a1d5e8f4faa5e09be26614e9c8bbcae8d11b73d + React-Core: a68cea3e762814e60ecc3fa521c7f14c36c99245 + React-CoreModules: d81b1eaf8066add66299bab9d23c9f00c9484c7c + React-cxxreact: 984f8b1feeca37181d4e95301fcd6f5f6501c6ab React-debug: 817160c07dc8d24d020fbd1eac7b3558ffc08964 - React-defaultsnativemodule: 814830ccbc3fb08d67d0190e63b179ee4098c67b - React-domnativemodule: 270acf94bd0960b026bc3bfb327e703665d27fb4 - React-Fabric: 64586dc191fc1c170372a638b8e722e4f1d0a09b - React-FabricComponents: b0ebd032387468ea700574c581b139f57a7497fb - React-FabricImage: 81f0e0794caf25ad1224fa406d288fbc1986607f + React-defaultsnativemodule: 18a684542f82ce1897552a1c4b847be414c9566e + React-domnativemodule: 90bdd4ec3ab38c47cfc3461c1e9283a8507d613f + React-Fabric: f6dade7007533daeb785ba5925039d83f343be4b + React-FabricComponents: b0655cc3e1b5ae12a4a1119aa7d8308f0ad33520 + React-FabricImage: 9b157c4c01ac2bf433f834f0e1e5fe234113a576 React-featureflags: f2792b067a351d86fdc7bec23db3b9a2f2c8d26c - React-featureflagsnativemodule: 0d7091ae344d6160c0557048e127897654a5c00f - React-graphics: cbebe910e4a15b65b0bff94a4d3ed278894d6386 - React-hermes: ec18c10f5a69d49fb9b5e17ae95494e9ea13d4d3 - React-idlecallbacksnativemodule: 6b84add48971da9c40403bd1860d4896462590f2 - React-ImageManager: f2a4c01c2ccb2193e60a20c135da74c7ca4d36f2 - React-jserrorhandler: 61d205b5a7cbc57fed3371dd7eed48c97f49fc64 - React-jsi: 95f7676103137861b79b0f319467627bcfa629ee - React-jsiexecutor: 41e0fe87cda9ea3970ffb872ef10f1ff8dbd1932 - React-jsinspector: 15578208796723e5c6f39069b6e8bf36863ef6e2 - React-jsitracing: 3758cdb155ea7711f0e77952572ea62d90c69f0b - React-logger: dbca7bdfd4aa5ef69431362bde6b36d49403cb20 - React-Mapbuffer: 6efad4a606c1fae7e4a93385ee096681ef0300dc - React-microtasksnativemodule: a645237a841d733861c70b69908ab4a1707b52ad + React-featureflagsnativemodule: 742a8325b3c821d2a1ca13a6d2a0fc72d04555e0 + React-graphics: 68969e4e49d73f89da7abef4116c9b5f466aa121 + React-hermes: ac0bcba26a5d288ebc99b500e1097da2d0297ddf + React-idlecallbacksnativemodule: d61d9c9816131bf70d3d80cd04889fc625ee523f + React-ImageManager: e906eec93a9eb6102a06576b89d48d80a4683020 + React-jserrorhandler: ac5dde01104ff444e043cad8f574ca02756e20d6 + React-jsi: 496fa2b9d63b726aeb07d0ac800064617d71211d + React-jsiexecutor: dd22ab48371b80f37a0a30d0e8915b6d0f43a893 + React-jsinspector: 4629ac376f5765e684d19064f2093e55c97fd086 + React-jsitracing: 7a1c9cd484248870cf660733cd3b8114d54c035f + React-logger: c4052eb941cca9a097ef01b59543a656dc088559 + React-Mapbuffer: 33546a3ebefbccb8770c33a1f8a5554fa96a54de + React-microtasksnativemodule: d80ff86c8902872d397d9622f1a97aadcc12cead React-nativeconfig: 8efdb1ef1e9158c77098a93085438f7e7b463678 - React-NativeModulesApple: 958d4f6c5c2ace4c0f427cf7ef82e28ae6538a22 - React-perflogger: 9b4f13c0afe56bc7b4a0e93ec74b1150421ee22d - React-performancetimeline: 359db1cb889aa0282fafc5838331b0987c4915a9 + React-NativeModulesApple: cebca2e5320a3d66e123cade23bd90a167ffce5e + React-perflogger: 72e653eb3aba9122f9e57cf012d22d2486f33358 + React-performancetimeline: cd6a9374a72001165995d2ab632f672df04076dc React-RCTActionSheet: aacf2375084dea6e7c221f4a727e579f732ff342 - React-RCTAnimation: d8c82deebebe3aaf7a843affac1b57cb2dc073d4 - React-RCTAppDelegate: 1774aa421a29a41a704ecaf789811ef73c4634b6 - React-RCTBlob: 70a58c11a6a3500d1a12f2e51ca4f6c99babcff8 - React-RCTFabric: 731cda82aed592aacce2d32ead69d78cde5d9274 - React-RCTImage: 5e9d655ba6a790c31e3176016f9b47fd0978fbf0 - React-RCTLinking: 2a48338252805091f7521eaf92687206401bdf2a - React-RCTNetwork: 0c1282b377257f6b1c81934f72d8a1d0c010e4c3 - React-RCTSettings: f757b679a74e5962be64ea08d7865a7debd67b40 - React-RCTText: e7d20c490b407d3b4a2daa48db4bcd8ec1032af2 - React-RCTVibration: 8228e37144ca3122a91f1de16ba8e0707159cfec + React-RCTAnimation: 395ab53fd064dff81507c15efb781c8684d9a585 + React-RCTAppDelegate: 345a6f1b82abc578437df0ce7e9c48740eca827c + React-RCTBlob: 13311e554c1a367de063c10ee7c5e6573b2dd1d6 + React-RCTFabric: 007b1a98201cc49b5bc6e1417d7fe3f6fc6e2b78 + React-RCTImage: 1b1f914bcc12187c49ba5d949dac38c2eb9f5cc8 + React-RCTLinking: 4ac7c42beb65e36fba0376f3498f3cd8dd0be7fa + React-RCTNetwork: 938902773add4381e84426a7aa17a2414f5f94f7 + React-RCTSettings: e848f1ba17a7a18479cf5a31d28145f567da8223 + React-RCTText: 7e98fafdde7d29e888b80f0b35544e0cb07913cf + React-RCTVibration: cd7d80affd97dc7afa62f9acd491419558b64b78 React-rendererconsistency: b4917053ecbaa91469c67a4319701c9dc0d40be6 - React-rendererdebug: 81becbc8852b38d9b1b68672aa504556481330d5 + React-rendererdebug: aa181c36dd6cf5b35511d1ed875d6638fd38f0ec React-rncore: 120d21715c9b4ba8f798bffe986cb769b988dd74 - React-RuntimeApple: 52ed0e9e84a7c2607a901149fb13599a3c057655 - React-RuntimeCore: ca6189d2e53d86db826e2673fe8af6571b8be157 + React-RuntimeApple: d033becbbd1eba6f9f6e3af6f1893030ce203edd + React-RuntimeCore: 38af280bb678e66ba000a3c3d42920b2a138eebb React-runtimeexecutor: 877596f82f5632d073e121cba2d2084b76a76899 - React-RuntimeHermes: 3b752dc5d8a1661c9d1687391d6d96acfa385549 - React-runtimescheduler: 8321bb09175ace2a4f0b3e3834637eb85bf42ebe + React-RuntimeHermes: 37aad735ff21ca6de2d8450a96de1afe9f86c385 + React-runtimescheduler: 8ec34cc885281a34696ea16c4fd86892d631f38d React-timing: 331cbf9f2668c67faddfd2e46bb7f41cbd9320b9 - React-utils: 54df9ada708578c8ad40d92895d6fed03e0e8a9e - ReactCodegen: 21a52ccddc6479448fc91903a437dd23ddc7366c - ReactCommon: bfd3600989d79bc3acbe7704161b171a1480b9fd + React-utils: ed818f19ab445000d6b5c4efa9d462449326cc9f + ReactCodegen: f853a20cc9125c5521c8766b4b49375fec20648b + ReactCommon: 300d8d9c5cb1a6cd79a67cf5d8f91e4d477195f9 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Yoga: feb4910aba9742cfedc059e2b2902e22ffe9954a diff --git a/example/src/ddUtils.tsx b/example/src/ddUtils.tsx index 3e1956a8c..10c9ecbd8 100644 --- a/example/src/ddUtils.tsx +++ b/example/src/ddUtils.tsx @@ -34,8 +34,20 @@ export function getDatadogConfig(trackingConsent: TrackingConsent) { await DdLogs.enable({}); DdLogs.debug('DDLogs was initialized'); DdSdkReactNative.setUserInfo({id: "w00t", name: "Sergio", email: "modular@sdk.com", extraInfo: { type: "premium" } }) - await DdLogs.enable({}); - DdLogs.debug('DDLogs was initialized again');} + setTimeout(async () => { + await DdLogs.enable({ + customEndpoints: { + logs: "custom.endpoint" + } + }); + DdLogs.debug('DDLogs was initialized again with a custom endpoint'); + + setTimeout(async () => { + await DdLogs.enable({}); + DdLogs.debug('DDLogs was initialized for the third time'); + }, 20000); + }, 20000); +} // Legacy SDK Setup export function initializeDatadog(trackingConsent: TrackingConsent) { From e3d2ebc77e23267aa401e593e1b2c48d4f9d8986 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Mon, 4 Aug 2025 12:20:46 +0200 Subject: [PATCH 4/9] Got logs working as a standalone module --- example-new-architecture/App.tsx | 5 +- example-new-architecture/package.json | 1 + example/ios/Podfile.lock | 29 + example/package.json | 1 + example/src/ddUtils.tsx | 46 +- packages/core/ios/Sources/AnyEncodable.swift | 4 +- packages/core/ios/Sources/Attributes.swift | 4 +- .../core/ios/Sources/DatadogSDKWrapper.swift | 6 +- packages/core/ios/Sources/GlobalState.swift | 2 +- .../ios/Sources/RNDdSdkConfiguration.swift | 2 +- .../src/DdSdkReactNativeConfiguration.tsx | 13 +- packages/core/src/index.tsx | 27 +- .../core/src/logs/__tests__/DdLogs.test.ts | 1032 ----------------- .../src/logs/__tests__/eventMapper.test.ts | 124 -- packages/core/src/nativeModulesTypes.ts | 4 +- .../instrumentation/DdRumErrorTracking.tsx | 53 +- .../logs/DatadogSDKReactNativeLogs.podspec | 64 + packages/logs/babel.config.js | 3 + .../project.pbxproj | 272 +++++ .../contents.xcworkspacedata | 4 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../ios/Sources/DatadogSDKReactNativeLogs.h | 8 + packages/{core => logs}/ios/Sources/DdLogs.h | 2 +- packages/{core => logs}/ios/Sources/DdLogs.mm | 15 +- .../ios/Sources/DdLogsImplementation.swift | 1 + packages/logs/package.json | 97 ++ .../{core/src/logs => logs/src}/DdLogs.ts | 22 +- .../src/logs => logs/src}/eventMapper.ts | 24 +- packages/logs/src/index.tsx | 8 + .../{core => logs}/src/specs/NativeDdLogs.ts | 0 packages/{core/src/logs => logs/src}/types.ts | 3 +- packages/logs/tsconfig.json | 3 + yarn.lock | 28 + 33 files changed, 668 insertions(+), 1247 deletions(-) delete mode 100644 packages/core/src/logs/__tests__/DdLogs.test.ts delete mode 100644 packages/core/src/logs/__tests__/eventMapper.test.ts create mode 100644 packages/logs/DatadogSDKReactNativeLogs.podspec create mode 100644 packages/logs/babel.config.js create mode 100644 packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.pbxproj create mode 100644 packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 packages/logs/ios/Sources/DatadogSDKReactNativeLogs.h rename packages/{core => logs}/ios/Sources/DdLogs.h (91%) rename packages/{core => logs}/ios/Sources/DdLogs.mm (96%) rename packages/{core => logs}/ios/Sources/DdLogsImplementation.swift (99%) create mode 100644 packages/logs/package.json rename packages/{core/src/logs => logs/src}/DdLogs.ts (94%) rename packages/{core/src/logs => logs/src}/eventMapper.ts (70%) create mode 100644 packages/logs/src/index.tsx rename packages/{core => logs}/src/specs/NativeDdLogs.ts (100%) rename packages/{core/src/logs => logs/src}/types.ts (96%) create mode 100644 packages/logs/tsconfig.json diff --git a/example-new-architecture/App.tsx b/example-new-architecture/App.tsx index e830aa345..be541f17b 100644 --- a/example-new-architecture/App.tsx +++ b/example-new-architecture/App.tsx @@ -6,9 +6,12 @@ import { DdSdkReactNative, DdRum, RumActionType, - DdLogs, DdTrace, } from '@datadog/mobile-react-native'; + +import { + DdLogs +} from '@datadog/mobile-react-native-logs'; import React from 'react'; import type {PropsWithChildren} from 'react'; import { diff --git a/example-new-architecture/package.json b/example-new-architecture/package.json index 92f2a7640..a3495bc12 100644 --- a/example-new-architecture/package.json +++ b/example-new-architecture/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@datadog/mobile-react-native": "workspace:packages/core", + "@datadog/mobile-react-native-logs": "workspace:packages/logs", "react": "18.3.1", "react-native": "0.76.9" }, diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 6f781820b..b4ffd256e 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -26,6 +26,31 @@ PODS: - DatadogTrace (= 2.29.0) - DatadogWebViewTracking (= 2.29.0) - React-Core + - DatadogSDKReactNativeLogs (2.10.1): + - DatadogCore (= 2.29.0) + - DatadogInternal (= 2.29.0) + - DatadogLogs (= 2.29.0) + - DatadogSDKReactNative + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.10.14.00) + - RCTRequired + - RCTTypeSafety + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - DatadogSDKReactNativeSessionReplay (2.10.1): - DatadogSDKReactNative - DatadogSessionReplay (= 2.29.0) @@ -1743,6 +1768,7 @@ DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - DatadogSDKReactNative (from `../../packages/core/DatadogSDKReactNative.podspec`) - DatadogSDKReactNative/Tests (from `../../packages/core/DatadogSDKReactNative.podspec`) + - "DatadogSDKReactNativeLogs (from `../node_modules/@datadog/mobile-react-native-logs`)" - DatadogSDKReactNativeSessionReplay (from `../../packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec`) - DatadogSDKReactNativeSessionReplay/Tests (from `../../packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec`) - DatadogSDKReactNativeWebView (from `../../packages/react-native-webview/DatadogSDKReactNativeWebView.podspec`) @@ -1840,6 +1866,8 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" DatadogSDKReactNative: :path: "../../packages/core/DatadogSDKReactNative.podspec" + DatadogSDKReactNativeLogs: + :path: "../node_modules/@datadog/mobile-react-native-logs" DatadogSDKReactNativeSessionReplay: :path: "../../packages/react-native-session-replay/DatadogSDKReactNativeSessionReplay.podspec" DatadogSDKReactNativeWebView: @@ -1994,6 +2022,7 @@ SPEC CHECKSUMS: DatadogLogs: c314b15a97bfc7e0728ea253d3638b0513032d88 DatadogRUM: 6ec371f477a1022fd5aad6ccb5407b85a04db399 DatadogSDKReactNative: 81f50b5238dcf7732ebca0151d4e6d5555121b1b + DatadogSDKReactNativeLogs: dc93be518d29cfa125a02f6308457ca464ca77f5 DatadogSDKReactNativeSessionReplay: 207aba83107a37ed08162790aa27a449a486addd DatadogSDKReactNativeWebView: ac2d200b50ce67146a86ed84883667a4ab270d15 DatadogSessionReplay: 1f2f70afa2fc5870ce7304a02749f73529d3e6cb diff --git a/example/package.json b/example/package.json index 8232a359f..403fdd095 100644 --- a/example/package.json +++ b/example/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@datadog/mobile-react-native": "workspace:packages/core", + "@datadog/mobile-react-native-logs": "workspace:packages/logs", "@datadog/mobile-react-native-navigation": "workspace:packages/react-native-navigation", "@datadog/mobile-react-native-session-replay": "workspace:packages/react-native-session-replay", "@datadog/mobile-react-native-webview": "workspace:packages/react-native-webview", diff --git a/example/src/ddUtils.tsx b/example/src/ddUtils.tsx index 10c9ecbd8..1029f0f48 100644 --- a/example/src/ddUtils.tsx +++ b/example/src/ddUtils.tsx @@ -1,12 +1,15 @@ import { DatadogProviderConfiguration, - DdLogs, DdSdkReactNative, DdSdkReactNativeConfiguration, SdkVerbosity, TrackingConsent } from '@datadog/mobile-react-native'; +import { + DdLogs, +} from '@datadog/mobile-react-native-logs'; + import {APPLICATION_ID, CLIENT_TOKEN, ENVIRONMENT} from './ddCredentials'; // New SDK Setup - not available for react-native-navigation @@ -30,23 +33,32 @@ export function getDatadogConfig(trackingConsent: TrackingConsent) { export async function onDatadogInitialization() { - console.log("Datadog SDK was initialized, initializing Logs..."); - await DdLogs.enable({}); - DdLogs.debug('DDLogs was initialized'); - DdSdkReactNative.setUserInfo({id: "w00t", name: "Sergio", email: "modular@sdk.com", extraInfo: { type: "premium" } }) - setTimeout(async () => { - await DdLogs.enable({ - customEndpoints: { - logs: "custom.endpoint" - } - }); - DdLogs.debug('DDLogs was initialized again with a custom endpoint'); - + try { + console.log("Datadog SDK was initialized, initializing Logs..."); + await DdLogs.enable({}); + console.log('DDLogs was initialized'); + DdLogs.debug('DDLogs was initialized'); + DdSdkReactNative.setUserInfo({id: "w00t", name: "Sergio", email: "modular@sdk.com", extraInfo: { type: "premium" } }) setTimeout(async () => { - await DdLogs.enable({}); - DdLogs.debug('DDLogs was initialized for the third time'); - }, 20000); - }, 20000); + console.log("Initialize ddlogs again"); + await DdLogs.enable({ + customEndpoints: { + logs: "custom.endpoint" + } + }); + console.log('DDLogs was initialized again with a custom endpoint'); + DdLogs.debug('DDLogs was initialized again with a custom endpoint'); + + setTimeout(async () => { + console.log("Initialize ddlogs for a third time"); + await DdLogs.enable({}); + console.log('DDLogs was initialized for the third time'); + DdLogs.debug('DDLogs was initialized for the third time'); + }, 5000); + }, 5000); + } catch (error) { + console.log("ERROR during init", error); + } } // Legacy SDK Setup diff --git a/packages/core/ios/Sources/AnyEncodable.swift b/packages/core/ios/Sources/AnyEncodable.swift index 39821af87..54ad37bd2 100644 --- a/packages/core/ios/Sources/AnyEncodable.swift +++ b/packages/core/ios/Sources/AnyEncodable.swift @@ -6,11 +6,11 @@ import Foundation -internal func castAttributesToSwift(_ attributes: NSDictionary) -> [String: Encodable] { +public func castAttributesToSwift(_ attributes: NSDictionary) -> [String: Encodable] { return castAttributesToSwift(attributes as? [String: Any] ?? [:]) } -internal func castAttributesToSwift(_ attributes: [String: Any]) -> [String: Encodable] { +public func castAttributesToSwift(_ attributes: [String: Any]) -> [String: Encodable] { var casted: [String: Encodable] = [:] attributes.forEach { key, value in diff --git a/packages/core/ios/Sources/Attributes.swift b/packages/core/ios/Sources/Attributes.swift index adf9638f5..8df2b557d 100644 --- a/packages/core/ios/Sources/Attributes.swift +++ b/packages/core/ios/Sources/Attributes.swift @@ -111,8 +111,8 @@ internal struct InternalConfigurationAttributes { } /// Error messages that can be thrown to the JS SDK -internal struct Errors { +public struct Errors { /// Error thrown when a log was sent before the SDK was initialized. /// Not sending the log prevent the logger to be set to a Noop logger. - static let logSentBeforeSDKInit = "DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT" + public static let logSentBeforeSDKInit = "DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT" } diff --git a/packages/core/ios/Sources/DatadogSDKWrapper.swift b/packages/core/ios/Sources/DatadogSDKWrapper.swift index fdd13d320..abb1aeb18 100644 --- a/packages/core/ios/Sources/DatadogSDKWrapper.swift +++ b/packages/core/ios/Sources/DatadogSDKWrapper.swift @@ -44,7 +44,7 @@ public class DatadogSDKWrapper { } // SDK Wrapper - internal func initialize( + func initialize( coreConfiguration: Datadog.Configuration, // loggerConfiguration: DatadogLogs.Logger.Configuration, trackingConsent: TrackingConsent @@ -58,7 +58,7 @@ public class DatadogSDKWrapper { // self.loggerConfiguration = loggerConfiguration } - internal func isInitialized() -> Bool { + public func isInitialized() -> Bool { return Datadog.isInitialized() } @@ -79,7 +79,7 @@ public class DatadogSDKWrapper { } } - internal func enableLogs(with configuration: Logs.Configuration) { + public func enableLogs(with configuration: Logs.Configuration) { if let core = coreInstance { Logs.enable(with: configuration, in: core) } else { diff --git a/packages/core/ios/Sources/GlobalState.swift b/packages/core/ios/Sources/GlobalState.swift index b932803a1..4c9bf129b 100644 --- a/packages/core/ios/Sources/GlobalState.swift +++ b/packages/core/ios/Sources/GlobalState.swift @@ -19,7 +19,7 @@ internal struct GlobalState { } } -internal extension Dictionary where Key == String, Value == Encodable { +public extension Dictionary where Key == String, Value == Encodable { func mergeWithGlobalAttributes() -> [String: Encodable] { // values of current attributes are more important than values of global attributes, // because they are coming with a current call diff --git a/packages/core/ios/Sources/RNDdSdkConfiguration.swift b/packages/core/ios/Sources/RNDdSdkConfiguration.swift index a765e9759..b6aa8e229 100644 --- a/packages/core/ios/Sources/RNDdSdkConfiguration.swift +++ b/packages/core/ios/Sources/RNDdSdkConfiguration.swift @@ -11,7 +11,7 @@ import Foundation extension NSDictionary { - func asDdSdkConfiguration() -> DdSdkConfiguration { + public func asDdSdkConfiguration() -> DdSdkConfiguration { let clientToken = object(forKey: "clientToken") as? String let env = object(forKey: "env") as? String let applicationId = object(forKey: "applicationId") as? String diff --git a/packages/core/src/DdSdkReactNativeConfiguration.tsx b/packages/core/src/DdSdkReactNativeConfiguration.tsx index 158d258eb..9246b4526 100644 --- a/packages/core/src/DdSdkReactNativeConfiguration.tsx +++ b/packages/core/src/DdSdkReactNativeConfiguration.tsx @@ -7,7 +7,6 @@ import type { ProxyConfiguration } from './ProxyConfiguration'; import type { SdkVerbosity } from './SdkVerbosity'; import { TrackingConsent } from './TrackingConsent'; -import type { LogEventMapper } from './logs/types'; import type { ActionEventMapper } from './rum/eventMappers/actionEventMapper'; import type { ErrorEventMapper } from './rum/eventMappers/errorEventMapper'; import type { ResourceEventMapper } from './rum/eventMappers/resourceEventMapper'; @@ -341,7 +340,9 @@ export class DdSdkReactNativeConfiguration { */ public actionNameAttribute?: string; - public logEventMapper: LogEventMapper | null = DEFAULTS.logEventMapper; + // THIS TYPE NEEDS TO COME FROM CORE + // public logEventMapper: LogEventMapper | null = DEFAULTS.logEventMapper; + public logEventMapper: any | null = DEFAULTS.logEventMapper; public errorEventMapper: ErrorEventMapper | null = DEFAULTS.errorEventMapper; @@ -380,7 +381,9 @@ export type AutoInstrumentationConfiguration = { readonly firstPartyHosts?: FirstPartyHostsConfiguration; readonly resourceTracingSamplingRate?: number; readonly trackErrors: boolean; - readonly logEventMapper?: LogEventMapper | null; + // THIS TYPE NEEDS TO COME FROM CORE + // readonly logEventMapper?: LogEventMapper | null; + readonly logEventMapper?: any | null; readonly errorEventMapper?: ErrorEventMapper | null; readonly resourceEventMapper?: ResourceEventMapper | null; readonly actionEventMapper?: ActionEventMapper | null; @@ -397,7 +400,9 @@ export type AutoInstrumentationParameters = { readonly firstPartyHosts: FirstPartyHostsConfiguration; readonly resourceTracingSamplingRate: number; readonly trackErrors: boolean; - readonly logEventMapper: LogEventMapper | null; + // THIS TYPE NEEDS TO COME FROM CORE + // readonly logEventMapper: LogEventMapper | null; + readonly logEventMapper: any | null; readonly errorEventMapper: ErrorEventMapper | null; readonly resourceEventMapper: ResourceEventMapper | null; readonly actionEventMapper: ActionEventMapper | null; diff --git a/packages/core/src/index.tsx b/packages/core/src/index.tsx index df6ef045e..269ac2948 100644 --- a/packages/core/src/index.tsx +++ b/packages/core/src/index.tsx @@ -14,14 +14,16 @@ import { } from './DdSdkReactNativeConfiguration'; import type { AutoInstrumentationConfiguration, - PartialInitializationConfiguration + PartialInitializationConfiguration, + AutoInstrumentationParameters } from './DdSdkReactNativeConfiguration'; import { DdSdkReactNative } from './DdSdkReactNative'; -import { InternalLog } from './InternalLog'; +import { InternalLog, DATADOG_MESSAGE_PREFIX } from './InternalLog'; import { ProxyConfiguration, ProxyType } from './ProxyConfiguration'; import { SdkVerbosity } from './SdkVerbosity'; import { TrackingConsent } from './TrackingConsent'; -import { DdLogs } from './logs/DdLogs'; +import { DdAttributes } from './rum/DdAttributes'; +// import { DdLogs } from './logs/DdLogs'; import { DdRum } from './rum/DdRum'; import { DatadogTracingContext } from './rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingContext'; import { DatadogTracingIdentifier } from './rum/instrumentation/resourceTracking/distributedTracing/DatadogTracingIdentifier'; @@ -36,20 +38,26 @@ import { } from './rum/instrumentation/resourceTracking/graphql/graphqlHeaders'; import { RumActionType, ErrorSource, PropagatorType } from './rum/types'; import type { FirstPartyHost } from './rum/types'; +import type { Attributes } from './sdk/AttributesSingleton/types'; import { DatadogProvider } from './sdk/DatadogProvider/DatadogProvider'; import { DdSdk } from './sdk/DdSdk'; +import { EventMapper } from './sdk/EventMappers/EventMapper'; +import type { AdditionalEventDataForMapper } from './sdk/EventMappers/EventMapper'; import { FileBasedConfiguration } from './sdk/FileBasedConfiguration/FileBasedConfiguration'; import { DdTrace } from './trace/DdTrace'; +import type { UserInfo } from './types'; +import { validateContext } from './utils/argsUtils'; import { DefaultTimeProvider } from './utils/time-provider/DefaultTimeProvider'; import { TimeProvider } from './utils/time-provider/TimeProvider'; import type { Timestamp } from './utils/time-provider/TimeProvider'; export { + EventMapper, DatadogProvider, DatadogProviderConfiguration, FileBasedConfiguration, InitializationMode, - DdLogs, + // DdLogs, DdTrace, DdRum, RumActionType, @@ -75,12 +83,19 @@ export { TracingIdType, TracingIdFormat, DatadogTracingIdentifier, - DatadogTracingContext + DatadogTracingContext, + DdAttributes, + validateContext, + DATADOG_MESSAGE_PREFIX }; export type { + AdditionalEventDataForMapper, + Attributes, + UserInfo, Timestamp, FirstPartyHost, AutoInstrumentationConfiguration, - PartialInitializationConfiguration + PartialInitializationConfiguration, + AutoInstrumentationParameters }; diff --git a/packages/core/src/logs/__tests__/DdLogs.test.ts b/packages/core/src/logs/__tests__/DdLogs.test.ts deleted file mode 100644 index f99280bfe..000000000 --- a/packages/core/src/logs/__tests__/DdLogs.test.ts +++ /dev/null @@ -1,1032 +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 { NativeModules } from 'react-native'; - -import { DdSdkReactNativeConfiguration } from '../../DdSdkReactNativeConfiguration'; -import { DdSdkReactNative } from '../../DdSdkReactNative'; -import { InternalLog } from '../../InternalLog'; -import { SdkVerbosity } from '../../SdkVerbosity'; -import type { DdNativeLogsType } from '../../nativeModulesTypes'; -import { ErrorSource } from '../../rum/types'; -import { DdLogs } from '../DdLogs'; -import type { LogEventMapper } from '../types'; - -jest.mock('../../InternalLog', () => { - return { - InternalLog: { - log: jest.fn() - }, - DATADOG_MESSAGE_PREFIX: 'DATADOG:' - }; -}); - -describe('DdLogs', () => { - describe('log event mapper', () => { - beforeEach(() => { - jest.clearAllMocks(); - DdLogs.unregisterLogEventMapper(); - }); - - it('registers event mapper and maps logs', async () => { - const logEventMapper: LogEventMapper = log => { - return { - message: 'new message', - context: { newContext: 'context' }, - status: 'info', - userInfo: {} - }; - }; - DdLogs.registerLogEventMapper(logEventMapper); - - await DdLogs.info('original message', {}); - expect( - NativeModules.DdLogs.info - ).toHaveBeenCalledWith('new message', { newContext: 'context' }); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - 'Tracking info log "new message"', - 'debug' - ); - - await DdLogs.debug( - 'original message', - 'TypeError', - 'error message', - 'stack', - {} - ); - expect(NativeModules.DdLogs.debugWithError).toHaveBeenCalledWith( - 'new message', - undefined, - undefined, - undefined, - { - newContext: 'context', - '_dd.error.source_type': 'react-native' - } - ); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 2, - 'Tracking debug log "new message"', - 'debug' - ); - }); - - it('registers event mapper and maps logs with errors', async () => { - const logEventMapper: LogEventMapper = log => { - log.message = 'new message'; - if (log.errorKind) { - log.errorKind = 'NewErrorType'; - } - if (log.errorMessage) { - log.errorMessage = 'new error message'; - } - if (log.stacktrace) { - log.stacktrace = 'new stacktrace'; - } - log.context = { newContext: 'context' }; - return log; - }; - DdLogs.registerLogEventMapper(logEventMapper); - - await DdLogs.info('original message', {}); - expect( - NativeModules.DdLogs.info - ).toHaveBeenCalledWith('new message', { newContext: 'context' }); - await DdLogs.info( - 'original message', - 'TypeError', - 'error message', - 'stack', - {} - ); - expect(NativeModules.DdLogs.infoWithError).toHaveBeenCalledWith( - 'new message', - 'NewErrorType', - 'new error message', - 'new stacktrace', - { - newContext: 'context', - '_dd.error.source_type': 'react-native' - } - ); - }); - - it('sends initial log if no event mapper is registered', async () => { - await DdLogs.info('original message', {}); - expect(NativeModules.DdLogs.info).toHaveBeenCalledWith( - 'original message', - {} - ); - }); - - it('drops the event if the mapper returns null', async () => { - const logEventMapper: LogEventMapper = log => { - return null; - }; - DdLogs.registerLogEventMapper(logEventMapper); - - await DdLogs.info('original message', {}); - expect(NativeModules.DdLogs.info).not.toHaveBeenCalled(); - expect(InternalLog.log).toHaveBeenCalledWith( - 'info log dropped by log mapper: "original message"', - 'debug' - ); - }); - - it('log with error events can be filtered by error source', async () => { - const logEventMapper: LogEventMapper = logEvent => { - if (logEvent.source === ErrorSource.CONSOLE) { - return null; - } - - return logEvent; - }; - - DdLogs.registerLogEventMapper(logEventMapper); - - await DdLogs.error( - 'message', - 'kind', - 'message', - 'stacktrace', - {}, - 'fingerprint', - ErrorSource.CONSOLE - ); - - // Call with filtered ErrorSource.CONSOLE type - expect(NativeModules.DdLogs.error).not.toHaveBeenCalled(); - expect(InternalLog.log).toHaveBeenCalledWith( - 'error log dropped by log mapper: "message"', - 'debug' - ); - - // Call with valid ErrorSource.CUSTOM type - await DdLogs.error( - 'message', - 'kind', - 'message', - 'stacktrace', - {}, - 'fingerprint', - ErrorSource.CUSTOM - ); - - expect(NativeModules.DdLogs.errorWithError).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { - '_dd.error.fingerprint': 'fingerprint', - '_dd.error.source_type': 'react-native' - } - ); - expect(InternalLog.log).toHaveBeenCalledWith( - 'Tracking error log "message"', - 'debug' - ); - }); - - it('console errors can be filtered with mappers when trackErrors=true', async () => { - // GIVEN - const fakeAppId = '1'; - const fakeClientToken = '2'; - const fakeEnvName = 'env'; - const configuration = new DdSdkReactNativeConfiguration( - fakeClientToken, - fakeEnvName, - fakeAppId, - false, - false, - true // Track Errors - ); - - // Register log event mapper to filter console log events - configuration.logEventMapper = logEvent => { - if (logEvent.source === ErrorSource.CONSOLE) { - return null; - } - - return logEvent; - }; - - NativeModules.DdSdk.initialize.mockResolvedValue(null); - - // WHEN - await DdSdkReactNative.initialize(configuration); - - console.error('console-error-message'); - expect(NativeModules.DdLogs.error).not.toHaveBeenCalled(); - expect(InternalLog.log).toHaveBeenCalledWith( - 'error log dropped by log mapper: "console-error-message"', - 'debug' - ); - - // Call with valid ErrorSource.CUSTOM type - await DdLogs.error( - 'message', - 'kind', - 'message', - 'stacktrace', - {}, - 'fingerprint', - ErrorSource.CUSTOM - ); - - expect(NativeModules.DdLogs.errorWithError).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { - '_dd.error.fingerprint': 'fingerprint', - '_dd.error.source_type': 'react-native' - } - ); - expect(InternalLog.log).toHaveBeenCalledWith( - 'Tracking error log "message"', - 'debug' - ); - }); - - it('console errors are reported in logs when trackErrors=true', async () => { - // GIVEN - const fakeAppId = '1'; - const fakeClientToken = '2'; - const fakeEnvName = 'env'; - const configuration = new DdSdkReactNativeConfiguration( - fakeClientToken, - fakeEnvName, - fakeAppId, - false, - false, - true // Track Errors - ); - - NativeModules.DdSdk.initialize.mockResolvedValue(null); - - // WHEN - await DdSdkReactNative.initialize(configuration); - - console.error('console-error-message'); - expect(NativeModules.DdLogs.error).not.toHaveBeenCalled(); - expect(InternalLog.log).toHaveBeenCalledWith( - 'Tracking error log "console-error-message"', - 'debug' - ); - }); - }); - - describe('log with error', () => { - beforeEach(() => { - jest.clearAllMocks(); - DdLogs.unregisterLogEventMapper(); - }); - it.each([ - ['kind', 'message', 'stacktrace', { context: 'value' }], - // 1 argument is undefined - [undefined, 'message', 'stacktrace', { context: 'value' }], - ['kind', undefined, 'stacktrace', { context: 'value' }], - ['kind', 'message', undefined, { context: 'value' }], - ['kind', 'message', 'stacktrace', undefined], - // 2 arguments are undefined - [undefined, undefined, 'stacktrace', { context: 'value' }], - [undefined, 'message', undefined, { context: 'value' }], - [undefined, 'message', 'stacktrace', undefined], - ['kind', undefined, undefined, { context: 'value' }], - ['kind', undefined, 'stacktrace', undefined], - ['kind', 'message', undefined, undefined], - // 3 arguments are undefined - [undefined, undefined, 'stacktrace', undefined], - [undefined, 'message', undefined, undefined], - ['kind', undefined, undefined, undefined], - [undefined, undefined, undefined, { context: 'value' }] - ])( - 'sends error info when provided for %s %s %s %s', - async (errorKind, errorMessage, stacktrace, context) => { - await DdLogs.info( - 'message', - errorKind, - errorMessage, - stacktrace, - context - ); - expect(NativeModules.DdLogs.infoWithError).toHaveBeenCalledWith( - 'message', - errorKind, - errorMessage, - stacktrace, - { - ...(context || {}), - '_dd.error.source_type': 'react-native' - } - ); - } - ); - - it.each([ - [ - 'kind', - 'message', - 'stacktrace', - { context: 'value' }, - 'custom-fingerprint-0' - ], - // 1 argument is undefined - [ - undefined, - 'message', - 'stacktrace', - { context: 'value' }, - 'custom-fingerprint-1' - ], - [ - 'kind', - undefined, - 'stacktrace', - { context: 'value' }, - 'custom-fingerprint-2' - ], - [ - 'kind', - 'message', - undefined, - { context: 'value' }, - 'custom-fingerprint-3' - ], - ['kind', 'message', 'stacktrace', undefined, 'custom-fingerprint'], - // 2 arguments are undefined - [ - undefined, - undefined, - 'stacktrace', - { context: 'value' }, - 'custom-fingerprint-4' - ], - [ - undefined, - 'message', - undefined, - { context: 'value' }, - 'custom-fingerprint-5' - ], - [ - undefined, - 'message', - 'stacktrace', - undefined, - 'custom-fingerprint-6' - ], - [ - 'kind', - undefined, - undefined, - { context: 'value' }, - 'custom-fingerprint-7' - ], - [ - 'kind', - undefined, - 'stacktrace', - undefined, - 'custom-fingerprint-8' - ], - ['kind', 'message', undefined, undefined, 'custom-fingerprint-9'], - // 3 arguments are undefined - [ - undefined, - undefined, - 'stacktrace', - undefined, - 'custom-fingerprint-10' - ], - [ - undefined, - 'message', - undefined, - undefined, - 'custom-fingerprint-11' - ], - ['kind', undefined, undefined, undefined, 'custom-fingerprint-12'], - [ - undefined, - undefined, - undefined, - { context: 'value' }, - 'custom-fingerprint-13' - ] - ])( - 'sends error info with custom fingerprint when provided for %s %s %s %s %s', - async ( - errorKind, - errorMessage, - stacktrace, - context, - fingerprint - ) => { - await DdLogs.info( - 'message', - errorKind, - errorMessage, - stacktrace, - context, - fingerprint - ); - expect(NativeModules.DdLogs.infoWithError).toHaveBeenCalledWith( - 'message', - errorKind, - errorMessage, - stacktrace, - { - ...(context || {}), - '_dd.error.source_type': 'react-native', - '_dd.error.fingerprint': fingerprint - } - ); - } - ); - - it('does not send error info when no error and no context is passed', async () => { - await DdLogs.info( - 'message', - undefined, - undefined, - undefined, - undefined - ); - expect(NativeModules.DdLogs.info).toHaveBeenCalledWith( - 'message', - {} - ); - }); - }); - - describe('when SDK is not initialized', () => { - beforeEach(() => { - jest.clearAllMocks(); - DdLogs.unregisterLogEventMapper(); - }); - - it('does not crash and warns user', async () => { - (NativeModules.DdLogs.info as jest.MockedFunction< - DdNativeLogsType['debug'] - >).mockRejectedValueOnce( - new Error('DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT') - ); - const consoleSpy = jest.spyOn(console, 'warn'); - await DdLogs.info('original message', {}); - expect(consoleSpy).toHaveBeenCalledWith( - 'DATADOG: Dropping info log as the SDK is not initialized yet: "original message"' - ); - }); - }); - - describe('log context', () => { - beforeEach(() => { - jest.clearAllMocks(); - DdLogs.unregisterLogEventMapper(); - }); - - describe('debug logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.debug('message', undefined); - expect(NativeModules.DdLogs.debug).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.debug('message', [1, 2, 3]); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - expect( - NativeModules.DdLogs.debug - ).toHaveBeenCalledWith('message', { context: [1, 2, 3] }); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.debug('message', obj); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - expect(NativeModules.DdLogs.debug).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.debug('message', { test: '123' }); - expect( - NativeModules.DdLogs.debug - ).toHaveBeenCalledWith('message', { test: '123' }); - }); - }); - - describe('warn logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.warn('message', undefined); - expect(NativeModules.DdLogs.warn).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.warn('message', [1, 2, 3]); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - expect( - NativeModules.DdLogs.warn - ).toHaveBeenCalledWith('message', { context: [1, 2, 3] }); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.warn('message', obj); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - expect(NativeModules.DdLogs.warn).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.warn('message', { test: '123' }); - expect( - NativeModules.DdLogs.warn - ).toHaveBeenCalledWith('message', { test: '123' }); - }); - }); - - describe('info logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.info('message', undefined); - expect(NativeModules.DdLogs.info).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.info('message', [1, 2, 3]); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - expect( - NativeModules.DdLogs.info - ).toHaveBeenCalledWith('message', { context: [1, 2, 3] }); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.info('message', obj); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - expect(NativeModules.DdLogs.info).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.info('message', { test: '123' }); - expect( - NativeModules.DdLogs.info - ).toHaveBeenCalledWith('message', { test: '123' }); - }); - }); - - describe('error logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.error('message', undefined); - expect(NativeModules.DdLogs.error).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.error('message', [1, 2, 3]); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - expect( - NativeModules.DdLogs.error - ).toHaveBeenCalledWith('message', { context: [1, 2, 3] }); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.error('message', obj); - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - expect(NativeModules.DdLogs.error).toHaveBeenCalledWith( - 'message', - {} - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.error('message', { test: '123' }); - expect( - NativeModules.DdLogs.error - ).toHaveBeenCalledWith('message', { test: '123' }); - }); - }); - }); - - describe('log with error context', () => { - beforeEach(() => { - jest.clearAllMocks(); - DdLogs.unregisterLogEventMapper(); - }); - - describe('debug logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.debug( - 'message', - 'kind', - 'message', - 'stacktrace', - undefined - ); - expect( - NativeModules.DdLogs.debugWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.debug('message', 'kind', 'message', 'stacktrace', [ - 1, - 2, - 3 - ]); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - - expect( - NativeModules.DdLogs.debugWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { - context: [1, 2, 3], - '_dd.error.source_type': 'react-native' - } - ); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.debug( - 'message', - 'kind', - 'message', - 'stacktrace', - obj - ); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - - expect( - NativeModules.DdLogs.debugWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.debug('message', 'kind', 'message', 'stacktrace', { - test: '123' - }); - expect( - NativeModules.DdLogs.debugWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { test: '123', '_dd.error.source_type': 'react-native' } - ); - }); - }); - - describe('warn logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.warn( - 'message', - 'kind', - 'message', - 'stacktrace', - undefined - ); - expect( - NativeModules.DdLogs.warnWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.warn('message', 'kind', 'message', 'stacktrace', [ - 1, - 2, - 3 - ]); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - - expect(NativeModules.DdLogs.warnWithError).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { - context: [1, 2, 3], - '_dd.error.source_type': 'react-native' - } - ); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.warn( - 'message', - 'kind', - 'message', - 'stacktrace', - obj - ); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - - expect( - NativeModules.DdLogs.warnWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.warn('message', 'kind', 'message', 'stacktrace', { - test: '123' - }); - expect( - NativeModules.DdLogs.warnWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { test: '123', '_dd.error.source_type': 'react-native' } - ); - }); - }); - - describe('info logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.info( - 'message', - 'kind', - 'message', - 'stacktrace', - undefined - ); - expect( - NativeModules.DdLogs.infoWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.info('message', 'kind', 'message', 'stacktrace', [ - 1, - 2, - 3 - ]); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - - expect(NativeModules.DdLogs.infoWithError).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { - context: [1, 2, 3], - '_dd.error.source_type': 'react-native' - } - ); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.info( - 'message', - 'kind', - 'message', - 'stacktrace', - obj - ); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - - expect( - NativeModules.DdLogs.infoWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.info('message', 'kind', 'message', 'stacktrace', { - test: '123' - }); - expect( - NativeModules.DdLogs.infoWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { test: '123', '_dd.error.source_type': 'react-native' } - ); - }); - }); - - describe('error logs', () => { - it('native context is empty W context is undefined', async () => { - await DdLogs.error( - 'message', - 'kind', - 'message', - 'stacktrace', - undefined - ); - expect( - NativeModules.DdLogs.errorWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is an object with nested property W context is an array', async () => { - await DdLogs.error('message', 'kind', 'message', 'stacktrace', [ - 1, - 2, - 3 - ]); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.WARN - ); - - expect( - NativeModules.DdLogs.errorWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { - context: [1, 2, 3], - '_dd.error.source_type': 'react-native' - } - ); - }); - - it('native context is empty W context is raw type', async () => { - const obj: any = 123; - await DdLogs.error( - 'message', - 'kind', - 'message', - 'stacktrace', - obj - ); - - expect(InternalLog.log).toHaveBeenNthCalledWith( - 1, - expect.anything(), - SdkVerbosity.ERROR - ); - - expect( - NativeModules.DdLogs.errorWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { '_dd.error.source_type': 'react-native' } - ); - }); - - it('native context is unmodified W context is a valid object', async () => { - await DdLogs.error('message', 'kind', 'message', 'stacktrace', { - test: '123' - }); - expect( - NativeModules.DdLogs.errorWithError - ).toHaveBeenCalledWith( - 'message', - 'kind', - 'message', - 'stacktrace', - { test: '123', '_dd.error.source_type': 'react-native' } - ); - }); - }); - }); -}); diff --git a/packages/core/src/logs/__tests__/eventMapper.test.ts b/packages/core/src/logs/__tests__/eventMapper.test.ts deleted file mode 100644 index 0999a6058..000000000 --- a/packages/core/src/logs/__tests__/eventMapper.test.ts +++ /dev/null @@ -1,124 +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. - */ - -/* eslint-disable @typescript-eslint/ban-ts-comment */ -import { ErrorSource } from '../../rum/types'; -import { formatRawLogToLogEvent } from '../eventMapper'; - -describe('formatRawLogToLogEvent', () => { - it('formats a raw log without context and userInfo to a LogEvent', () => { - expect( - formatRawLogToLogEvent( - { message: 'original', context: {}, status: 'info' }, - { userInfo: {}, attributes: {} } - ) - ).toEqual({ - message: 'original', - context: {}, - status: 'info', - userInfo: {}, - attributes: {} - }); - }); - - it('formats a raw log with context, userInfo and attributes to a LogEvent', () => { - expect( - formatRawLogToLogEvent( - { - message: 'original', - context: { loggedIn: true }, - status: 'info' - }, - { - userInfo: { - name: 'userName', - extraInfo: { loggedIn: true } - }, - attributes: { appType: 'student' } - } - ) - ).toEqual({ - message: 'original', - context: { loggedIn: true }, - status: 'info', - userInfo: { - name: 'userName', - extraInfo: { loggedIn: true } - }, - attributes: { appType: 'student' } - }); - }); - - it('formats a raw log with error attributes and with context, userInfo and attributes to a LogEvent', () => { - expect( - formatRawLogToLogEvent( - { - message: 'original', - errorKind: 'TypeError', - errorMessage: 'something went wrong', - stacktrace: 'stacktrace', - context: { loggedIn: true }, - status: 'info' - }, - { - userInfo: { - name: 'userName', - extraInfo: { loggedIn: true } - }, - attributes: { appType: 'student' } - } - ) - ).toEqual({ - message: 'original', - errorKind: 'TypeError', - errorMessage: 'something went wrong', - stacktrace: 'stacktrace', - context: { loggedIn: true }, - status: 'info', - userInfo: { - name: 'userName', - extraInfo: { loggedIn: true } - }, - attributes: { appType: 'student' } - }); - }); - - it('formats a raw log with error attributes and with context, userInfo, attributes and source to a LogEvent', () => { - expect( - formatRawLogToLogEvent( - { - message: 'original', - errorKind: 'TypeError', - errorMessage: 'something went wrong', - stacktrace: 'stacktrace', - context: { loggedIn: true }, - status: 'info', - source: ErrorSource.CONSOLE - }, - { - userInfo: { - name: 'userName', - extraInfo: { loggedIn: true } - }, - attributes: { appType: 'student' } - } - ) - ).toEqual({ - message: 'original', - errorKind: 'TypeError', - errorMessage: 'something went wrong', - stacktrace: 'stacktrace', - context: { loggedIn: true }, - status: 'info', - source: ErrorSource.CONSOLE, - userInfo: { - name: 'userName', - extraInfo: { loggedIn: true } - }, - attributes: { appType: 'student' } - }); - }); -}); diff --git a/packages/core/src/nativeModulesTypes.ts b/packages/core/src/nativeModulesTypes.ts index b05fb6e95..361bf227f 100644 --- a/packages/core/src/nativeModulesTypes.ts +++ b/packages/core/src/nativeModulesTypes.ts @@ -4,7 +4,7 @@ * Copyright 2016-Present Datadog, Inc. */ -import type { Spec as NativeDdLogs } from './specs/NativeDdLogs'; +// import type { Spec as NativeDdLogs } from './specs/NativeDdLogs'; import type { Spec as NativeDdRum } from './specs/NativeDdRum'; import type { Spec as NativeDdSdk } from './specs/NativeDdSdk'; import type { Spec as NativeDdTrace } from './specs/NativeDdTrace'; @@ -17,7 +17,7 @@ import type { Spec as NativeDdTrace } from './specs/NativeDdTrace'; /** * The entry point to use Datadog's Logs feature. */ -export type DdNativeLogsType = NativeDdLogs; +// export type DdNativeLogsType = NativeDdLogs; /** * The entry point to use Datadog's Trace feature. diff --git a/packages/core/src/rum/instrumentation/DdRumErrorTracking.tsx b/packages/core/src/rum/instrumentation/DdRumErrorTracking.tsx index 04b01290c..2ef77c4e2 100644 --- a/packages/core/src/rum/instrumentation/DdRumErrorTracking.tsx +++ b/packages/core/src/rum/instrumentation/DdRumErrorTracking.tsx @@ -8,7 +8,6 @@ import type { ErrorHandlerCallback } from 'react-native'; import { InternalLog } from '../../InternalLog'; import { SdkVerbosity } from '../../SdkVerbosity'; -import { DdLogs } from '../../logs/DdLogs'; import { getErrorMessage, getErrorStackTrace, @@ -142,28 +141,36 @@ export class DdRumErrorTracking { message: string, source: ErrorSource, stacktrace: string, - errorName: string, + // removed + _errorName: string, context: object = {} - ): Promise<[void, void]> => { - return Promise.all([ - DdRum.addError( - message, - source, - stacktrace, - getErrorContext(context) - ), - DdLogs.error( - message, - errorName, - message, - stacktrace, - { - ...context, - '_dd.error_log.is_crash': true - }, - undefined, - source - ) - ]); + ): Promise => { + return DdRum.addError( + message, + source, + stacktrace, + getErrorContext(context) + ); + // Direct use of DdLogs from RUM + // return Promise.all([ + // DdRum.addError( + // message, + // source, + // stacktrace, + // getErrorContext(context) + // ), + // DdLogs.error( + // message, + // errorName, + // message, + // stacktrace, + // { + // ...context, + // '_dd.error_log.is_crash': true + // }, + // undefined, + // source + // ) + // ]); }; } diff --git a/packages/logs/DatadogSDKReactNativeLogs.podspec b/packages/logs/DatadogSDKReactNativeLogs.podspec new file mode 100644 index 000000000..843e5685b --- /dev/null +++ b/packages/logs/DatadogSDKReactNativeLogs.podspec @@ -0,0 +1,64 @@ +require "json" + +package = JSON.parse(File.read(File.join(__dir__, "package.json"))) +folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' + +Pod::Spec.new do |s| + s.name = "DatadogSDKReactNativeLogs" + s.version = package["version"] + s.summary = package["description"] + s.homepage = package["homepage"] + s.license = package["license"] + s.authors = package["author"] + + s.platforms = { :ios => "12.0", :tvos => "12.0" } + s.source = { :git => "https://github.com/DataDog/dd-sdk-reactnative.git", :tag => "#{s.version}" } + + s.source_files = "ios/Sources/*.{h,m,mm,swift}" + + s.dependency "React-Core" + + # /!\ Remember to keep the version in sync with DatadogSDKReactNative.podspec + s.dependency 'DatadogLogs', '2.29.0' + s.dependency 'DatadogCore', '2.29.0' + s.dependency 'DatadogInternal', '2.29.0' + s.dependency 'DatadogSDKReactNative' + + s.test_spec 'Tests' do |test_spec| + test_spec.dependency "React-RCTText" + test_spec.source_files = 'ios/Tests/*.swift' + test_spec.platforms = { :ios => "13.4", :tvos => "13.4" } + end + + + xcconfig = { + "HEADER_SEARCH_PATHS" => "$(inherited) " + + "$(PODS_ROOT)/React-RCTFabric/** " + + "$(PODS_ROOT)/React-FabricComponents/** " + + "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_RCTFabric.framework/Headers/** " + + "$(PODS_CONFIGURATION_BUILD_DIR)/React-FabricComponents/React_FabricComponents.framework/Headers/**", + "USER_HEADER_SEARCH_PATHS" => "$(inherited) " + + "$(PODS_ROOT)/React-RCTFabric/** " + + "$(PODS_ROOT)/React-FabricComponents/** " + + "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_RCTFabric.framework/Headers/** " + + "$(PODS_CONFIGURATION_BUILD_DIR)/React-FabricComponents/React_FabricComponents.framework/Headers/**" + } + + if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then + s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1" + + xcconfig.merge!({ + "DEFINES_MODULE" => "YES", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" + }) + end + + s.pod_target_xcconfig = xcconfig + + if respond_to?(:install_modules_dependencies, true) + install_modules_dependencies(s) + # else + # s.dependency "React-Core" + end + +end diff --git a/packages/logs/babel.config.js b/packages/logs/babel.config.js new file mode 100644 index 000000000..990d54137 --- /dev/null +++ b/packages/logs/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['module:@react-native/babel-preset'] +}; diff --git a/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.pbxproj b/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.pbxproj new file mode 100644 index 000000000..c8de4526e --- /dev/null +++ b/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.pbxproj @@ -0,0 +1,272 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXCopyFilesBuildPhase section */ + 58B511D91A9E6C8500147676 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 134814201AA4EA6300B7C361 /* libDdSdkReactNativeLogs.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDdSdkReactNativeLogs.a; sourceTree = BUILT_PRODUCTS_DIR; }; + F625545A26A82D430033052D /* Sources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Sources; sourceTree = ""; }; + F625545B26A82D430033052D /* Tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Tests; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 58B511D81A9E6C8500147676 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 134814211AA4EA7D00B7C361 /* Products */ = { + isa = PBXGroup; + children = ( + 134814201AA4EA6300B7C361 /* libDdSdkReactNativeLogs.a */, + ); + name = Products; + sourceTree = ""; + }; + 58B511D21A9E6C8500147676 = { + isa = PBXGroup; + children = ( + F625545A26A82D430033052D /* Sources */, + F625545B26A82D430033052D /* Tests */, + 134814211AA4EA7D00B7C361 /* Products */, + ); + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 58B511DA1A9E6C8500147676 /* DdSdkReactNativeLogs */ = { + isa = PBXNativeTarget; + buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "DdSdkReactNativeLogs" */; + buildPhases = ( + 58B511D71A9E6C8500147676 /* Sources */, + 58B511D81A9E6C8500147676 /* Frameworks */, + 58B511D91A9E6C8500147676 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = DdSdkReactNativeLogs; + productName = RCTDataManager; + productReference = 134814201AA4EA6300B7C361 /* libDdSdkReactNativeLogs.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 58B511D31A9E6C8500147676 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0920; + ORGANIZATIONNAME = Facebook; + TargetAttributes = { + 58B511DA1A9E6C8500147676 = { + CreatedOnToolsVersion = 6.1.1; + }; + }; + }; + buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "DdSdkReactNativeLogs" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + English, + en, + ); + mainGroup = 58B511D21A9E6C8500147676; + productRefGroup = 58B511D21A9E6C8500147676; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 58B511DA1A9E6C8500147676 /* DdSdkReactNativeLogs */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 58B511D71A9E6C8500147676 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 58B511ED1A9E6C8500147676 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 58B511EE1A9E6C8500147676 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 58B511F01A9E6C8500147676 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../../React/**", + "$(SRCROOT)/../../react-native/React/**", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = DdSdkReactNativeLogs; + SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "DdSdkReactNativeLogs-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 58B511F11A9E6C8500147676 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../../React/**", + "$(SRCROOT)/../../react-native/React/**", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = DdSdkReactNativeLogs; + SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "DdSdkReactNativeLogs-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "DdSdkReactNativeLogs" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 58B511ED1A9E6C8500147676 /* Debug */, + 58B511EE1A9E6C8500147676 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "DdSdkReactNativeLogs" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 58B511F01A9E6C8500147676 /* Debug */, + 58B511F11A9E6C8500147676 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 58B511D31A9E6C8500147676 /* Project object */; +} diff --git a/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..94b2795e2 --- /dev/null +++ b/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,4 @@ + + + diff --git a/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/packages/logs/ios/DdSdkReactNativeLogs.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/packages/logs/ios/Sources/DatadogSDKReactNativeLogs.h b/packages/logs/ios/Sources/DatadogSDKReactNativeLogs.h new file mode 100644 index 000000000..3953fc4d2 --- /dev/null +++ b/packages/logs/ios/Sources/DatadogSDKReactNativeLogs.h @@ -0,0 +1,8 @@ +/* + * 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. + */ + +// This file is imported in the auto-generated DatadogSDKReactNativeLogs-Swift.h header file. +// Deleting it could result in iOS builds failing. diff --git a/packages/core/ios/Sources/DdLogs.h b/packages/logs/ios/Sources/DdLogs.h similarity index 91% rename from packages/core/ios/Sources/DdLogs.h rename to packages/logs/ios/Sources/DdLogs.h index 62db1ead2..e9e32ddda 100644 --- a/packages/core/ios/Sources/DdLogs.h +++ b/packages/logs/ios/Sources/DdLogs.h @@ -9,7 +9,7 @@ #ifdef RCT_NEW_ARCH_ENABLED -#import +#import @interface DdLogs: NSObject #else diff --git a/packages/core/ios/Sources/DdLogs.mm b/packages/logs/ios/Sources/DdLogs.mm similarity index 96% rename from packages/core/ios/Sources/DdLogs.mm rename to packages/logs/ios/Sources/DdLogs.mm index a83fdf567..efb0d2bce 100644 --- a/packages/core/ios/Sources/DdLogs.mm +++ b/packages/logs/ios/Sources/DdLogs.mm @@ -4,14 +4,13 @@ * Copyright 2016-Present Datadog, Inc. */ // Import this first to prevent require cycles -#if __has_include("DatadogSDKReactNative-Swift.h") -#import +#if __has_include("DatadogSDKReactNativeLogs-Swift.h") +#import #else -#import +#import #endif #import "DdLogs.h" - @implementation DdLogs RCT_EXPORT_MODULE() @@ -119,10 +118,10 @@ - (DdLogsImplementation*)ddLogsImplementation + (BOOL)requiresMainQueueSetup { return NO; } - -- (dispatch_queue_t)methodQueue { - return [RNQueue getSharedQueue]; -} +// +//- (dispatch_queue_t)methodQueue { +// return [RNQueue getSharedQueue]; +//} - (void)enable:(NSDictionary *)configuration resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { [self.ddLogsImplementation enableWithConfiguration:configuration resolve:resolve reject:reject]; diff --git a/packages/core/ios/Sources/DdLogsImplementation.swift b/packages/logs/ios/Sources/DdLogsImplementation.swift similarity index 99% rename from packages/core/ios/Sources/DdLogsImplementation.swift rename to packages/logs/ios/Sources/DdLogsImplementation.swift index d23084b27..11231dc4a 100644 --- a/packages/core/ios/Sources/DdLogsImplementation.swift +++ b/packages/logs/ios/Sources/DdLogsImplementation.swift @@ -8,6 +8,7 @@ import Foundation import DatadogLogs import DatadogCore import DatadogInternal +import DatadogSDKReactNative @objc public class DdLogsImplementation: NSObject { diff --git a/packages/logs/package.json b/packages/logs/package.json new file mode 100644 index 000000000..6ab6bf009 --- /dev/null +++ b/packages/logs/package.json @@ -0,0 +1,97 @@ +{ + "name": "@datadog/mobile-react-native-logs", + "version": "2.10.1", + "description": "A client-side React Native module to enable Log tracking with Datadog", + "keywords": [ + "datadog", + "react-native", + "ios", + "android" + ], + "author": "Datadog (https://github.com/DataDog)", + "homepage": "https://github.com/DataDog/dd-sdk-reactnative#readme", + "repository": "https://github.com/DataDog/dd-sdk-reactnative", + "bugs": { + "url": "https://github.com/DataDog/dd-sdk-reactnative/issues" + }, + "license": "Apache-2.0", + "main": "lib/commonjs/index", + "files": [ + "src/**", + "lib/**", + "scripts/**", + "android/build.gradle", + "android/detekt.yml", + "android/gradle.properties", + "android/consumer-proguard-rules.pro", + "android/src/**", + "ios/Sources/**", + "ios/DatadogSDKReactNativeLogs.xcodeproj/project.xcworkspace/xcsharedata", + "ios/DatadogSDKReactNativeLogs.xcodeproj/project.xcworkspace/*.xcworkspacedata", + "ios/DatadogSDKReactNativeLogs.xcodeproj/*.pbxproj", + "DatadogSDKReactNativeLogs.podspec" + ], + "types": "lib/typescript/index.d.ts", + "react-native": "src/index", + "source": "src", + "module": "lib/module/index", + "publishConfig": { + "access": "public" + }, + "scripts": { + "test": "jest", + "lint": "eslint .", + "prepare": "rm -rf lib && yarn bob build" + }, + "dependencies": { + "@datadog/mobile-react-native": "2.11.0" + }, + "peerDependencies": { + "@datadog/mobile-react-native": "2.11.0", + "react": ">=16.13.1", + "react-native": ">=0.63.4 <1.0" + }, + "devDependencies": { + "@datadog/mobile-react-native": "2.11.0", + "@testing-library/react-native": "7.0.2", + "react-native-builder-bob": "0.26.0" + }, + "jest": { + "preset": "react-native", + "moduleNameMapper": { + "@datadog/mobile-react-native": "../core/src" + }, + "modulePathIgnorePatterns": [ + "/lib/" + ], + "setupFiles": [ + "./../../node_modules/react-native-gesture-handler/jestSetup.js", + "./../../jest.setup.js" + ], + "transformIgnorePatterns": [ + "jest-runner" + ] + }, + "react-native-builder-bob": { + "source": "src", + "output": "lib", + "targets": [ + "commonjs", + "module", + [ + "typescript", + { + "tsc": "./../../node_modules/.bin/tsc" + } + ] + ] + }, + "codegenConfig": { + "name": "DdSDKReactNativeLogs", + "type": "all", + "jsSrcsDir": "./src/specs", + "android": { + "javaPackageName": "com.datadog.reactnative.logs" + } + } +} diff --git a/packages/core/src/logs/DdLogs.ts b/packages/logs/src/DdLogs.ts similarity index 94% rename from packages/core/src/logs/DdLogs.ts rename to packages/logs/src/DdLogs.ts index 52700df18..ead2932f4 100644 --- a/packages/core/src/logs/DdLogs.ts +++ b/packages/logs/src/DdLogs.ts @@ -4,15 +4,21 @@ * Copyright 2016-Present Datadog, Inc. */ -import type { AutoInstrumentationParameters } from '../DdSdkReactNativeConfiguration'; -import { DATADOG_MESSAGE_PREFIX, InternalLog } from '../InternalLog'; -import { SdkVerbosity } from '../SdkVerbosity'; -import type { DdNativeLogsType } from '../nativeModulesTypes'; -import { DdAttributes } from '../rum/DdAttributes'; -import type { ErrorSource } from '../rum/types'; -import { validateContext } from '../utils/argsUtils'; +import type { + ErrorSource, + AutoInstrumentationParameters +} from '@datadog/mobile-react-native'; +import { + SdkVerbosity, + DATADOG_MESSAGE_PREFIX, + InternalLog, + DdAttributes +} from '@datadog/mobile-react-native'; + +import { validateContext } from '../../core/src/utils/argsUtils'; import { generateEventMapper } from './eventMapper'; +import type { Spec as DdNativeLogsType } from './specs/NativeDdLogs'; import type { DdLogsType, LogArguments, @@ -44,7 +50,7 @@ const isLogWithError = ( class DdLogsWrapper implements DdLogsType { // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires - private nativeLogs: DdNativeLogsType = require('../specs/NativeDdLogs') + private nativeLogs: DdNativeLogsType = require('./specs/NativeDdLogs') .default; private logEventMapper = generateEventMapper(undefined); private isEnabled = false; diff --git a/packages/core/src/logs/eventMapper.ts b/packages/logs/src/eventMapper.ts similarity index 70% rename from packages/core/src/logs/eventMapper.ts rename to packages/logs/src/eventMapper.ts index 2bbd398cb..88a108698 100644 --- a/packages/core/src/logs/eventMapper.ts +++ b/packages/logs/src/eventMapper.ts @@ -4,9 +4,9 @@ * Copyright 2016-Present Datadog, Inc. */ -import type { Attributes } from '../sdk/AttributesSingleton/types'; -import { EventMapper } from '../sdk/EventMappers/EventMapper'; -import type { UserInfo } from '../sdk/UserInfoSingleton/types'; +import type { AdditionalEventDataForMapper } from '@datadog/mobile-react-native'; + +import { EventMapper } from '../../core/src/sdk/EventMappers/EventMapper'; import type { LogEvent, @@ -31,24 +31,28 @@ export const formatRawLogToNativeEvent = ( export const formatRawLogToLogEvent = ( rawLog: RawLog | RawLogWithError, - additionalInformation: { - userInfo: UserInfo; - attributes: Attributes; - } + additionalInformation: AdditionalEventDataForMapper ): LogEvent => { + const userInfo = { + ...additionalInformation.userInfo, + id: additionalInformation.userInfo.id ?? '' + }; + return { ...rawLog, - userInfo: additionalInformation.userInfo, + userInfo, attributes: additionalInformation.attributes }; }; export const generateEventMapper = ( logEventMapper: LogEventMapper | undefined -) => - new EventMapper( +) => { + console.log('generateEventMapper', EventMapper); + return new EventMapper( logEventMapper, formatRawLogToLogEvent, formatLogEventToNativeLog, formatRawLogToNativeEvent ); +}; diff --git a/packages/logs/src/index.tsx b/packages/logs/src/index.tsx new file mode 100644 index 000000000..7aa0c7af8 --- /dev/null +++ b/packages/logs/src/index.tsx @@ -0,0 +1,8 @@ +/* + * 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 { DdLogs } from './DdLogs'; + +export { DdLogs }; diff --git a/packages/core/src/specs/NativeDdLogs.ts b/packages/logs/src/specs/NativeDdLogs.ts similarity index 100% rename from packages/core/src/specs/NativeDdLogs.ts rename to packages/logs/src/specs/NativeDdLogs.ts diff --git a/packages/core/src/logs/types.ts b/packages/logs/src/types.ts similarity index 96% rename from packages/core/src/logs/types.ts rename to packages/logs/src/types.ts index 6d0d84ce9..7b43ace54 100644 --- a/packages/core/src/logs/types.ts +++ b/packages/logs/src/types.ts @@ -4,8 +4,7 @@ * Copyright 2016-Present Datadog, Inc. */ -import type { ErrorSource } from '../rum/types'; -import type { UserInfo } from '../sdk/UserInfoSingleton/types'; +import type { ErrorSource, UserInfo } from '@datadog/mobile-react-native'; /** * The entry point to use Datadog's Logs feature. diff --git a/packages/logs/tsconfig.json b/packages/logs/tsconfig.json new file mode 100644 index 000000000..41716a7dd --- /dev/null +++ b/packages/logs/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "../../tsconfig" +} diff --git a/yarn.lock b/yarn.lock index 0d50362b4..db5656637 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2407,6 +2407,20 @@ __metadata: languageName: unknown linkType: soft +"@datadog/mobile-react-native-logs@workspace:packages/logs": + version: 0.0.0-use.local + resolution: "@datadog/mobile-react-native-logs@workspace:packages/logs" + dependencies: + "@datadog/mobile-react-native": 2.11.0 + "@testing-library/react-native": 7.0.2 + react-native-builder-bob: 0.26.0 + peerDependencies: + "@datadog/mobile-react-native": 2.11.0 + react: ">=16.13.1" + react-native: ">=0.63.4 <1.0" + languageName: unknown + linkType: soft + "@datadog/mobile-react-native-navigation@workspace:packages/react-native-navigation": version: 0.0.0-use.local resolution: "@datadog/mobile-react-native-navigation@workspace:packages/react-native-navigation" @@ -2465,6 +2479,18 @@ __metadata: languageName: unknown linkType: soft +"@datadog/mobile-react-native@npm:2.11.0": + version: 2.11.0 + resolution: "@datadog/mobile-react-native@npm:2.11.0" + dependencies: + big-integer: ^1.6.52 + peerDependencies: + react: ">=16.13.1" + react-native: ">=0.63.4 <1.0" + checksum: e17f57fb142e8055a8b6eb7003d57e636cec3d403ab5a7e67214ac31aebad9289786446bc3fc4d16fd7d3dcdfb8d4e4ec493ef71f17b83d13482ce43ad63cdf6 + languageName: node + linkType: hard + "@datadog/mobile-react-navigation@workspace:packages/react-navigation": version: 0.0.0-use.local resolution: "@datadog/mobile-react-navigation@workspace:packages/react-navigation" @@ -6056,6 +6082,7 @@ __metadata: "@babel/preset-env": ^7.25.3 "@babel/runtime": ^7.25.0 "@datadog/mobile-react-native": "workspace:packages/core" + "@datadog/mobile-react-native-logs": "workspace:packages/logs" "@react-native-community/cli": 15.0.1 "@react-native-community/cli-platform-android": 15.0.1 "@react-native-community/cli-platform-ios": 15.0.1 @@ -7929,6 +7956,7 @@ __metadata: "@babel/runtime": ^7.25.0 "@datadog/datadog-ci": ^2.39.0 "@datadog/mobile-react-native": "workspace:packages/core" + "@datadog/mobile-react-native-logs": "workspace:packages/logs" "@datadog/mobile-react-native-navigation": "workspace:packages/react-native-navigation" "@datadog/mobile-react-native-session-replay": "workspace:packages/react-native-session-replay" "@datadog/mobile-react-native-webview": "workspace:packages/react-native-webview" From 2f934d3e6dbf420fe1afeeeba6eb1b200d0d3ba5 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Mon, 4 Aug 2025 16:06:47 +0200 Subject: [PATCH 5/9] Get Logs module working on iOS --- packages/logs/package.json | 8 ++++---- packages/logs/src/DdLogs.ts | 5 ++--- packages/logs/src/eventMapper.ts | 3 +-- yarn.lock | 16 ++-------------- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/packages/logs/package.json b/packages/logs/package.json index 6ab6bf009..28cd18978 100644 --- a/packages/logs/package.json +++ b/packages/logs/package.json @@ -1,6 +1,6 @@ { "name": "@datadog/mobile-react-native-logs", - "version": "2.10.1", + "version": "2.11.0", "description": "A client-side React Native module to enable Log tracking with Datadog", "keywords": [ "datadog", @@ -44,15 +44,15 @@ "prepare": "rm -rf lib && yarn bob build" }, "dependencies": { - "@datadog/mobile-react-native": "2.11.0" + "@datadog/mobile-react-native": "workspace:packages/core" }, "peerDependencies": { - "@datadog/mobile-react-native": "2.11.0", + "@datadog/mobile-react-native": "workspace:packages/core", "react": ">=16.13.1", "react-native": ">=0.63.4 <1.0" }, "devDependencies": { - "@datadog/mobile-react-native": "2.11.0", + "@datadog/mobile-react-native": "workspace:packages/core", "@testing-library/react-native": "7.0.2", "react-native-builder-bob": "0.26.0" }, diff --git a/packages/logs/src/DdLogs.ts b/packages/logs/src/DdLogs.ts index ead2932f4..4050467c2 100644 --- a/packages/logs/src/DdLogs.ts +++ b/packages/logs/src/DdLogs.ts @@ -12,11 +12,10 @@ import { SdkVerbosity, DATADOG_MESSAGE_PREFIX, InternalLog, - DdAttributes + DdAttributes, + validateContext } from '@datadog/mobile-react-native'; -import { validateContext } from '../../core/src/utils/argsUtils'; - import { generateEventMapper } from './eventMapper'; import type { Spec as DdNativeLogsType } from './specs/NativeDdLogs'; import type { diff --git a/packages/logs/src/eventMapper.ts b/packages/logs/src/eventMapper.ts index 88a108698..613fbc58f 100644 --- a/packages/logs/src/eventMapper.ts +++ b/packages/logs/src/eventMapper.ts @@ -5,8 +5,7 @@ */ import type { AdditionalEventDataForMapper } from '@datadog/mobile-react-native'; - -import { EventMapper } from '../../core/src/sdk/EventMappers/EventMapper'; +import { EventMapper } from '@datadog/mobile-react-native'; import type { LogEvent, diff --git a/yarn.lock b/yarn.lock index db5656637..d2760bacc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2411,11 +2411,11 @@ __metadata: version: 0.0.0-use.local resolution: "@datadog/mobile-react-native-logs@workspace:packages/logs" dependencies: - "@datadog/mobile-react-native": 2.11.0 + "@datadog/mobile-react-native": "workspace:packages/core" "@testing-library/react-native": 7.0.2 react-native-builder-bob: 0.26.0 peerDependencies: - "@datadog/mobile-react-native": 2.11.0 + "@datadog/mobile-react-native": "workspace:packages/core" react: ">=16.13.1" react-native: ">=0.63.4 <1.0" languageName: unknown @@ -2479,18 +2479,6 @@ __metadata: languageName: unknown linkType: soft -"@datadog/mobile-react-native@npm:2.11.0": - version: 2.11.0 - resolution: "@datadog/mobile-react-native@npm:2.11.0" - dependencies: - big-integer: ^1.6.52 - peerDependencies: - react: ">=16.13.1" - react-native: ">=0.63.4 <1.0" - checksum: e17f57fb142e8055a8b6eb7003d57e636cec3d403ab5a7e67214ac31aebad9289786446bc3fc4d16fd7d3dcdfb8d4e4ec493ef71f17b83d13482ce43ad63cdf6 - languageName: node - linkType: hard - "@datadog/mobile-react-navigation@workspace:packages/react-navigation": version: 0.0.0-use.local resolution: "@datadog/mobile-react-navigation@workspace:packages/react-navigation" From 8aeefa088e96b759e7bb750a0ba4fb66fc39e3e9 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Mon, 4 Aug 2025 16:54:53 +0200 Subject: [PATCH 6/9] Fix RNQueue visibility --- example/ios/Podfile.lock | 4 ++-- example/src/ddUtils.tsx | 6 ------ packages/core/ios/Sources/RNQueueHolderProxy.h | 11 +++++++++++ packages/core/ios/Sources/RNQueueHolderProxy.mm | 10 ++++++++++ packages/logs/ios/Sources/DdLogs.mm | 9 +++++---- 5 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 packages/core/ios/Sources/RNQueueHolderProxy.h create mode 100644 packages/core/ios/Sources/RNQueueHolderProxy.mm diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index b4ffd256e..3fd46a319 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -26,7 +26,7 @@ PODS: - DatadogTrace (= 2.29.0) - DatadogWebViewTracking (= 2.29.0) - React-Core - - DatadogSDKReactNativeLogs (2.10.1): + - DatadogSDKReactNativeLogs (2.11.0): - DatadogCore (= 2.29.0) - DatadogInternal (= 2.29.0) - DatadogLogs (= 2.29.0) @@ -2022,7 +2022,7 @@ SPEC CHECKSUMS: DatadogLogs: c314b15a97bfc7e0728ea253d3638b0513032d88 DatadogRUM: 6ec371f477a1022fd5aad6ccb5407b85a04db399 DatadogSDKReactNative: 81f50b5238dcf7732ebca0151d4e6d5555121b1b - DatadogSDKReactNativeLogs: dc93be518d29cfa125a02f6308457ca464ca77f5 + DatadogSDKReactNativeLogs: 5c653dbc15a5c3f0357ffb1f952ae53cfa494bab DatadogSDKReactNativeSessionReplay: 207aba83107a37ed08162790aa27a449a486addd DatadogSDKReactNativeWebView: ac2d200b50ce67146a86ed84883667a4ab270d15 DatadogSessionReplay: 1f2f70afa2fc5870ce7304a02749f73529d3e6cb diff --git a/example/src/ddUtils.tsx b/example/src/ddUtils.tsx index 1029f0f48..7d9469910 100644 --- a/example/src/ddUtils.tsx +++ b/example/src/ddUtils.tsx @@ -34,25 +34,19 @@ export function getDatadogConfig(trackingConsent: TrackingConsent) { export async function onDatadogInitialization() { try { - console.log("Datadog SDK was initialized, initializing Logs..."); await DdLogs.enable({}); - console.log('DDLogs was initialized'); DdLogs.debug('DDLogs was initialized'); DdSdkReactNative.setUserInfo({id: "w00t", name: "Sergio", email: "modular@sdk.com", extraInfo: { type: "premium" } }) setTimeout(async () => { - console.log("Initialize ddlogs again"); await DdLogs.enable({ customEndpoints: { logs: "custom.endpoint" } }); - console.log('DDLogs was initialized again with a custom endpoint'); DdLogs.debug('DDLogs was initialized again with a custom endpoint'); setTimeout(async () => { - console.log("Initialize ddlogs for a third time"); await DdLogs.enable({}); - console.log('DDLogs was initialized for the third time'); DdLogs.debug('DDLogs was initialized for the third time'); }, 5000); }, 5000); diff --git a/packages/core/ios/Sources/RNQueueHolderProxy.h b/packages/core/ios/Sources/RNQueueHolderProxy.h new file mode 100644 index 000000000..2d2fc552c --- /dev/null +++ b/packages/core/ios/Sources/RNQueueHolderProxy.h @@ -0,0 +1,11 @@ +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface RNQueueHolderProxy : NSObject + ++ (dispatch_queue_t)getSharedQueue; + +@end + +NS_ASSUME_NONNULL_END diff --git a/packages/core/ios/Sources/RNQueueHolderProxy.mm b/packages/core/ios/Sources/RNQueueHolderProxy.mm new file mode 100644 index 000000000..96bfe40a5 --- /dev/null +++ b/packages/core/ios/Sources/RNQueueHolderProxy.mm @@ -0,0 +1,10 @@ +#import "RNQueueHolderProxy.h" +#import "DatadogSDKReactNative-Swift.h" + +@implementation RNQueueHolderProxy + ++ (dispatch_queue_t)getSharedQueue { + return [RNQueue getSharedQueue]; +} + +@end diff --git a/packages/logs/ios/Sources/DdLogs.mm b/packages/logs/ios/Sources/DdLogs.mm index efb0d2bce..a3b0682bb 100644 --- a/packages/logs/ios/Sources/DdLogs.mm +++ b/packages/logs/ios/Sources/DdLogs.mm @@ -10,6 +10,7 @@ #import #endif #import "DdLogs.h" +#import @implementation DdLogs @@ -118,10 +119,10 @@ - (DdLogsImplementation*)ddLogsImplementation + (BOOL)requiresMainQueueSetup { return NO; } -// -//- (dispatch_queue_t)methodQueue { -// return [RNQueue getSharedQueue]; -//} + +- (dispatch_queue_t)methodQueue { + return [RNQueueHolderProxy getSharedQueue]; +} - (void)enable:(NSDictionary *)configuration resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject { [self.ddLogsImplementation enableWithConfiguration:configuration resolve:resolve reject:reject]; From ed975056050cf0520a8cbefb03cab447c5f28c3a Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Tue, 5 Aug 2025 11:17:44 +0200 Subject: [PATCH 7/9] DdLogs integrated on Android example app --- example/android/app/build.gradle | 2 + .../MainApplication.kt | 3 +- example/android/settings.gradle | 3 + .../datadog/reactnative/DatadogSDKWrapper.kt | 2 +- .../reactnative/DdSdkConfigurationExt.kt | 2 +- .../reactnative/DdSdkReactNativePackage.kt | 2 - .../com/datadog/reactnative/GlobalState.kt | 4 +- .../com/datadog/reactnative/DdLogsTest.kt | 400 ------------ .../core/ios/Sources/DatadogSDKWrapper.swift | 14 +- packages/core/src/index.tsx | 6 +- packages/logs/android/build.gradle | 249 ++++++++ packages/logs/android/detekt.yml | 572 ++++++++++++++++++ packages/logs/android/gradle.properties | 6 + .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + packages/logs/android/gradlew | 240 ++++++++ packages/logs/android/gradlew.bat | 91 +++ packages/logs/android/settings.gradle | 4 + .../logs/android/src/main/AndroidManifest.xml | 11 + .../reactnative/logs}/DdLogsImplementation.kt | 7 +- .../logs/DdSdkReactNativeLogsPackage.kt | 49 ++ .../com/datadog/reactnative/logs}/DdLogs.kt | 2 +- .../com/datadog/reactnative/logs}/DdLogs.kt | 4 +- .../ios/Sources/DdLogsImplementation.swift | 3 +- packages/logs/package.json | 3 +- packages/logs/src/DdLogs.ts | 8 +- packages/logs/src/index.tsx | 2 + packages/logs/tsconfig.json | 2 +- 28 files changed, 1268 insertions(+), 428 deletions(-) delete mode 100644 packages/core/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt create mode 100644 packages/logs/android/build.gradle create mode 100644 packages/logs/android/detekt.yml create mode 100644 packages/logs/android/gradle.properties create mode 100644 packages/logs/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 packages/logs/android/gradle/wrapper/gradle-wrapper.properties create mode 100755 packages/logs/android/gradlew create mode 100644 packages/logs/android/gradlew.bat create mode 100644 packages/logs/android/settings.gradle create mode 100644 packages/logs/android/src/main/AndroidManifest.xml rename packages/{core/android/src/main/kotlin/com/datadog/reactnative => logs/android/src/main/kotlin/com/datadog/reactnative/logs}/DdLogsImplementation.kt (96%) create mode 100644 packages/logs/android/src/main/kotlin/com/datadog/reactnative/logs/DdSdkReactNativeLogsPackage.kt rename packages/{core/android/src/newarch/kotlin/com/datadog/reactnative => logs/android/src/newarch/kotlin/com/datadog/reactnative/logs}/DdLogs.kt (99%) rename packages/{core/android/src/oldarch/kotlin/com/datadog/reactnative => logs/android/src/oldarch/kotlin/com/datadog/reactnative/logs}/DdLogs.kt (97%) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index aef22ad73..518a87257 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -107,6 +107,8 @@ dependencies { implementation jscFlavor } + implementation project(":datadog_mobile-react-native-logs") + constraints { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib") diff --git a/example/android/app/src/main/java/com/ddsdkreactnativeexample/MainApplication.kt b/example/android/app/src/main/java/com/ddsdkreactnativeexample/MainApplication.kt index 9efdf4b7b..97c38c1cb 100644 --- a/example/android/app/src/main/java/com/ddsdkreactnativeexample/MainApplication.kt +++ b/example/android/app/src/main/java/com/ddsdkreactnativeexample/MainApplication.kt @@ -15,7 +15,7 @@ import com.reactnativenavigation.NavigationApplication import com.reactnativenavigation.react.NavigationReactNativeHost import com.facebook.react.soloader.OpenSourceMergedSoMapping import com.facebook.soloader.SoLoader - +import com.datadog.reactnative.logs.DdSdkReactNativeLogsPackage; class MainApplication : NavigationApplication() { @@ -36,6 +36,7 @@ class MainApplication : NavigationApplication() { val packages = PackageList(this).packages // Packages that cannot be autolinked yet can be added manually here, for example: // packages.add(new MyReactNativePackage()) + packages.add(DdSdkReactNativeLogsPackage()) return packages } diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 940fd0070..4f7221523 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -5,6 +5,9 @@ rootProject.name = 'DdSdkReactNativeExample' include ':app' includeBuild('../node_modules/@react-native/gradle-plugin') +include(":datadog_mobile-react-native-logs") +project(":datadog_mobile-react-native-logs").projectDir = new File(rootProject.projectDir, "../../packages/logs/android") + diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt index c55102bc1..c9159e42b 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DatadogSDKWrapper.kt @@ -72,7 +72,7 @@ object DatadogSDKWrapperStorage { } } -internal class DatadogSDKWrapper : DatadogWrapper { +class DatadogSDKWrapper : DatadogWrapper { override var bundleLogsWithRum = DefaultConfiguration.bundleLogsWithRum override var bundleLogsWithTraces = DefaultConfiguration.bundleLogsWithTraces diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt index e6d6c16bb..a08060a0b 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt @@ -65,7 +65,7 @@ internal fun ReadableMap.asConfigurationForTelemetry(): ConfigurationForTelemetr ) } -internal fun ReadableMap.asCustomEndpoints(): CustomEndpoints { +fun ReadableMap.asCustomEndpoints(): CustomEndpoints { return CustomEndpoints( rum = getString("rum"), logs = getString("logs"), diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkReactNativePackage.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkReactNativePackage.kt index bac9f49f5..adf896c0d 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkReactNativePackage.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkReactNativePackage.kt @@ -23,7 +23,6 @@ class DdSdkReactNativePackage : TurboReactPackage() { DdSdkImplementation.NAME -> DdSdk(reactContext, sdkWrapper) DdRumImplementation.NAME -> DdRum(reactContext, sdkWrapper) DdTraceImplementation.NAME -> DdTrace(reactContext) - DdLogsImplementation.NAME -> DdLogs(reactContext, sdkWrapper) else -> null } } @@ -35,7 +34,6 @@ class DdSdkReactNativePackage : TurboReactPackage() { DdSdkImplementation.NAME, DdRumImplementation.NAME, DdTraceImplementation.NAME, - DdLogsImplementation.NAME ).associateWith { ReactModuleInfo( it, diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/GlobalState.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/GlobalState.kt index e93bb0bea..9fa67a0ba 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/GlobalState.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/GlobalState.kt @@ -2,10 +2,10 @@ package com.datadog.reactnative import java.util.concurrent.ConcurrentHashMap -internal object GlobalState { +object GlobalState { // Keeps a record of global attributes for logs / spans - internal val globalAttributes: MutableMap = ConcurrentHashMap() + val globalAttributes: MutableMap = ConcurrentHashMap() /** * Adds a global attribute to all future RUM events. diff --git a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt deleted file mode 100644 index 671bd0503..000000000 --- a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdLogsTest.kt +++ /dev/null @@ -1,400 +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. - */ - -package com.datadog.reactnative - -import android.util.Log -import com.datadog.android.log.Logger -import com.datadog.tools.unit.GenericAssert.Companion.assertThat -import com.facebook.react.bridge.Promise -import com.facebook.react.bridge.ReadableMap -import fr.xgouchet.elmyr.Forge -import fr.xgouchet.elmyr.annotation.AdvancedForgery -import fr.xgouchet.elmyr.annotation.MapForgery -import fr.xgouchet.elmyr.annotation.StringForgery -import fr.xgouchet.elmyr.annotation.StringForgeryType -import fr.xgouchet.elmyr.junit5.ForgeExtension -import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -import org.junit.jupiter.api.extension.Extensions -import org.mockito.Mock -import org.mockito.junit.jupiter.MockitoExtension -import org.mockito.junit.jupiter.MockitoSettings -import org.mockito.kotlin.argumentCaptor -import org.mockito.kotlin.doReturn -import org.mockito.kotlin.times -import org.mockito.kotlin.verify -import org.mockito.kotlin.verifyNoInteractions -import org.mockito.kotlin.whenever -import org.mockito.quality.Strictness - -@Extensions( - ExtendWith(MockitoExtension::class), - ExtendWith(ForgeExtension::class) -) -@MockitoSettings(strictness = Strictness.LENIENT) -internal class DdLogsTest { - - lateinit var testedLogs: DdLogsImplementation - - @Mock - lateinit var mockLogger: Logger - - @StringForgery - lateinit var fakeMessage: String - - private var fakeErrorKind: String? = null - - private var fakeErrorMessage: String? = null - - private var fakeStacktrace: String? = null - - @Mock - lateinit var mockPromise: Promise - - @Mock - lateinit var mockDatadog: DatadogWrapper - - @Mock - lateinit var mockContext: ReadableMap - - @MapForgery( - key = AdvancedForgery(string = [StringForgery()]), - value = AdvancedForgery(string = [StringForgery(StringForgeryType.HEXADECIMAL)]) - ) - lateinit var fakeGlobalState: Map - - @BeforeEach - fun `set up`(forge: Forge) { - whenever(mockDatadog.isInitialized()) doReturn true - testedLogs = DdLogsImplementation(mockLogger, mockDatadog) - fakeErrorKind = forge.aNullable { forge.aString() } - fakeErrorMessage = forge.aNullable { forge.aString() } - fakeStacktrace = forge.aNullable { forge.aString() } - } - - @AfterEach - fun `tear down`() { - GlobalState.globalAttributes.clear() - } - - @Test - fun `M forward debug log W debug()`() { - // When - testedLogs.debug(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).d(fakeMessage, attributes = mockContext.toHashMap()) - } - - @Test - fun `M forward info log W info()`() { - // When - testedLogs.info(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).i(fakeMessage, attributes = mockContext.toHashMap()) - } - - @Test - fun `M forward warning log W warn()`() { - // When - testedLogs.warn(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).w(fakeMessage, attributes = mockContext.toHashMap()) - } - - @Test - fun `M forward error log W error()`() { - // When - testedLogs.error(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).e(fakeMessage, attributes = mockContext.toHashMap()) - } - - @Test - fun `M forward debug log with global state W debug()`() { - // Given - fakeGlobalState.forEach { (k, v) -> - GlobalState.globalAttributes[k] = v - } - val expectedAttributes = mockContext.toHashMap() + fakeGlobalState - - // When - testedLogs.debug(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).d(fakeMessage, attributes = expectedAttributes) - } - - @Test - fun `M forward info log with global state W info()`() { - // Given - fakeGlobalState.forEach { (k, v) -> - GlobalState.globalAttributes[k] = v - } - val expectedAttributes = mockContext.toHashMap() + fakeGlobalState - - // When - testedLogs.info(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).i(fakeMessage, attributes = expectedAttributes) - } - - @Test - fun `M forward warning log with global state W warn()`() { - // Given - fakeGlobalState.forEach { (k, v) -> - GlobalState.globalAttributes[k] = v - } - val expectedAttributes = mockContext.toHashMap() + fakeGlobalState - - // When - testedLogs.warn(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).w(fakeMessage, attributes = expectedAttributes) - } - - @Test - fun `M forward error log with global state W error()`() { - // Given - fakeGlobalState.forEach { (k, v) -> - GlobalState.globalAttributes[k] = v - } - val expectedAttributes = mockContext.toHashMap() + fakeGlobalState - - // When - testedLogs.error(fakeMessage, mockContext, mockPromise) - - // Then - verify(mockLogger).e(fakeMessage, attributes = expectedAttributes) - } - - @Test - fun `M forward debug log with error W debugWithError()`() { - // When - testedLogs.debugWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - - // Then - verify(mockLogger).log( - Log.DEBUG, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - } - - @Test - fun `M forward info log with error W infoWithError()`() { - // When - testedLogs.infoWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - - // Then - verify(mockLogger).log( - Log.INFO, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - } - - @Test - fun `M forward warn log with error W warnWithError()`() { - // When - testedLogs.warnWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - - // Then - verify(mockLogger).log( - Log.WARN, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - } - - @Test - fun `M forward error log with error W errorWithError()`() { - // When - testedLogs.errorWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - - // Then - verify(mockLogger).log( - Log.ERROR, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - } - - @Test - fun `M not forward logs W SDK is not initialized`() { - // When - whenever(mockDatadog.isInitialized()) doReturn false - var newTestedLogs = DdLogsImplementation(mockLogger, mockDatadog) - newTestedLogs.debug(fakeMessage, mockContext, mockPromise) - newTestedLogs.info(fakeMessage, mockContext, mockPromise) - newTestedLogs.warn(fakeMessage, mockContext, mockPromise) - newTestedLogs.error(fakeMessage, mockContext, mockPromise) - testedLogs.debugWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - testedLogs.infoWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - testedLogs.warnWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - testedLogs.errorWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - - // Then - verifyNoInteractions(mockLogger) - val exceptionCaptor = argumentCaptor() - verify(mockPromise, times(8)).reject(exceptionCaptor.capture()) - assertThat(exceptionCaptor.firstValue.message) - .isEqualTo("DD_INTERNAL_LOG_SENT_BEFORE_SDK_INIT") - - // When SDK is finally initialized - whenever(mockDatadog.isInitialized()) doReturn true - newTestedLogs.debug(fakeMessage, mockContext, mockPromise) - newTestedLogs.info(fakeMessage, mockContext, mockPromise) - newTestedLogs.warn(fakeMessage, mockContext, mockPromise) - newTestedLogs.error(fakeMessage, mockContext, mockPromise) - testedLogs.debugWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - testedLogs.infoWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - testedLogs.warnWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - testedLogs.errorWithError( - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - mockContext, - mockPromise - ) - - // Then - verify(mockLogger).i(fakeMessage, attributes = mockContext.toHashMap()) - verify(mockLogger).d(fakeMessage, attributes = mockContext.toHashMap()) - verify(mockLogger).w(fakeMessage, attributes = mockContext.toHashMap()) - verify(mockLogger).e(fakeMessage, attributes = mockContext.toHashMap()) - verify(mockLogger).log( - Log.DEBUG, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - verify(mockLogger).log( - Log.INFO, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - verify(mockLogger).log( - Log.WARN, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - verify(mockLogger).log( - Log.ERROR, - fakeMessage, - fakeErrorKind, - fakeErrorMessage, - fakeStacktrace, - attributes = mockContext.toHashMap() - ) - } -} diff --git a/packages/core/ios/Sources/DatadogSDKWrapper.swift b/packages/core/ios/Sources/DatadogSDKWrapper.swift index abb1aeb18..01efc2644 100644 --- a/packages/core/ios/Sources/DatadogSDKWrapper.swift +++ b/packages/core/ios/Sources/DatadogSDKWrapper.swift @@ -79,13 +79,13 @@ public class DatadogSDKWrapper { } } - public func enableLogs(with configuration: Logs.Configuration) { - if let core = coreInstance { - Logs.enable(with: configuration, in: core) - } else { - consolePrint("Core instance was not found when initializing Logs.", .critical) - } - } +// public func enableLogs(with configuration: Logs.Configuration) { +// if let core = coreInstance { +// Logs.enable(with: configuration, in: core) +// } else { +// consolePrint("Core instance was not found when initializing Logs.", .critical) +// } +// } internal func enableTrace(with configuration: Trace.Configuration) { if let core = coreInstance { diff --git a/packages/core/src/index.tsx b/packages/core/src/index.tsx index 269ac2948..512a100ff 100644 --- a/packages/core/src/index.tsx +++ b/packages/core/src/index.tsx @@ -14,8 +14,7 @@ import { } from './DdSdkReactNativeConfiguration'; import type { AutoInstrumentationConfiguration, - PartialInitializationConfiguration, - AutoInstrumentationParameters + PartialInitializationConfiguration } from './DdSdkReactNativeConfiguration'; import { DdSdkReactNative } from './DdSdkReactNative'; import { InternalLog, DATADOG_MESSAGE_PREFIX } from './InternalLog'; @@ -96,6 +95,5 @@ export type { Timestamp, FirstPartyHost, AutoInstrumentationConfiguration, - PartialInitializationConfiguration, - AutoInstrumentationParameters + PartialInitializationConfiguration }; diff --git a/packages/logs/android/build.gradle b/packages/logs/android/build.gradle new file mode 100644 index 000000000..fda51aefd --- /dev/null +++ b/packages/logs/android/build.gradle @@ -0,0 +1,249 @@ +import java.nio.file.Paths +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +buildscript { + // Buildscript is evaluated before everything else so we can't use getExtOrDefault + def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['DatadogSDKReactNativeLogs_kotlinVersion'] + + repositories { + mavenCentral() + google() + gradlePluginPortal() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.2.2' + // noinspection DifferentKotlinGradleVersion + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.1" + classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.0" + classpath 'com.github.bjoernq:unmockplugin:0.7.9' + } +} + + +apply plugin: 'de.mobilej.unmock' + +def isNewArchitectureEnabled() { + return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" +} + +apply plugin: 'com.android.library' +if (isNewArchitectureEnabled()) { + apply plugin: 'com.facebook.react' +} +apply plugin: 'kotlin-android' +apply plugin: 'org.jlleitschuh.gradle.ktlint' +apply plugin: "io.gitlab.arturbosch.detekt" + +/** + * Finds the path of the installed npm package with the given name using Node's + * module resolution algorithm, which searches "node_modules" directories up to + * the file system root. + * This enables us to handle monorepos without requiring the node executable. + * + * The search begins at the given base directory (a File object). The returned + * path is a string. + */ +static def findNodeModulePath(baseDir, packageName) { + def basePath = baseDir.toPath().normalize() + // Node's module resolution algorithm searches up to the root directory, + // after which the base path will be null + while (basePath) { + def candidatePath = Paths.get(basePath.toString(), "node_modules", packageName) + if (candidatePath.toFile().exists()) { + return candidatePath.toString() + } + basePath = basePath.getParent() + } + return null +} + +def resolveReactNativeDirectory() { + def reactNativeLocation = rootProject.hasProperty("reactNativeDir") ? rootProject.getProperty("reactNativeDir") : null + + if (reactNativeLocation != null) { + return file(reactNativeLocation) + } + + def reactNativePath = findNodeModulePath(projectDir, "react-native") + + if (reactNativePath != null) { + return file(reactNativePath) + } + + throw new Exception( + "${project.name}: Failed to resolve 'react-native' in the project. " + + "Altenatively, you can specify 'reactNativeDir' with the path to 'react-native' in your 'gradle.properties' file." + ) +} + +def reactNativeRootDir = resolveReactNativeDirectory() +def reactProperties = new Properties() +file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) } + +def reactNativeVersion = reactProperties.getProperty("VERSION_NAME") +def (reactNativeMajorVersion, reactNativeMinorVersion) = reactNativeVersion.split("\\.").collect { it.isInteger() ? it.toInteger() : it } + +def getExtOrDefault(name) { + return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['DatadogSDKReactNativeLogs_' + name] +} + +def getExtOrIntegerDefault(name) { + return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['DatadogSDKReactNativeLogs_' + name]).toInteger() +} + +android { + compileSdkVersion getExtOrIntegerDefault('compileSdkVersion') + buildToolsVersion getExtOrDefault('buildToolsVersion') + def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION + if (agpVersion.tokenize('.')[0].toInteger() >= 7) { + namespace = "com.datadog.reactnative.logs" + } + if (agpVersion.tokenize('.')[0].toInteger() >= 8) { + buildFeatures { + buildConfig = true + } + } + if (agpVersion.tokenize('.')[0].toInteger() < 8) { + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.majorVersion + } + } + + defaultConfig { + minSdkVersion getExtOrIntegerDefault('minSdkVersion') + targetSdkVersion getExtOrIntegerDefault('targetSdkVersion') + versionCode 1 + versionName "1.0" + buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()) + } + + sourceSets { + main { + if (isNewArchitectureEnabled()) { + java.srcDirs += ['src/newarch'] + } else { + java.srcDirs += ['src/oldarch'] + } + } + + test { + java.srcDir("src/test/kotlin") + } + } + + testOptions { + unitTests { + returnDefaultValues = true + } + } + + buildTypes { + release { + minifyEnabled false + } + } + lintOptions { + disable 'GradleCompatible' + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } +} + +repositories { + mavenCentral() + google() + maven { url "https://jitpack.io" } + mavenLocal() + + if (reactNativeMajorVersion == 0 && reactNativeMinorVersion < 71) { + def androidSourcesDir = file("$reactNativeRootDir/android") + def androidSourcesName = "React Native sources" + + if (androidSourcesDir.exists()) { + maven { + url androidSourcesDir.toString() + name androidSourcesName + } + } + } +} + +def kotlin_version = getExtOrDefault('kotlinVersion') + +dependencies { + if (reactNativeMajorVersion == 0 && reactNativeMinorVersion < 71) { + // noinspection GradleDynamicVersion + api 'com.facebook.react:react-native:+' + } else { + // We specify the $reactNativeVersion, like it's done on the react-native-gradle-plugin, as the plugin is not applied in tests. + // There is no impact for apps as we apply the same logic: + // https://github.com/facebook/react-native/blob/e1a1e6aa8030bf11d691c3dcf7abd13b25175027/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt + implementation "com.facebook.react:react-android:$reactNativeVersion" + } + + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + + implementation "com.datadoghq:dd-sdk-android-logs:2.23.0" + implementation "com.datadoghq:dd-sdk-android-internal:2.23.0" + implementation project(path: ':datadog_mobile-react-native') + + testImplementation "org.junit.platform:junit-platform-launcher:1.6.2" + testImplementation "org.junit.jupiter:junit-jupiter-api:5.6.2" + testImplementation "org.junit.jupiter:junit-jupiter-engine:5.6.2" + testImplementation "org.junit.jupiter:junit-jupiter-params:5.6.2" + testImplementation "org.mockito:mockito-junit-jupiter:3.4.6" + testImplementation "org.assertj:assertj-core:3.18.1" + testImplementation "com.github.xgouchet.Elmyr:core:1.3.1" + testImplementation "com.github.xgouchet.Elmyr:inject:1.3.1" + testImplementation "com.github.xgouchet.Elmyr:junit5:1.3.1" + testImplementation "com.github.xgouchet.Elmyr:jvm:1.3.1" + testImplementation "org.mockito.kotlin:mockito-kotlin:5.1.0" + testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + unmock 'org.robolectric:android-all:4.4_r1-robolectric-r2' +} + +tasks.withType(Test) { + useJUnitPlatform { + includeEngines("spek", "junit-jupiter", "junit-vintage") + } + reports { + junitXml.required.set(true) + html.required.set(true) + } +} + +tasks.named("check") { + dependsOn("ktlintCheck") + dependsOn("detekt") +} + +ktlint { + debug.set(false) + android.set(true) + outputToConsole.set(true) + ignoreFailures.set(false) + enableExperimentalRules.set(false) + filter { + exclude("**/generated/**") + include("**/kotlin/**") + } +} + +detekt { + input = files("$projectDir/src/main/kotlin") + config = files("$projectDir/detekt.yml") + reports { + xml { + enabled = true + destination = file("build/reports/detekt.xml") + } + } +} diff --git a/packages/logs/android/detekt.yml b/packages/logs/android/detekt.yml new file mode 100644 index 000000000..c1376f3bf --- /dev/null +++ b/packages/logs/android/detekt.yml @@ -0,0 +1,572 @@ +build: + maxIssues: 0 + weights: + # complexity: 2 + # LongParameterList: 1 + # style: 1 + # comments: 1 + +processors: + active: true + exclude: + # - 'DetektProgressListener' + # - 'FunctionCountProcessor' + # - 'PropertyCountProcessor' + # - 'ClassCountProcessor' + # - 'PackageCountProcessor' + # - 'KtFileCountProcessor' + +console-reports: + active: true + exclude: + # - 'ProjectStatisticsReport' + # - 'ComplexityReport' + # - 'NotificationReport' + # - 'FindingsReport' + - 'FileBasedFindingsReport' + # - 'BuildFailureReport' + +comments: + active: true + CommentOverPrivateFunction: + active: true + CommentOverPrivateProperty: + active: true + EndOfSentenceFormat: + active: true + endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!:]$) + UndocumentedPublicClass: + active: true + excludes: [ "**/test/**","**/androidTest/**","**/*.Test.kt","**/*.Spec.kt","**/*.Spek.kt" ] + searchInNestedClass: true + searchInInnerClass: true + searchInInnerObject: true + searchInInnerInterface: true + UndocumentedPublicFunction: + active: true + excludes: [ "**/test/**","**/androidTest/**","**/*.Test.kt","**/*.Spec.kt","**/*.Spek.kt" ] + UndocumentedPublicProperty: + active: true + excludes: [ "**/test/**","**/androidTest/**","**/*.Test.kt","**/*.Spec.kt","**/*.Spek.kt" ] + +complexity: + active: true + ComplexCondition: + active: true + threshold: 4 + ComplexInterface: + active: true + threshold: 10 + includeStaticDeclarations: false + ComplexMethod: + active: true + threshold: 10 + ignoreSingleWhenExpression: true + ignoreSimpleWhenEntries: true + LabeledExpression: + active: true + ignoredLabels: "" + LargeClass: + active: true + threshold: 600 + LongMethod: + active: true + threshold: 60 + LongParameterList: + active: true + threshold: 6 + ignoreDefaultParameters: true + MethodOverloading: + active: true + threshold: 6 + NestedBlockDepth: + active: true + threshold: 4 + StringLiteralDuplication: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + threshold: 3 + ignoreAnnotation: true + excludeStringsWithLessThan5Characters: true + ignoreStringsRegex: '$^' + TooManyFunctions: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + thresholdInFiles: 11 + thresholdInClasses: 11 + thresholdInInterfaces: 11 + thresholdInObjects: 11 + thresholdInEnums: 11 + ignoreDeprecated: true + ignorePrivate: true + ignoreOverridden: true + +empty-blocks: + active: true + EmptyCatchBlock: + active: true + allowedExceptionNameRegex: "^(_|(ignore|expected).*)" + EmptyClassBlock: + active: true + EmptyDefaultConstructor: + active: true + EmptyDoWhileBlock: + active: true + EmptyElseBlock: + active: true + EmptyFinallyBlock: + active: true + EmptyForBlock: + active: true + EmptyFunctionBlock: + active: true + ignoreOverridden: true + EmptyIfBlock: + active: true + EmptyInitBlock: + active: true + EmptyKtFile: + active: true + EmptySecondaryConstructor: + active: true + EmptyWhenBlock: + active: true + EmptyWhileBlock: + active: true + +exceptions: + active: true + ExceptionRaisedInUnexpectedLocation: + active: true + methodNames: 'toString,hashCode,equals,finalize' + InstanceOfCheckForException: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + NotImplementedDeclaration: + active: true + PrintStackTrace: + active: true + RethrowCaughtException: + active: true + ReturnFromFinally: + active: true + ignoreLabeled: true + SwallowedException: + active: true + ignoredExceptionTypes: 'InterruptedException,NumberFormatException,ParseException,MalformedURLException' + allowedExceptionNameRegex: "^(_|(ignore|expected).*)" + ThrowingExceptionFromFinally: + active: true + ThrowingExceptionInMain: + active: true + ThrowingExceptionsWithoutMessageOrCause: + active: true + exceptions: 'IllegalArgumentException,IllegalStateException,IOException' + ThrowingNewInstanceOfSameException: + active: true + TooGenericExceptionCaught: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + exceptionNames: + - ArrayIndexOutOfBoundsException + - Error + - Exception + - IllegalMonitorStateException + - NullPointerException + - IndexOutOfBoundsException + - RuntimeException + - Throwable + allowedExceptionNameRegex: "^(_|(ignore|expected).*)" + TooGenericExceptionThrown: + active: true + exceptionNames: + - Error + - Exception + - Throwable + - RuntimeException + +formatting: + active: false + android: false + autoCorrect: true + AnnotationOnSeparateLine: + active: true + autoCorrect: true + ChainWrapping: + active: true + autoCorrect: true + CommentSpacing: + active: true + autoCorrect: true + Filename: + active: true + FinalNewline: + active: true + autoCorrect: true + ImportOrdering: + active: true + autoCorrect: true + Indentation: + active: true + autoCorrect: true + indentSize: 4 + continuationIndentSize: 4 + MaximumLineLength: + active: true + maxLineLength: 120 + ModifierOrdering: + active: true + autoCorrect: true + MultiLineIfElse: + active: true + autoCorrect: true + NoBlankLineBeforeRbrace: + active: true + autoCorrect: true + NoConsecutiveBlankLines: + active: true + autoCorrect: true + NoEmptyClassBody: + active: true + autoCorrect: true + NoLineBreakAfterElse: + active: true + autoCorrect: true + NoLineBreakBeforeAssignment: + active: true + autoCorrect: true + NoMultipleSpaces: + active: true + autoCorrect: true + NoSemicolons: + active: true + autoCorrect: true + NoTrailingSpaces: + active: true + autoCorrect: true + NoUnitReturn: + active: true + autoCorrect: true + NoUnusedImports: + active: true + autoCorrect: true + NoWildcardImports: + active: true + autoCorrect: true + PackageName: + active: true + autoCorrect: true + ParameterListWrapping: + active: true + autoCorrect: true + indentSize: 4 + SpacingAroundColon: + active: true + autoCorrect: true + SpacingAroundComma: + active: true + autoCorrect: true + SpacingAroundCurly: + active: true + autoCorrect: true + SpacingAroundDot: + active: true + autoCorrect: true + SpacingAroundKeyword: + active: true + autoCorrect: true + SpacingAroundOperators: + active: true + autoCorrect: true + SpacingAroundParens: + active: true + autoCorrect: true + SpacingAroundRangeOperator: + active: true + autoCorrect: true + StringTemplate: + active: true + autoCorrect: true + +naming: + active: true + ClassNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + classPattern: '[A-Z$][a-zA-Z0-9$]*' + ConstructorParameterNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + parameterPattern: '[a-z][A-Za-z0-9]*' + privateParameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + EnumNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*' + ForbiddenClassName: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + forbiddenName: '' + FunctionMaxLength: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + maximumFunctionNameLength: 30 + FunctionMinLength: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + minimumFunctionNameLength: 3 + FunctionNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$' + excludeClassPattern: '$^' + ignoreOverridden: true + FunctionParameterNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + parameterPattern: '[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + ignoreOverridden: true + InvalidPackageDeclaration: + active: true + rootPackage: '' + MatchingDeclarationName: + active: true + MemberNameEqualsClassName: + active: true + ignoreOverridden: true + ObjectPropertyNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + constantPattern: '[A-Za-z][_A-Za-z0-9]*' + propertyPattern: '[A-Za-z][_A-Za-z0-9]*' + privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*' + PackageNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + packagePattern: '^[a-z]+(\.[a-z][A-Za-z0-9]*)*$' + TopLevelPropertyNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + constantPattern: '[A-Z][_A-Z0-9]*' + propertyPattern: '[A-Za-z][_A-Za-z0-9]*' + privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*' + VariableMaxLength: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + maximumVariableNameLength: 64 + VariableMinLength: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + minimumVariableNameLength: 1 + VariableNaming: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + variablePattern: '[a-z][A-Za-z0-9]*' + privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*' + excludeClassPattern: '$^' + ignoreOverridden: true + +performance: + active: true + ArrayPrimitive: + active: true + ForEachOnRange: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + SpreadOperator: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + UnnecessaryTemporaryInstantiation: + active: true + +potential-bugs: + active: true + Deprecation: + active: true + DuplicateCaseInWhenExpression: + active: true + EqualsAlwaysReturnsTrueOrFalse: + active: true + EqualsWithHashCodeExist: + active: true + ExplicitGarbageCollectionCall: + active: true + HasPlatformType: + active: true + InvalidRange: + active: true + IteratorHasNextCallsNextMethod: + active: true + IteratorNotThrowingNoSuchElementException: + active: true + LateinitUsage: + active: false + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + excludeAnnotatedProperties: "" + ignoreOnClassesPattern: "" + MissingWhenCase: + active: true + RedundantElseInWhen: + active: true + UnconditionalJumpStatementInLoop: + active: true + UnreachableCode: + active: true + UnsafeCallOnNullableType: + active: true + UnsafeCast: + active: true + UselessPostfixExpression: + active: true + WrongEqualsTypeParameter: + active: true + +style: + active: false + CollapsibleIfStatements: + active: true + DataClassContainsFunctions: + active: true + conversionFunctionPrefix: 'to' + DataClassShouldBeImmutable: + active: true + EqualsNullCall: + active: true + EqualsOnSignatureLine: + active: true + ExplicitItLambdaParameter: + active: true + ExpressionBodySyntax: + active: false + includeLineWrapping: false + ForbiddenComment: + active: true + values: 'TODO:,FIXME:,STOPSHIP:' + allowedPatterns: "" + ForbiddenImport: + active: true + imports: '' + forbiddenPatterns: "" + ForbiddenVoid: + active: true + ignoreOverridden: false + ignoreUsageInGenerics: true + FunctionOnlyReturningConstant: + active: true + ignoreOverridableFunction: true + excludedFunctions: 'describeContents' + excludeAnnotatedFunction: "dagger.Provides" + LibraryCodeMustSpecifyReturnType: + active: true + LoopWithTooManyJumpStatements: + active: true + maxJumpCount: 1 + MagicNumber: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + ignoreNumbers: '-1,0,1,2' + ignoreHashCodeFunction: true + ignorePropertyDeclaration: false + ignoreConstantDeclaration: true + ignoreCompanionObjectPropertyDeclaration: true + ignoreAnnotation: false + ignoreNamedArgument: true + ignoreEnums: false + ignoreRanges: false + MandatoryBracesIfStatements: + active: true + MaxLineLength: + active: true + maxLineLength: 120 + excludePackageStatements: true + excludeImportStatements: true + excludeCommentStatements: false + MayBeConst: + active: true + ModifierOrder: + active: true + NestedClassesVisibility: + active: true + NewLineAtEndOfFile: + active: false + NoTabs: + active: true + OptionalAbstractKeyword: + active: true + OptionalUnit: + active: true + OptionalWhenBraces: + active: true + PreferToOverPairSyntax: + active: true + ProtectedMemberInFinalClass: + active: true + RedundantExplicitType: + active: true + RedundantVisibilityModifierRule: + active: true + ReturnCount: + active: true + max: 2 + excludedFunctions: "equals" + excludeLabeled: false + excludeReturnFromLambda: true + excludeGuardClauses: true + SafeCast: + active: true + SerialVersionUIDInSerializableClass: + active: true + SpacingBetweenPackageAndImports: + active: true + ThrowsCount: + active: true + max: 2 + TrailingWhitespace: + active: true + UnderscoresInNumericLiterals: + active: true + acceptableDecimalLength: 5 + UnnecessaryAbstractClass: + active: true + excludeAnnotatedClasses: "dagger.Module" + UnnecessaryApply: + active: true + UnnecessaryInheritance: + active: true + UnnecessaryLet: + active: true + UnnecessaryParentheses: + active: true + UntilInsteadOfRangeTo: + active: true + UnusedImports: + active: true + UnusedPrivateClass: + active: true + UnusedPrivateMember: + active: true + allowedNames: "(_|ignored|expected|serialVersionUID)" + UseArrayLiteralsInAnnotations: + active: true + UseCheckOrError: + active: true + UseDataClass: + active: true + excludeAnnotatedClasses: "" + allowVars: true + UseIfInsteadOfWhen: + active: true + UseRequire: + active: true + UselessCallOnNotNull: + active: true + UtilityClassWithPublicConstructor: + active: true + VarCouldBeVal: + active: true + WildcardImport: + active: true + excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" + excludeImports: 'java.util.*,kotlinx.android.synthetic.*' diff --git a/packages/logs/android/gradle.properties b/packages/logs/android/gradle.properties new file mode 100644 index 000000000..bf93dff96 --- /dev/null +++ b/packages/logs/android/gradle.properties @@ -0,0 +1,6 @@ +DatadogSdkReactNativeLogs_kotlinVersion=1.8.21 +DatadogSdkReactNativeLogs_minSdkVersion=21 +DatadogSdkReactNativeLogs_compileSdkVersion=33 +DatadogSdkReactNativeLogs_buildToolsVersion=33.0.0 +DatadogSdkReactNativeLogs_targetSdkVersion=33 +android.useAndroidX=true diff --git a/packages/logs/android/gradle/wrapper/gradle-wrapper.jar b/packages/logs/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/packages/logs/android/gradlew.bat b/packages/logs/android/gradlew.bat new file mode 100644 index 000000000..f127cfd49 --- /dev/null +++ b/packages/logs/android/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/packages/logs/android/settings.gradle b/packages/logs/android/settings.gradle new file mode 100644 index 000000000..e48af6b4d --- /dev/null +++ b/packages/logs/android/settings.gradle @@ -0,0 +1,4 @@ +// This is only used for building locally and testing the package. +// If the package is used in an app that contains ":datadog_mobile-react-native" it will be resolved correctly. +include ':datadog_mobile-react-native' +project(':datadog_mobile-react-native').projectDir = new File('../../core/android') diff --git a/packages/logs/android/src/main/AndroidManifest.xml b/packages/logs/android/src/main/AndroidManifest.xml new file mode 100644 index 000000000..99eb8c827 --- /dev/null +++ b/packages/logs/android/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt b/packages/logs/android/src/main/kotlin/com/datadog/reactnative/logs/DdLogsImplementation.kt similarity index 96% rename from packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt rename to packages/logs/android/src/main/kotlin/com/datadog/reactnative/logs/DdLogsImplementation.kt index e88664b72..c8fb12581 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdLogsImplementation.kt +++ b/packages/logs/android/src/main/kotlin/com/datadog/reactnative/logs/DdLogsImplementation.kt @@ -4,13 +4,18 @@ * Copyright 2016-Present Datadog, Inc. */ -package com.datadog.reactnative +package com.datadog.reactnative.logs import com.datadog.android.Datadog import android.util.Log as AndroidLog import com.datadog.android.log.Logger import com.datadog.android.log.Logs import com.datadog.android.log.LogsConfiguration +import com.datadog.reactnative.DatadogWrapper +import com.datadog.reactnative.DatadogSDKWrapper +import com.datadog.reactnative.DatadogSDKWrapperStorage +import com.datadog.reactnative.GlobalState +import com.datadog.reactnative.asCustomEndpoints import com.facebook.react.bridge.Promise import com.facebook.react.bridge.ReadableMap diff --git a/packages/logs/android/src/main/kotlin/com/datadog/reactnative/logs/DdSdkReactNativeLogsPackage.kt b/packages/logs/android/src/main/kotlin/com/datadog/reactnative/logs/DdSdkReactNativeLogsPackage.kt new file mode 100644 index 000000000..8959803c4 --- /dev/null +++ b/packages/logs/android/src/main/kotlin/com/datadog/reactnative/logs/DdSdkReactNativeLogsPackage.kt @@ -0,0 +1,49 @@ +/* + * 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. + */ + +package com.datadog.reactnative.logs + +import com.datadog.reactnative.DatadogSDKWrapper +import com.facebook.react.TurboReactPackage +import com.facebook.react.bridge.LifecycleEventListener +import com.facebook.react.bridge.NativeModule +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.module.model.ReactModuleInfo +import com.facebook.react.module.model.ReactModuleInfoProvider + +/** + * Package of native dd-sdk-reactnative native modules. + */ +class DdSdkReactNativeLogsPackage : TurboReactPackage() { + private val sdkWrapper = DatadogSDKWrapper() + override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? { + return when (name) { + DdLogsImplementation.NAME -> DdLogs(reactContext, sdkWrapper) + else -> null + } + } + + override fun getReactModuleInfoProvider(): ReactModuleInfoProvider { + return ReactModuleInfoProvider { + val isTurboModule: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED + val moduleInfos = listOf( + DdLogsImplementation.NAME, + ).associateWith { + ReactModuleInfo( + it, + it, + false, // canOverrideExistingModule + false, // needsEagerInit + true, // hasConstants + false, // isCxxModule + isTurboModule // isTurboModule + ) + } + + moduleInfos + } + } +} diff --git a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt b/packages/logs/android/src/newarch/kotlin/com/datadog/reactnative/logs/DdLogs.kt similarity index 99% rename from packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt rename to packages/logs/android/src/newarch/kotlin/com/datadog/reactnative/logs/DdLogs.kt index e8a601b8d..c59d87262 100644 --- a/packages/core/android/src/newarch/kotlin/com/datadog/reactnative/DdLogs.kt +++ b/packages/logs/android/src/newarch/kotlin/com/datadog/reactnative/logs/DdLogs.kt @@ -4,7 +4,7 @@ * Copyright 2016-Present Datadog, Inc. */ -package com.datadog.reactnative +package com.datadog.reactnative.logs import com.facebook.react.bridge.Promise import com.facebook.react.bridge.ReactApplicationContext diff --git a/packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt b/packages/logs/android/src/oldarch/kotlin/com/datadog/reactnative/logs/DdLogs.kt similarity index 97% rename from packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt rename to packages/logs/android/src/oldarch/kotlin/com/datadog/reactnative/logs/DdLogs.kt index 7ada3f38b..e845e73a0 100644 --- a/packages/core/android/src/oldarch/kotlin/com/datadog/reactnative/DdLogs.kt +++ b/packages/logs/android/src/oldarch/kotlin/com/datadog/reactnative/logs/DdLogs.kt @@ -4,8 +4,10 @@ * Copyright 2016-Present Datadog, Inc. */ -package com.datadog.reactnative +package com.datadog.reactnative.logs +import com.datadog.reactnative.DatadogSDKWrapper +import com.datadog.reactnative.DatadogWrapper import com.facebook.react.bridge.Promise import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.ReactContextBaseJavaModule diff --git a/packages/logs/ios/Sources/DdLogsImplementation.swift b/packages/logs/ios/Sources/DdLogsImplementation.swift index 11231dc4a..ce89a8286 100644 --- a/packages/logs/ios/Sources/DdLogsImplementation.swift +++ b/packages/logs/ios/Sources/DdLogsImplementation.swift @@ -21,7 +21,8 @@ public class DdLogsImplementation: NSObject { public func enable(configuration: NSDictionary, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void { let logsConfiguration = configuration.asDdSdkConfiguration() let logsConfig = buildLogsConfiguration(configuration: logsConfiguration) - DatadogSDKWrapper.shared.enableLogs(with: logsConfig) + let core = Datadog.sdkInstance(named: CoreRegistry.defaultInstanceName) + Logs.enable(with: logsConfig, in: core) resolve(nil) } diff --git a/packages/logs/package.json b/packages/logs/package.json index 28cd18978..71192f4b7 100644 --- a/packages/logs/package.json +++ b/packages/logs/package.json @@ -23,7 +23,6 @@ "android/build.gradle", "android/detekt.yml", "android/gradle.properties", - "android/consumer-proguard-rules.pro", "android/src/**", "ios/Sources/**", "ios/DatadogSDKReactNativeLogs.xcodeproj/project.xcworkspace/xcsharedata", @@ -87,7 +86,7 @@ ] }, "codegenConfig": { - "name": "DdSDKReactNativeLogs", + "name": "DdLogs", "type": "all", "jsSrcsDir": "./src/specs", "android": { diff --git a/packages/logs/src/DdLogs.ts b/packages/logs/src/DdLogs.ts index 4050467c2..2300e84ce 100644 --- a/packages/logs/src/DdLogs.ts +++ b/packages/logs/src/DdLogs.ts @@ -5,8 +5,8 @@ */ import type { - ErrorSource, - AutoInstrumentationParameters + DdSdkReactNativeConfiguration, + ErrorSource } from '@datadog/mobile-react-native'; import { SdkVerbosity, @@ -54,7 +54,9 @@ class DdLogsWrapper implements DdLogsType { private logEventMapper = generateEventMapper(undefined); private isEnabled = false; - enable = (configuration: AutoInstrumentationParameters): Promise => { + enable = ( + configuration: Partial + ): Promise => { console.log('DDLOGS ENABLE', configuration); if (configuration.logEventMapper) { DdLogs.registerLogEventMapper(configuration.logEventMapper); diff --git a/packages/logs/src/index.tsx b/packages/logs/src/index.tsx index 7aa0c7af8..78053986a 100644 --- a/packages/logs/src/index.tsx +++ b/packages/logs/src/index.tsx @@ -4,5 +4,7 @@ * Copyright 2016-Present Datadog, Inc. */ import { DdLogs } from './DdLogs'; +import type { DdLogsType } from './types'; export { DdLogs }; +export type { DdLogsType }; diff --git a/packages/logs/tsconfig.json b/packages/logs/tsconfig.json index 41716a7dd..3214e0e7d 100644 --- a/packages/logs/tsconfig.json +++ b/packages/logs/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "../../tsconfig" + "extends": "../../tsconfig", } From 9b6273d384a9d1f668da73049192996ae4b145c8 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Tue, 5 Aug 2025 12:45:32 +0200 Subject: [PATCH 8/9] cleanup --- .../kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt | 2 +- packages/core/ios/Sources/DatadogSDKWrapper.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt index 50efeabe6..68b41bd2d 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkNativeInitialization.kt @@ -232,7 +232,7 @@ class DdSdkNativeInitialization internal constructor( return configBuilder.build() } - fun buildSdkConfiguration(configuration: DdSdkConfiguration): Configuration { + private fun buildSdkConfiguration(configuration: DdSdkConfiguration): Configuration { val configBuilder = Configuration.Builder( clientToken = configuration.clientToken, env = configuration.env, diff --git a/packages/core/ios/Sources/DatadogSDKWrapper.swift b/packages/core/ios/Sources/DatadogSDKWrapper.swift index 01efc2644..7d57b3e80 100644 --- a/packages/core/ios/Sources/DatadogSDKWrapper.swift +++ b/packages/core/ios/Sources/DatadogSDKWrapper.swift @@ -44,7 +44,7 @@ public class DatadogSDKWrapper { } // SDK Wrapper - func initialize( + internal func initialize( coreConfiguration: Datadog.Configuration, // loggerConfiguration: DatadogLogs.Logger.Configuration, trackingConsent: TrackingConsent From 5dd7c07841f40994754c89ace1083a1c30b34124 Mon Sep 17 00:00:00 2001 From: Sergio Barrio Date: Tue, 5 Aug 2025 16:14:40 +0200 Subject: [PATCH 9/9] Test globalThis singleton approach on DdLogs module --- packages/logs/src/DdLogs.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/logs/src/DdLogs.ts b/packages/logs/src/DdLogs.ts index 2300e84ce..3ea170708 100644 --- a/packages/logs/src/DdLogs.ts +++ b/packages/logs/src/DdLogs.ts @@ -283,4 +283,10 @@ class DdLogsWrapper implements DdLogsType { } } -export const DdLogs = new DdLogsWrapper(); +const LOGS_SYMBOL = Symbol.for('com.datadog.reactnative.logs'); + +if (!Object.getOwnPropertySymbols(globalThis).includes(LOGS_SYMBOL)) { + globalThis[LOGS_SYMBOL] = new DdLogsWrapper(); +} + +export const DdLogs = globalThis[LOGS_SYMBOL] as DdLogsWrapper;