@datadog/mobile-react-native 2.10.0 → 2.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,7 +10,9 @@ import android.content.Context
10
10
  import android.util.Log
11
11
  import com.datadog.android.Datadog
12
12
  import com.datadog.android._InternalProxy
13
+ import com.datadog.android.api.InternalLogger
13
14
  import com.datadog.android.api.SdkCore
15
+ import com.datadog.android.api.feature.FeatureSdkCore
14
16
  import com.datadog.android.core.InternalSdkCore
15
17
  import com.datadog.android.core.configuration.Configuration
16
18
  import com.datadog.android.log.Logs
@@ -23,6 +25,7 @@ import com.datadog.android.rum.RumMonitor
23
25
  import com.datadog.android.trace.Trace
24
26
  import com.datadog.android.trace.TraceConfiguration
25
27
  import com.datadog.android.webview.WebViewTracking
28
+ import com.facebook.react.bridge.ReadableMap
26
29
 
27
30
  /**
28
31
  * Internal object used to add internal testing.
@@ -157,6 +160,22 @@ internal class DatadogSDKWrapper : DatadogWrapper {
157
160
  Datadog.setTrackingConsent(trackingConsent)
158
161
  }
159
162
 
163
+ override fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap) {
164
+ val core = DatadogSDKWrapperStorage.getSdkCore() as FeatureSdkCore?
165
+ val logger = core?.internalLogger;
166
+
167
+ val additionalProperties = attributes.toMap()
168
+ val telemetryConfig = config.toMap()
169
+
170
+ logger?.log(
171
+ level = InternalLogger.Level.INFO,
172
+ target = InternalLogger.Target.TELEMETRY,
173
+ messageBuilder = { message },
174
+ onlyOnce = (telemetryConfig["onlyOnce"] as? Boolean) ?: true,
175
+ additionalProperties = additionalProperties
176
+ )
177
+ }
178
+
160
179
  override fun telemetryDebug(message: String) {
161
180
  telemetryProxy?.debug(message)
162
181
  }
@@ -13,6 +13,8 @@ import com.datadog.android.privacy.TrackingConsent
13
13
  import com.datadog.android.rum.RumConfiguration
14
14
  import com.datadog.android.rum.RumMonitor
15
15
  import com.datadog.android.trace.TraceConfiguration
16
+ import com.facebook.react.bridge.Promise
17
+ import com.facebook.react.bridge.ReadableMap
16
18
  import java.lang.IllegalArgumentException
17
19
 
18
20
  /**
@@ -142,6 +144,12 @@ interface DatadogWrapper {
142
144
  */
143
145
  fun setTrackingConsent(trackingConsent: TrackingConsent)
144
146
 
147
+
148
+ /**
149
+ * Sends telemetry event with attributes.
150
+ */
151
+ fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap)
152
+
145
153
  /**
146
154
  * Sends telemetry debug event.
147
155
  */
@@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit
20
20
  import java.util.concurrent.atomic.AtomicBoolean
21
21
 
22
22
  /** The entry point to initialize Datadog's features. */
