@dynatrace/react-native-plugin 2.327.1 → 2.327.2

package/README.md

@@ -26,16 +26,16 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
   * Gradle version 7.0+ ([How to update?](#updating-to-gradle-7))
   * Android Gradle plugin version 7.0+
   * Java 11
-  * Kotlin 2.0.21 — see [Kotlin Compatibility Note](#⚠️-kotlin-compatibility-note)
-  * Jetpack Compose 1.4 - 1.9 - see [Compose Compatibility Note](#⚠️-compose-compatibility-note)
+  * Kotlin 2.0.21 - see [Kotlin Compatibility Note](#kotlin-compatibility-note)
+  * Jetpack Compose 1.4 - 1.9 - see [Compose Compatibility Note](#compose-compatibility-note)
 * For iOS users: Minimum iOS 12
 * NodeJS 16.0.0+ since our dependencies require NodeJS 16.0.0
 
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* Android Agent: 8.327.2.1004
-* iOS Agent: 8.327.1.1020
+* Android Agent: 8.327.3.1006
+* iOS Agent: 8.327.2.1022
 
 ## Quick Setup
 
@@ -89,8 +89,8 @@ This agent versions are configured in this plugin:
 * [React Automatic Runtime](#react-automatic-runtime)
 * [Using a second transformer besides the dynatrace transformer](#using-a-second-transformer-besides-the-dynatrace-transformer)
 * [Upgrading project to Gradle 7](#updating-to-gradle-7)
-* [Kotlin Compatibility Note](#⚠️-kotlin-compatibility-note)
-* [Compose Compatibility Note](#⚠️-compose-compatibility-note)
+* [Kotlin Compatibility Note](#kotlin-compatibility-note)
+* [Compose Compatibility Note](#compose-compatibility-note)
 * [Maven Central in top-level gradle file](#maven-central-in-top-level-gradle-file)
 * [Configuration of standalone React Native project](#configuration-of-standalone-react-native-project)
 * [Instrumentation Overhead](#instrumentation-overhead)
@@ -705,7 +705,7 @@ This example shows two *TouchableHighlight*, which will fire the *onPress()* fun
 
 ## New RUM experience preview
 
-> **⚠️ Preview Feature**: The New RUM Experience APIs are currently in preview and may be subject to changes. These APIs provide enhanced event tracking capabilities with the new Dynatrace RUM on Grail feature.
+> **⚠️ Preview Feature**: The New RUM Experience APIs are currently in preview and may be subject to changes. These APIs provide enhanced event tracking capabilities with the new Dynatrace RUM on Grail feature.
 
 The New RUM Experience introduces a set of advanced APIs that allow you to send custom events, modify event data, track exceptions, monitor HTTP requests, and manage view contexts in your React Native application. These APIs provide more granular control over the data captured by Dynatrace and are designed for the next generation RUM capabilities.
 
@@ -960,7 +960,7 @@ pod 'react-native-dynatrace', :path => '../node_modules/@dynatrace/react-native-
 5. Under Build Phases expand the Link Binary With Libraries header.
 6. Scroll down and click + to add a library.
 7. Find and add `libRNDynatrace.a` under the Workspace group.
-8. ⌘+B
+8. ⌘+B
 
 ## Setup for tvOS
 
@@ -1583,7 +1583,7 @@ dependencies {
 
 ```
 
-## ⚠️ Kotlin Compatibility Note
+## Kotlin Compatibility Note
 
 Our Android Agent currently requires **Kotlin 2.0.21**. However, it should be noted that using this version may cause compatibility issues with older versions of React Native and the corresponding `react-native-gradle-plugin` due to, for instance, differences in Kotlin metadata:
 
@@ -1595,7 +1595,7 @@ Kotlin embeds language-specific features that Java doesn't natively support (lik
 
 In summary, ensure your build fulfills our Kotlin 2.0.21 requirement while simultaneously fulfilling the requirements of your React Native version and its `react-native-gradle-plugin`.
 
-## ⚠️ Compose Compatibility Note
+## Compose Compatibility Note
 
 Our Android Agent currently supports **Jetpack Compose 1.4 - 1.9**. If you are using an incompatible version of Jetpack Compose, you may encounter the following error message during build:
 
@@ -1728,8 +1728,14 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
+2.327.2
+* Fixed iOS startup time calculation issues for React Native 0.72 and lower
+* Fixed static properties during auto instrumentation of Touchables
+* Updated Android (8.327.3.1006) & iOS Agent (8.327.2.1022)
+
+
 2.327.1
-* Added [Compose Compatibility Note](#⚠️-compose-compatibility-note)
+* Added [Compose Compatibility Note](#compose-compatibility-note)
 * Added [New RUM experience preview](#new-rum-experience-preview) documentation
 * Fixed iOS crash reporting by delaying the crash by 200ms on iOS to give the Agent enough time to report it
 * Updated Android (8.327.2.1004) & iOS Agent (8.327.1.1020)
@@ -2044,4 +2050,4 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 * Added auto instrumentation for React classes
 
 0.168.0
-* Initial Beta Release
+* Initial Beta Release

package/android/build.gradle

@@ -72,7 +72,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.dynatrace.agent:agent-android:8.327.2.1004'
+	implementation 'com.dynatrace.agent:agent-android:8.327.3.1006'
     implementation "com.facebook.react:react-native:${safeExtGet('reactNative', '+')}"
 }
   

package/files/plugin.gradle

@@ -1,4 +1,4 @@
 // TEMPLATE: plugin-gradle.template
 dependencies {
-	classpath 'com.dynatrace.tools.android:gradle-plugin:8.327.2.1004'
+	classpath 'com.dynatrace.tools.android:gradle-plugin:8.327.3.1006'
 }

package/instrumentation/libs/react-native/Touchables.js

@@ -7,6 +7,15 @@ exports.Button = (0, withOnPressMonitoring_1.withOnPressMonitoring)(ReactNative.
 exports.TouchableOpacity = (0, withOnPressMonitoring_1.withOnPressMonitoring)(ReactNative.TouchableOpacity, 'Touchable');
 exports.TouchableHighlight = (0, withOnPressMonitoring_1.withOnPressMonitoring)(ReactNative.TouchableHighlight, 'Touchable');
 exports.TouchableNativeFeedback = (0, withOnPressMonitoring_1.withOnPressMonitoring)(ReactNative.TouchableNativeFeedback, 'Touchable');
+[
+    'Ripple',
+    'SelectableBackground',
+    'SelectableBackgroundBorderless',
+    'canUseNativeForeground',
+].forEach((prop) => {
+    exports.TouchableNativeFeedback[prop] =
+        ReactNative.TouchableNativeFeedback[prop];
+});
 exports.TouchableWithoutFeedback = (0, withOnPressMonitoring_1.withOnPressMonitoring)(ReactNative.TouchableWithoutFeedback, 'Touchable');
 exports.Text = (0, withOnPressMonitoring_1.withOnPressMonitoring)(ReactNative.Text, 'Text');
 exports.Pressable = (0, withOnPressMonitoring_1.withOnPressMonitoring)(ReactNative.Pressable, 'Pressable');

package/ios/DynatraceRNBridge.mm

@@ -14,8 +14,10 @@
 #import <React/RCTPerformanceLogger.h>
 #import <React/RCTRootView.h>
 #import <cxxreact/ReactMarker.h>
+#import <cxxreact/ReactNativeVersion.h>
 
 #include <chrono>
+#include <type_traits>
 
 @implementation DynatraceRNBridge
 
@@ -59,6 +61,16 @@ bool didEmit;
 */
 int64_t contentAppeared;
 
+/**
+* When the JavaScript bundle started running
+*/
+int64_t runJSBundleStartTime;
+
+/**
+* When the JavaScript bundle stopped running
+*/
+int64_t runJSBundleEndTime;
+
 RCT_EXPORT_MODULE(DynatraceBridge);
 
 - (instancetype) init
@@ -69,10 +81,51 @@ RCT_EXPORT_MODULE(DynatraceBridge);
     hasListeners = NO;
     didEmit = NO;
     contentAppeared = -1;
+    runJSBundleStartTime = -1;
+    runJSBundleEndTime = -1;
+    registerLogTaggedMarkerCallbacks();
   }
   return self;
 }
 
+// We have to make sure facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleEndTime() is always available even for the RN < 72s cases.
+// Relying on the if constexpr else does not work since namespaces get resolved before the if branch in the if constexpr gets discarded.
+// SFINAE does not work for top level symbols in namespaces (because it actually is an error).
+// We cannot use preprocessor directives since we don't have the React Native version as preprocessor macro.
+// We cannot use C++ concepts since C++20 is not available.
+// Thus we provide a fallback definition for StartupLogger.
+// Calling the class methods without a definition cannot happen and won't result in a linker error since the if branch in the if constexpr does not get compiled.
+namespace fallback {
+    class StartupLogger {
+        public:
+        static StartupLogger& getInstance();
+        double getRunJSBundleStartTime();
+        double getRunJSBundleEndTime();
+    };
+}
+
+namespace facebook::react::ReactMarker {
+    using namespace fallback;
+}
+
+int64_t getRunJSBundleStartTime() {
+    if constexpr(facebook::react::ReactNativeVersion.Minor >= 72) {
+        auto time = facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleStartTime();
+        return std::isnan(time) ? -1 : time;
+    } else {
+        return runJSBundleStartTime;
+    }
+}
+
+int64_t getRunJSBundleEndTime() {
+    if constexpr(facebook::react::ReactNativeVersion.Minor >= 72) {
+        auto time = facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleEndTime();
+        return std::isnan(time) ? -1 : time;
+    } else {
+        return runJSBundleEndTime;
+    }
+}
+
 - (NSArray<NSString *> *)supportedEvents {
     return @[EmitAppMeasurementsIdentifier];
 }
@@ -83,21 +136,53 @@ int64_t GetTimestampUnix()
     return millisecondsUTC;
 }
 
+/*
+In RN < 72, logTaggedMarker and logTaggedMarkerBridgeless are lambdas. In RN >= 72, these symbols are functions.
+Relying on an if constexpr else does not work since types get checked before one branch in an if constexpr else gets discarded.
+We cannot use a fallback declaration since since the symbol is declared as a function in RN >=72.
+We cannot use preprocessor directives since we don't have the React Native version as preprocessor macro.
+We cannot use C++ concepts since C++20 is not available.
+Thus we use SFINAE. This works since types only get checked after template resolution.
+*/
+template<typename T = void> std::enable_if_t<(facebook::react::ReactNativeVersion.Minor < 72), T> registerLogTaggedMarkerCallbacks() {
+    using namespace facebook::react::ReactMarker;
+    auto logTaggedMarkerCommon = [](const ReactMarkerId markerId, const char* tag, auto previousLogTaggedMarker) {
+        if (previousLogTaggedMarker) {
+            previousLogTaggedMarker(markerId, tag); 
+        }
+
+        if (markerId == RUN_JS_BUNDLE_START) {
+            runJSBundleStartTime = GetTimestampUnix(); 
+        } else if (markerId == RUN_JS_BUNDLE_STOP) {
+            runJSBundleEndTime = GetTimestampUnix(); 
+        }
+    };
+
+    auto previousLogTaggedMarker = logTaggedMarker;
+    logTaggedMarker = [=](const ReactMarkerId markerId, const char* tag) {
+        logTaggedMarkerCommon(markerId, tag, previousLogTaggedMarker);
+    };
+
+    auto previousLogTaggedMarkerBridgeless = logTaggedMarkerBridgeless;
+    logTaggedMarkerBridgeless = [=](const ReactMarkerId markerId, const char* tag) {
+        logTaggedMarkerCommon(markerId, tag, previousLogTaggedMarkerBridgeless);
+    };
+}
+
+template<typename T = void> std::enable_if_t<(facebook::react::ReactNativeVersion.Minor >= 72), T> registerLogTaggedMarkerCallbacks() {}
+
 /**
 * When bridge is starting we will add an observer for content did appear so we can emit our app start measurements
 */
 - (void)setBridge:(RCTBridge *)bridge
 {
     [super setBridge:bridge];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(contentAppeared)
-                                                 name:RCTContentDidAppearNotification
-                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(contentAppeared) name:RCTContentDidAppearNotification object:nil];
 }
 
 - (BOOL)isReady
 {
-    return contentAppeared != -1 && !std::isnan(facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleEndTime());
+    return contentAppeared != -1 && getRunJSBundleEndTime() != -1;  
 }
 
 - (void) contentAppeared
@@ -116,8 +201,8 @@ int64_t GetTimestampUnix()
         
         NSMutableDictionary<NSString*, NSNumber*> *appStartMeasurements = [[NSMutableDictionary alloc] init];
         
-        [appStartMeasurements setObject:[self correctionOfTimestamp:facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleStartTime()] forKey:RunJSBundleStart];
-        [appStartMeasurements setObject:[self correctionOfTimestamp:facebook::react::ReactMarker::StartupLogger::getInstance().getRunJSBundleEndTime()] forKey:RunJSBundleEnd];
+        [appStartMeasurements setObject:[self correctionOfTimestamp:getRunJSBundleStartTime()] forKey:RunJSBundleStart];
+        [appStartMeasurements setObject:[self correctionOfTimestamp:getRunJSBundleEndTime()] forKey:RunJSBundleEnd];
         [appStartMeasurements setObject:[NSNumber numberWithLongLong:contentAppeared] forKey:ContentAppeared];
         
         if (hasListeners) {
@@ -128,7 +213,13 @@ int64_t GetTimestampUnix()
 
 - (NSNumber* )correctionOfTimestamp:(int64_t) timestamp
 {
-    return [NSNumber numberWithLongLong:timestamp + GetTimestampUnix() - (CACurrentMediaTime() * 1000)];
+    if constexpr (facebook::react::ReactNativeVersion.Minor < 72) {
+         // In RN < 72, timestamps are unix timestamps
+        return [NSNumber numberWithLongLong:timestamp];
+    } else {
+        // IN RN >= 72, timestamps are relative to the system start, which is we we add the unix timestamp of the system start
+        return [NSNumber numberWithLongLong:timestamp + GetTimestampUnix() - (CACurrentMediaTime() * 1000)];
+    }
 }
 
 /**

package/lib/next/appstart/AppStartObserver.js

@@ -15,20 +15,17 @@ class AppStartObserverImpl {
     call() {
     }
     setupNativeEventEmitter() {
-        if (react_native_1.Platform.OS === 'android' ||
-            Object.keys(DynatraceBridge_1.DynatraceNative).length !== 0) {
-            const emitter = new react_native_1.NativeEventEmitter(DynatraceBridge_1.DynatraceNative);
-            emitter.addListener(this.EMIT_APP_START, (data) => {
-                this.logger.debug(`emitter(${JSON.stringify(data)}})`);
-                const appStartEvent = (0, EventCreator_1.createAppStartEvent)(data);
-                if (appStartEvent != null) {
-                    EventPipeline_1.EventPipeline.insertEvent(Object.assign({}, appStartEvent));
-                }
-                else {
-                    this.logger.debug(`emitter(${JSON.stringify(data)}}): App Start event ignored!`);
-                }
-            });
-        }
+        const emitter = new react_native_1.NativeEventEmitter(DynatraceBridge_1.DynatraceNative);
+        emitter.addListener(this.EMIT_APP_START, (data) => {
+            this.logger.debug(`emitter(${JSON.stringify(data)}})`);
+            const appStartEvent = (0, EventCreator_1.createAppStartEvent)(data);
+            if (appStartEvent != null) {
+                EventPipeline_1.EventPipeline.insertEvent(Object.assign({}, appStartEvent));
+            }
+            else {
+                this.logger.debug(`emitter(${JSON.stringify(data)}}): App Start event ignored!`);
+            }
+        });
     }
 }
 exports.AppStartObserver = new AppStartObserverImpl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace/react-native-plugin",
-  "version": "2.327.1",
+  "version": "2.327.2",
   "description": "This plugin gives you the ability to use the Dynatrace Mobile agent in your react native application.",
   "main": "index.js",
   "types": "types.d.ts",

package/react-native-dynatrace.podspec

@@ -111,7 +111,7 @@ Pod::Spec.new do |s|
   #
   
   s.dependency "React"
-  s.dependency 'Dynatrace', '~> 8.327.1.1020'
+  s.dependency 'Dynatrace', '~> 8.327.2.1022'
 
   # Allows for better compatibility for older and newer versions
   if defined?(install_modules_dependencies)