@sentry/react-native 3.2.9 → 3.2.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.2.10
+
+- fix: Do not crash if androidx.core isn't available on Android #1981
+- fix: App start measurement on Android #1985
+- Bump: Sentry Android to 5.5.2 #1985
+
 ## 3.2.9
 
 - Deprecate initialScope in favor of configureScope #1963

package/android/build.gradle

@@ -24,5 +24,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:5.5.1'
+    api 'io.sentry:sentry-android:5.5.2'
 }

package/android/src/main/java/io/sentry/react/RNSentryModule.java

@@ -52,20 +52,21 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
 
     public static final String NAME = "RNSentry";
 
-    final static Logger logger = Logger.getLogger("react-native-sentry");
+    private static final Logger logger = Logger.getLogger("react-native-sentry");
 
-    private static PackageInfo packageInfo;
-    private static boolean didFetchAppStart = false;
-    private static FrameMetricsAggregator frameMetricsAggregator = null;
+    private PackageInfo packageInfo = null;
+    private boolean didFetchAppStart;
+    private FrameMetricsAggregator frameMetricsAggregator = null;
+    private boolean androidXAvailable = true;
 
     // 700ms to constitute frozen frames.
-    private final int FROZEN_FRAME_THRESHOLD = 700;
+    private static final int FROZEN_FRAME_THRESHOLD = 700;
     // 16ms (slower than 60fps) to constitute slow frames.
-    private final int SLOW_FRAME_THRESHOLD = 16;
+    private static final int SLOW_FRAME_THRESHOLD = 16;
 
     public RNSentryModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        RNSentryModule.packageInfo = getPackageInfo(reactContext);
+        packageInfo = getPackageInfo(reactContext);
     }
 
     @Override
@@ -130,17 +131,23 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
             }
             if (rnOptions.hasKey("enableAutoPerformanceTracking")
                     && rnOptions.getBoolean("enableAutoPerformanceTracking")) {
-                RNSentryModule.frameMetricsAggregator = new FrameMetricsAggregator();
-                Activity currentActivity = getCurrentActivity();
-
-                if (currentActivity != null) {
-                    try {
-                        RNSentryModule.frameMetricsAggregator.add(currentActivity);
-                    } catch (Throwable ignored) {
-                        // throws ConcurrentModification when calling addOnFrameMetricsAvailableListener
-                        // this is a best effort since we can't reproduce it
-                        logger.warning("Error adding Activity to frameMetricsAggregator.");
+                androidXAvailable = checkAndroidXAvailability();
+
+                if (androidXAvailable) {
+                    frameMetricsAggregator = new FrameMetricsAggregator();
+                    final Activity currentActivity = getCurrentActivity();
+
+                    if (frameMetricsAggregator != null && currentActivity != null) {
+                        try {
+                            frameMetricsAggregator.add(currentActivity);
+                        } catch (Throwable ignored) {
+                            // throws ConcurrentModification when calling addOnFrameMetricsAvailableListener
+                            // this is a best effort since we can't reproduce it
+                            logger.warning("Error adding Activity to frameMetricsAggregator.");
+                        }
                     }
+                } else {
+                    logger.warning("androidx.core' isn't available as a dependency.");
                 }
             } else {
                 this.disableNativeFramesTracking();
@@ -199,8 +206,13 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
     public void fetchNativeAppStart(Promise promise) {
         final AppStartState appStartInstance = AppStartState.getInstance();
         final Date appStartTime = appStartInstance.getAppStartTime();
+        final Boolean isColdStart = appStartInstance.isColdStart();
 
         if (appStartTime == null) {
+            logger.warning("App start won't be sent due to missing appStartTime.");
+            promise.resolve(null);
+        } else if (isColdStart == null) {
+            logger.warning("App start won't be sent due to missing isColdStart.");
             promise.resolve(null);
         } else {
             final double appStartTimestamp = (double) appStartTime.getTime();
@@ -208,15 +220,15 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
             WritableMap appStart = Arguments.createMap();
 
             appStart.putDouble("appStartTime", appStartTimestamp);
-            appStart.putBoolean("isColdStart", appStartInstance.isColdStart());
-            appStart.putBoolean("didFetchAppStart", RNSentryModule.didFetchAppStart);
+            appStart.putBoolean("isColdStart", isColdStart);
+            appStart.putBoolean("didFetchAppStart", didFetchAppStart);
 
             promise.resolve(appStart);
         }
         // This is always set to true, as we would only allow an app start fetch to only
         // happen once in the case of a JS bundle reload, we do not want it to be
         // instrumented again.
-        RNSentryModule.didFetchAppStart = true;
+        didFetchAppStart = true;
     }
 
     /**
@@ -224,7 +236,7 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
      */
     @ReactMethod
     public void fetchNativeFrames(Promise promise) {
-        if (RNSentryModule.frameMetricsAggregator == null) {
+        if (!isFrameMetricsAggregatorAvailable()) {
             promise.resolve(null);
         } else {
             try {
@@ -232,7 +244,7 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
                 int slowFrames = 0;
                 int frozenFrames = 0;
 
-                final SparseIntArray[] framesRates = RNSentryModule.frameMetricsAggregator.getMetrics();
+                final SparseIntArray[] framesRates = frameMetricsAggregator.getMetrics();
 
                 if (framesRates != null) {
                     final SparseIntArray totalIndexArray = framesRates[FrameMetricsAggregator.TOTAL_INDEX];
@@ -436,9 +448,9 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void disableNativeFramesTracking() {
-        if (RNSentryModule.frameMetricsAggregator != null) {
-            RNSentryModule.frameMetricsAggregator.stop();
-            RNSentryModule.frameMetricsAggregator = null;
+        if (isFrameMetricsAggregatorAvailable()) {
+            frameMetricsAggregator.stop();
+            frameMetricsAggregator = null;
         }
     }
 
@@ -485,4 +497,18 @@ public class RNSentryModule extends ReactContextBaseJavaModule {
             event.setSdk(eventSdk);
         }
     }
+
+    private boolean checkAndroidXAvailability() {
+        try {
+            Class.forName("androidx.core.app.FrameMetricsAggregator");
+            return true;
+        } catch (ClassNotFoundException ignored) {
+            // androidx.core isn't available.
+            return false;
+        }
+    }
+
+    private boolean isFrameMetricsAggregatorAvailable() {
+        return androidXAvailable && frameMetricsAggregator != null;
+    }
 }

package/dist/js/version.d.ts

@@ -1,3 +1,3 @@
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "3.2.9";
+export declare const SDK_VERSION = "3.2.10";
 //# sourceMappingURL=version.d.ts.map

package/dist/js/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,mCAAmC,CAAC;AACzD,eAAO,MAAM,WAAW,UAAU,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,mCAAmC,CAAC;AACzD,eAAO,MAAM,WAAW,WAAW,CAAC"}

package/dist/js/version.js

@@ -1,3 +1,3 @@
 export const SDK_NAME = "sentry.javascript.react-native";
-export const SDK_VERSION = "3.2.9";
+export const SDK_VERSION = "3.2.10";
 //# sourceMappingURL=version.js.map

package/dist/js/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC","sourcesContent":["export const SDK_NAME = \"sentry.javascript.react-native\";\nexport const SDK_VERSION = \"3.2.9\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC","sourcesContent":["export const SDK_NAME = \"sentry.javascript.react-native\";\nexport const SDK_VERSION = \"3.2.10\";\n"]}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "3.2.9",
+  "version": "3.2.10",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",