23
+ @Suppress("TooManyFunctions")
23
24
  class DdSdkImplementation(
24
25
  private val reactContext: ReactApplicationContext,
25
26
  private val datadog: DatadogWrapper = DatadogSDKWrapper(),
@@ -60,7 +61,6 @@ class DdSdkImplementation(
60
61
  configureSynthetics()
61
62
 
62
63
  initialized.set(true)
63
-
64
64
  promise.resolve(null)
65
65
  }
66
66
 
@@ -138,6 +138,17 @@ class DdSdkImplementation(
138
138
  promise.resolve(null)
139
139
  }
140
140
 
141
+
142
+ /**
143
+ * Convert React Native's ReadableMap to Map.
144
+ * @param attributes Custom attributes we want to send along with the Telemetry Log
145
+ * @param config Configuration object, can take 'onlyOnce: Boolean'
146
+ */
147
+ fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap, promise: Promise) {
148
+ datadog.sendTelemetryLog(message, attributes, config)
149
+ promise.resolve(null)
150
+ }
151
+
141
152
  /**
142
153
  * Sends a telemetry debug event.
143
154
  * @param message Debug message.
@@ -60,6 +60,11 @@ internal class DdSdkSessionStartedListener private constructor(): RumSessionList
60
60
  this.exceptionHandler = exceptionHandler
61
61
  }
62
62
 
63
+ @TestOnly
64
+ fun setIsNewArchitecture(isNewArch: Boolean) {
65
+ this.isNewArchitecture = isNewArch
66
+ }
67
+
63
68
  private fun hasValidBridge(): Boolean {
64
69
  val context = reactContext ?: return false
65
70
  val instance = context.catalystInstance ?: return false
@@ -7,4 +7,4 @@
7
7
  package com.datadog.reactnative
8
8
 
9
9
  // This is automatically updated by the update-version.sh script
10
- internal const val SDK_VERSION = "2.10.0"
10
+ internal const val SDK_VERSION = "2.10.1"
@@ -88,6 +88,17 @@ class DdSdk(
88
88
  implementation.setTrackingConsent(trackingConsent, promise)
89
89
  }
90
90
 
91
+ /**
92
+ * Sends a telemetry event with attributes.
93
+ * @param message message.
94
+ * @param attributes telemetry attributes.
95
+ * @param config telemetry configuration.
96
+ */
97
+ @ReactMethod
98
+ override fun sendTelemetryLog(message: String, attributes: ReadableMap, config: ReadableMap, promise: Promise) {
99
+ implementation.sendTelemetryLog(message, attributes, config, promise)
100
+ }
101
+
91
102
  /**
92
103
  * Sends a telemetry debug event.
93
104
  * @param message Debug message.
@@ -109,6 +109,22 @@ class DdSdk(
109
109
  implementation.setTrackingConsent(trackingConsent, promise)
110
110
  }
111
111
 
112
+ /**
113
+ * Sends a telemetry event with attributes.
114
+ * @param message message.
115
+ * @param attributes telemetry attributes.
116
+ * @param config telemetry configuration.
117
+ */
118
+ @ReactMethod
119
+ fun sendTelemetryLog(
120
+ message: String,
121
+ attributes: ReadableMap,
122
+ config: ReadableMap,
123
+ promise: Promise
124
+ ) {
125
+ implementation.sendTelemetryLog(message, attributes, config, promise)
126
+ }
127
+
112
128
  /**
113
129
  * Sends a telemetry debug event.
114
130
  * @param message Debug message.
@@ -90,6 +90,7 @@ internal class DdSdkSessionStartedListenerTest {
90
90
  val instance = DdSdkSessionStartedListener.getInstance()
91
91
  instance.setReactContext(mockReactContext)
92
92
  instance.setExceptionHandler(mockExceptionHandler)
93
+ instance.setIsNewArchitecture(false)
93
94
 
94
95
  val passedArgs = mutableListOf<String>()
95
96
  instance.setConvertToNativeArray {
@@ -124,6 +125,7 @@ internal class DdSdkSessionStartedListenerTest {
124
125
 
125
126
  val mockConvertToNativeArray = mock<(array: Array<String>) -> NativeArray?>()
126
127
  instance.setConvertToNativeArray(mockConvertToNativeArray)
128
+ instance.setIsNewArchitecture(false)
127
129
 
128
130
  // WHEN
129
131
  instance.onSessionStarted("TEST-SESSION-ID", false)
@@ -111,8 +111,17 @@ public class DatadogSDKWrapper {
111
111
 
112
112
  return DatadogLogs.Logger.create(with: loggerConfiguration, in: core)
113
113
  }
114
-
114
+
115
115
  // Telemetry
116
+ internal func sendTelemetryLog(message: String, attributes: [String: any Encodable], config: [String: any Encodable]) {
117
+ if let core = coreInstance {
118
+ let id = (config["onlyOnce"] as? Bool) == true ? message : UUID().uuidString
119
+ core.telemetry.debug(id: id, message: message, attributes: attributes)
120
+ } else {
121
+ consolePrint("Core instance was not found when calling sendTelemetryLog.", .warn)
122
+ }
123
+ }
124
+
116
125
  internal func telemetryDebug(id: String, message: String) {
117
126
  return Datadog._internal.telemetry.debug(id: id, message: message)
118
127
  }
@@ -213,7 +213,7 @@ public class DdRumImplementation: NSObject {
213
213
 
214
214
  private func attributes(from context: NSDictionary, with timestampMs: Double) -> [String: Encodable] {
215
215
  var context = context as? [String: Any] ?? [:]
216
- context[Self.timestampKey] = timestampMs
216
+ context[Self.timestampKey] = Int64(timestampMs)
217
217
  return castAttributesToSwift(context)
218
218
  }
219
219
 
@@ -94,6 +94,15 @@ RCT_REMAP_METHOD(clearAllData, withResolver:(RCTPromiseResolveBlock)resolve
94
94
  [self clearAllData:resolve reject:reject];
95
95
  }
96
96
 
97
+ RCT_REMAP_METHOD(sendTelemetryLog, withMessage:(NSString*)message
98
+ withAttributes: (NSDictionary *)attributes
99
+ withConfig:(NSDictionary *)config
100
+ withResolver:(RCTPromiseResolveBlock)resolve
101
+ withRejecter:(RCTPromiseRejectBlock)reject)
102
+ {
103
+ [self sendTelemetryLog:message attributes:attributes config:config resolve:resolve reject:reject];
104
+ }
105
+
97
106
  - (instancetype)init {
98
107
  self = [super init];
99
108
  if (self) {
@@ -147,6 +156,10 @@ RCT_REMAP_METHOD(clearAllData, withResolver:(RCTPromiseResolveBlock)resolve
147
156
  [self.ddSdkImplementation addUserExtraInfoWithExtraInfo:extraInfo resolve:resolve reject:reject];
148
157
  }
149
158
 
159
+ - (void)sendTelemetryLog:(NSString *)message attributes:(NSDictionary *)attributes config:(NSDictionary *)config resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
160
+ [self.ddSdkImplementation sendTelemetryLogWithMessage:message attributes:attributes config:config resolve:resolve reject:reject];
161
+ }
162
+
150
163
  - (void)telemetryDebug:(NSString *)message resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
151
164
  [self.ddSdkImplementation telemetryDebugWithMessage:message resolve:resolve reject:reject];
152
165
  }
@@ -128,6 +128,15 @@ public class DdSdkImplementation: NSObject {
128
128
  resolve(nil)
129
129
  }
130
130
 
131
+
132
+ @objc
133
+ public func sendTelemetryLog(message: NSString, attributes: NSDictionary, config: NSDictionary, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
134
+ let castedAttributes = castAttributesToSwift(attributes)
135
+ let castedConfig = castAttributesToSwift(config)
136
+ DatadogSDKWrapper.shared.sendTelemetryLog(message: message as String, attributes: castedAttributes, config: castedConfig)
137
+ resolve(nil)
138
+ }
139
+
131
140
  @objc
132
141
  public func telemetryDebug(message: NSString, resolve:RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
133
142
  DatadogSDKWrapper.shared.telemetryDebug(id: "datadog_react_native:\(message)", message: message as String)
@@ -7,4 +7,4 @@
7
7
  import Foundation
8
8
 
9
9
  // This is automatically updated by the update-version.sh script
10
- let SdkVersion = "2.10.0"
10
+ let SdkVersion = "2.10.1"
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","get"],"sourceRoot":"../../../src","sources":["specs/NativeDdSdk.ts"],"mappings":";;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AARA;AACA;AACA;AACA;AACA;AAEA;AAIA;AACA;AACA;AA+EA;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACeC,gCAAmB,CAACC,GAAG,CAAO,OAAO,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","get"],"sourceRoot":"../../../src","sources":["specs/NativeDdSdk.ts"],"mappings":";;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AARA;AACA;AACA;AACA;AACA;AAEA;AAIA;AACA;AACA;AA0FA;AAAA,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACeC,gCAAmB,CAACC,GAAG,CAAO,OAAO,CAAC","ignoreList":[]}
@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = void 0;
7
7
  // generated by genversion
8
- const version = exports.version = '2.10.0';
8
+ const version = exports.version = '2.10.1';
9
9
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["TurboModuleRegistry","get"],"sourceRoot":"../../../src","sources":["specs/NativeDdSdk.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,SAASA,mBAAmB,QAAQ,cAAc;;AAElD;AACA;AACA;;AA+EA;AACA,eAAeA,mBAAmB,CAACC,GAAG,CAAO,OAAO,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["TurboModuleRegistry","get"],"sourceRoot":"../../../src","sources":["specs/NativeDdSdk.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAEA;;AAEA,SAASA,mBAAmB,QAAQ,cAAc;;AAElD;AACA;AACA;;AA0FA;AACA,eAAeA,mBAAmB,CAACC,GAAG,CAAO,OAAO,CAAC","ignoreList":[]}
@@ -1,3 +1,3 @@
1
1
  // generated by genversion
2
- export const version = '2.10.0';
2
+ export const version = '2.10.1';
3
3
  //# sourceMappingURL=version.js.map
@@ -38,6 +38,12 @@ export interface Spec extends TurboModule {
38
38
  * @param trackingConsent: Consent, which can take one of the following values: 'pending', 'granted', 'not_granted'.
39
39
  */
