Merge pull request #469 from DataDog/louiszawadzki/send-react-react-native-versions-to-telemetry

Send react and react-native versions to telemetry

Author: louiszawadzki

packages/core/android/build.gradle

@@ -146,7 +146,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   compileOnly "com.squareup.okhttp3:okhttp:3.12.13"
 
-  implementation "com.datadoghq:dd-sdk-android:1.18.1"
+  implementation "com.datadoghq:dd-sdk-android:1.19.0"
   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"

packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdk.kt

@@ -303,6 +303,10 @@ class DdSdk(
                         configuration.configurationForTelemetry?.trackNetworkRequests
                     event.telemetry.configuration.trackNetworkRequests =
                         configuration.configurationForTelemetry?.trackNetworkRequests
+                    event.telemetry.configuration.reactVersion =
+                        configuration.configurationForTelemetry?.reactVersion
+                    event.telemetry.configuration.reactNativeVersion =
+                        configuration.configurationForTelemetry?.reactNativeVersion
 
                     return event
                 }

packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfiguration.kt

@@ -46,10 +46,14 @@ data class DdSdkConfiguration(
  * @param trackErrors Whether JS errors are tracked.
  * @param trackInteractions Whether interactions are tracked.
  * @param trackNetworkRequests Whether network requests are tracked.
+ * @param reactVersion Version of react used in app.
+ * @param reactNativeVersion Version of react-native used in app.
  */
 data class ConfigurationForTelemetry(
     val initializationType: String? = null,
     val trackErrors: Boolean? = null,
     val trackInteractions: Boolean? = null,
-    val trackNetworkRequests: Boolean? = null
+    val trackNetworkRequests: Boolean? = null,
+    val reactVersion: String? = null,
+    val reactNativeVersion: String? = null
 )

packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt

@@ -38,6 +38,8 @@ internal fun ReadableMap.asConfigurationForTelemetry(): ConfigurationForTelemetr
         trackErrors = getBoolean("trackErrors"),
         trackInteractions = getBoolean("trackInteractions"),
         trackNetworkRequests = getBoolean("trackNetworkRequests"),
+        reactVersion = getString("reactVersion"),
+        reactNativeVersion = getString("reactNativeVersion"),
     )
 }
 
@@ -78,5 +80,7 @@ internal fun ConfigurationForTelemetry.toReadableMap(): ReadableMap {
     trackErrors?.let { map.putBoolean("trackErrors", it) }
     trackInteractions?.let { map.putBoolean("trackInteractions", it) }
     trackNetworkRequests?.let { map.putBoolean("trackNetworkRequests", it) }
+    reactVersion?.let { map.putString("reactVersion", it) }
+    reactNativeVersion?.let { map.putString("reactNativeVersion", it) }
     return map
 }

packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt

@@ -1827,7 +1827,9 @@ internal class DdSdkTest {
         @StringForgery initializationType: String,
         @BoolForgery trackInteractions: Boolean,
         @BoolForgery trackErrors: Boolean,
-        @BoolForgery trackNetworkRequests: Boolean
+        @BoolForgery trackNetworkRequests: Boolean,
+        @StringForgery reactVersion: String,
+        @StringForgery reactNativeVersion: String
     ) {
         // Given
         val bridgeConfiguration = configuration.copy(
@@ -1838,7 +1840,9 @@ internal class DdSdkTest {
                 initializationType = initializationType,
                 trackErrors = trackErrors,
                 trackInteractions = trackInteractions,
-                trackNetworkRequests = trackNetworkRequests
+                trackNetworkRequests = trackNetworkRequests,
+                reactVersion = reactVersion,
+                reactNativeVersion = reactNativeVersion
             )
         )
         val configCaptor = argumentCaptor<Configuration>()

packages/core/android/src/test/kotlin/com/datadog/tools/unit/DdSdkConfigurationExt.kt

@@ -73,5 +73,7 @@ internal fun ConfigurationForTelemetry.toReadableJavaOnlyMap(): ReadableMap {
     trackErrors?.let { map.put("trackErrors", it) }
     trackInteractions?.let { map.put("trackInteractions", it) }
     trackNetworkRequests?.let { map.put("trackNetworkRequests", it) }
+    reactVersion?.let { map.put("reactVersion", it) }
+    reactNativeVersion?.let { map.put("reactNativeVersion", it) }
     return map.toReadableMap()
 }

packages/core/android/src/test/kotlin/com/datadog/tools/unit/forge/DdSdkConfigurationForgeryFactory.kt

@@ -46,7 +46,9 @@ class DdSdkConfigurationForgeryFactory : ForgeryFactory<DdSdkConfiguration> {
                 initializationType = forge.anAlphabeticalString(),
                 trackErrors = forge.aBool(),
                 trackInteractions = forge.aBool(),
-                trackNetworkRequests = forge.aBool()
+                trackNetworkRequests = forge.aBool(),
+                reactVersion = forge.aString(),
+                reactNativeVersion = forge.aString(),
             ),
             trackFrustrations = forge.aNullable { aBool() },
         )

packages/core/ios/Sources/DdSdk.swift

@@ -136,6 +136,8 @@ class RNDdSdk: NSObject {
             configuration.trackInteractions = rnConfiguration.configurationForTelemetry?.trackInteractions
             configuration.trackResources = rnConfiguration.configurationForTelemetry?.trackNetworkRequests
             configuration.trackNetworkRequests = rnConfiguration.configurationForTelemetry?.trackNetworkRequests
+            configuration.reactVersion = rnConfiguration.configurationForTelemetry?.reactVersion as? String
+            configuration.reactNativeVersion = rnConfiguration.configurationForTelemetry?.reactNativeVersion as? String
 
             // trackCrossPlatformLongTasks will be deprecated for trackLongTask
             configuration.trackCrossPlatformLongTasks = rnConfiguration.longTaskThresholdMs != 0

packages/core/ios/Sources/DdSdkConfiguration.swift

@@ -79,16 +79,22 @@ public class ConfigurationForTelemetry: NSObject {
     public var trackErrors: Bool?
     public var trackInteractions: Bool?
     public var trackNetworkRequests: Bool?
+    public var reactVersion: NSString?
+    public var reactNativeVersion: NSString?
 
     public init(
         initializationType: NSString?,
         trackErrors: Bool?,
         trackInteractions: Bool?,
-        trackNetworkRequests: Bool?
+        trackNetworkRequests: Bool?,
+        reactVersion: NSString?,
+        reactNativeVersion: NSString?
     ) {
         self.initializationType = initializationType
         self.trackErrors = trackErrors
         self.trackInteractions = trackInteractions
         self.trackNetworkRequests = trackNetworkRequests
+        self.reactVersion = reactVersion
+        self.reactNativeVersion = reactNativeVersion
     }
 }

packages/core/ios/Sources/RNDdSdkConfiguration.swift

@@ -47,12 +47,16 @@ extension NSDictionary {
         let trackErrors = object(forKey: "trackErrors") as? Bool
         let trackInteractions = object(forKey: "trackInteractions") as? Bool
         let trackNetworkRequests = object(forKey: "trackNetworkRequests") as? Bool
+        let reactVersion = object(forKey: "reactVersion") as? NSString
+        let reactNativeVersion = object(forKey: "reactNativeVersion") as? NSString
 
         return ConfigurationForTelemetry(
             initializationType: initializationType,
             trackErrors: trackErrors,
             trackInteractions: trackInteractions,
-            trackNetworkRequests: trackNetworkRequests
+            trackNetworkRequests: trackNetworkRequests,
+            reactVersion: reactVersion,
+            reactNativeVersion: reactNativeVersion
         )
     }
 }