40
40
  setTrackingConsent(trackingConsent: string): Promise<void>;
41
+ /**
42
+ * Sends internal telemetry message with attributes
43
+ * @param message message
44
+ * @param attributes attributes
45
+ */
46
+ sendTelemetryLog(message: string, attributes: Object, config: Object): Promise<void>;
41
47
  /**
42
48
  * Sends internal telemetry debug message
43
49
  * @param message debug message
@@ -1 +1 @@
1
- {"version":3,"file":"NativeDdSdk.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeDdSdk.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD;;GAEG;AAEH,MAAM,MAAM,sBAAsB,GAAG;IACjC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACrC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAEhC;;;OAGG;IACH,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;OAGG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEvC;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAErD;;;OAGG;IACH,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C;;;;;OAKG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E;;;OAGG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;OAEG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;OAGG;IACH,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;;AAGD,wBAAsD"}
1
+ {"version":3,"file":"NativeDdSdk.d.ts","sourceRoot":"","sources":["../../../src/specs/NativeDdSdk.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD;;GAEG;AAEH,MAAM,MAAM,sBAAsB,GAAG;IACjC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACrC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAEhC;;;OAGG;IACH,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;OAGG;IACH,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEvC;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAErD;;;OAGG;IACH,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3D;;;;OAIG;IACH,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C;;;;;OAKG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E;;;OAGG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;OAEG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;OAGG;IACH,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;;AAGD,wBAAsD"}
@@ -1,2 +1,2 @@
1
- export declare const version = "2.10.0";
1
+ export declare const version = "2.10.1";
2
2
  //# sourceMappingURL=version.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datadog/mobile-react-native",
3
- "version": "2.10.0",
3
+ "version": "2.10.1",
4
4
  "description": "A client-side React Native module to interact with Datadog",
5
5
  "keywords": [
6
6
  "datadog",
@@ -118,5 +118,5 @@
118
118
  "dependencies": {
119
119
  "big-integer": "^1.6.52"
120
120
  },
121
- "gitHead": "dc5004b9971ffa1152916bea19a17d3202e004f0"
121
+ "gitHead": "199a93a4c9e6c7f1adeaa4411250ca9e5b78b80a"
122
122
  }
@@ -0,0 +1 @@
1
+ expected-debug-id
@@ -56,6 +56,17 @@ export interface Spec extends TurboModule {
56
56
  */
57
57
  setTrackingConsent(trackingConsent: string): Promise<void>;
58
58
 
59
+ /**
60
+ * Sends internal telemetry message with attributes
61
+ * @param message message
62
+ * @param attributes attributes
63
+ */
64
+ sendTelemetryLog(
65
+ message: string,
66
+ attributes: Object,
67
+ config: Object
68
+ ): Promise<void>;
69
+
59
70
  /**
60
71
  * Sends internal telemetry debug message
61
72
  * @param message debug message
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  // generated by genversion
2
- export const version = '2.10.0';
2
+ export const version = '2.10.1';