@sentry/react-native 6.0.0 → 6.1.0

package/RNSentry.podspec

@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = other_cflags
 
-  s.dependency 'Sentry/HybridSDK', '8.37.0'
+  s.dependency 'Sentry/HybridSDK', '8.38.0'
 
   if defined? install_modules_dependencies
     # Default React Native dependencies for 0.71 and above (new and legacy architecture)

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

@@ -7,13 +7,17 @@ import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class RNSentryBreadcrumb {
+public final class RNSentryBreadcrumb {
+
+  private RNSentryBreadcrumb() {
+    throw new AssertionError("Utility class should not be instantiated");
+  }
 
   @Nullable
   public static String getCurrentScreenFrom(ReadableMap from) {
     final @Nullable String maybeCategory =
         from.hasKey("category") ? from.getString("category") : null;
-    if (maybeCategory == null || !maybeCategory.equals("navigation")) {
+    if (maybeCategory == null || !"navigation".equals(maybeCategory)) {
       return null;
     }
 
@@ -26,7 +30,7 @@ public class RNSentryBreadcrumb {
       // getString might throw if cast to string fails (data.to is not enforced by TS to be a
       // string)
       return maybeData.hasKey("to") ? maybeData.getString("to") : null;
-    } catch (Throwable exception) {
+    } catch (Throwable exception) { // NOPMD - We don't want to crash in any case
       return null;
     }
   }

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

@@ -14,11 +14,15 @@ import java.util.List;
 import java.util.Map;
 import org.jetbrains.annotations.Nullable;
 
-public class RNSentryMapConverter {
+public final class RNSentryMapConverter {
   public static final String NAME = "RNSentry.MapConverter";
 
   private static final ILogger logger = new AndroidLogger(NAME);
 
+  private RNSentryMapConverter() {
+    throw new AssertionError("Utility class should not be instantiated");
+  }
+
   public static Object convertToWritable(@Nullable Object serialized) {
     if (serialized instanceof List) {
       WritableArray writable = Arguments.createArray();

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

@@ -91,7 +91,7 @@ public class RNSentryModuleImpl {
   private static final ILogger logger = new AndroidLogger(NAME);
   private static final BuildInfoProvider buildInfo = new BuildInfoProvider(logger);
   private static final String modulesPath = "modules.json";
-  private static final Charset UTF_8 = Charset.forName("UTF-8");
+  private static final Charset UTF_8 = Charset.forName("UTF-8"); // NOPMD - Allow using UTF-8
 
   private final ReactApplicationContext reactApplicationContext;
   private final PackageInfo packageInfo;
@@ -270,7 +270,7 @@ public class RNSentryModuleImpl {
                   if (null != ex && ex.getType().contains("JavascriptException")) {
                     return null;
                   }
-                } catch (Throwable ignored) {
+                } catch (Throwable ignored) { // NOPMD - We don't want to crash in any case
                   // We do nothing
                 }
 
@@ -356,12 +356,12 @@ public class RNSentryModuleImpl {
     throw new RuntimeException("TEST - Sentry Client Crash (only works in release mode)");
   }
 
-  public void addListener(String _eventType) {
+  public void addListener(String eventType) {
     // Is must be defined otherwise the generated interface from TS won't be fulfilled
     logger.log(SentryLevel.ERROR, "addListener of NativeEventEmitter can't be used on Android!");
   }
 
-  public void removeListeners(double _id) {
+  public void removeListeners(double id) {
     // Is must be defined otherwise the generated interface from TS won't be fulfilled
     logger.log(
         SentryLevel.ERROR, "removeListeners of NativeEventEmitter can't be used on Android!");
@@ -369,17 +369,16 @@ public class RNSentryModuleImpl {
 
   public void fetchModules(Promise promise) {
     final AssetManager assets = this.getReactApplicationContext().getResources().getAssets();
-    try (final InputStream stream =
-        new BufferedInputStream(assets.open(RNSentryModuleImpl.modulesPath))) {
+    try (InputStream stream = new BufferedInputStream(assets.open(modulesPath))) {
       int size = stream.available();
       byte[] buffer = new byte[size];
       stream.read(buffer);
       stream.close();
-      String modulesJson = new String(buffer, RNSentryModuleImpl.UTF_8);
+      String modulesJson = new String(buffer, UTF_8);
       promise.resolve(modulesJson);
     } catch (FileNotFoundException e) {
       promise.resolve(null);
-    } catch (Throwable e) {
+    } catch (Throwable e) { // NOPMD - We don't want to crash in any case
       logger.log(SentryLevel.WARNING, "Fetching JS Modules failed.");
       promise.resolve(null);
     }
@@ -462,7 +461,7 @@ public class RNSentryModuleImpl {
         map.putInt("frozenFrames", frozenFrames);
 
         promise.resolve(map);
-      } catch (Throwable ignored) {
+      } catch (Throwable ignored) { // NOPMD - We don't want to crash in any case
         logger.log(SentryLevel.WARNING, "Error fetching native frames.");
         promise.resolve(null);
       }
@@ -493,7 +492,7 @@ public class RNSentryModuleImpl {
     try {
       InternalSentrySdk.captureEnvelope(
           bytes, !options.hasKey("hardCrashed") || !options.getBoolean("hardCrashed"));
-    } catch (Throwable e) {
+    } catch (Throwable e) { // NOPMD - We don't want to crash in any case
       logger.log(SentryLevel.ERROR, "Error while capturing envelope");
       promise.resolve(false);
     }
@@ -511,7 +510,7 @@ public class RNSentryModuleImpl {
 
     final byte[] raw = takeScreenshotOnUiThread(activity);
 
-    if (raw == null) {
+    if (raw == null || raw.length == 0) {
       logger.log(SentryLevel.WARNING, "Screenshot is null, screen was not captured.");
       promise.resolve(null);
       return;
@@ -550,7 +549,7 @@ public class RNSentryModuleImpl {
       doneSignal.await(SCREENSHOT_TIMEOUT_SECONDS, SECONDS);
     } catch (InterruptedException e) {
       logger.log(SentryLevel.ERROR, "Screenshot process was interrupted.");
-      return null;
+      return new byte[0];
     }
 
     return bytesWrapper[0];
@@ -627,7 +626,7 @@ public class RNSentryModuleImpl {
             }
 
             if (userDataKeys != null) {
-              HashMap<String, String> userDataMap = new HashMap<>();
+              Map<String, String> userDataMap = new HashMap<>();
               ReadableMapKeySetIterator it = userDataKeys.keySetIterator();
               while (it.hasNextKey()) {
                 String key = it.nextKey();
@@ -694,7 +693,7 @@ public class RNSentryModuleImpl {
             return;
           }
 
-          final HashMap<String, Object> contextHashMap = context.toHashMap();
+          final Map<String, Object> contextHashMap = context.toHashMap();
           scope.setContexts(key, contextHashMap);
         });
   }
@@ -726,7 +725,7 @@ public class RNSentryModuleImpl {
           frameMetricsAggregator.add(currentActivity);
 
           logger.log(SentryLevel.INFO, "FrameMetricsAggregator installed.");
-        } catch (Throwable ignored) {
+        } catch (Throwable ignored) { // NOPMD - We don't want to crash in any case
           // throws ConcurrentModification when calling addOnFrameMetricsAvailableListener
           // this is a best effort since we can't reproduce it
           logger.log(SentryLevel.ERROR, "Error adding Activity to frameMetricsAggregator.");
@@ -785,7 +784,7 @@ public class RNSentryModuleImpl {
       }
 
       result.putBoolean("started", true);
-    } catch (Throwable e) {
+    } catch (Throwable e) { // NOPMD - We don't want to crash in any case
       result.putBoolean("started", false);
       result.putString("error", e.toString());
     }
@@ -825,7 +824,7 @@ public class RNSentryModuleImpl {
         androidProfile.putString("build_id", getProguardUuid());
         result.putMap("androidProfile", androidProfile);
       }
-    } catch (Throwable e) {
+    } catch (Throwable e) { // NOPMD - We don't want to crash in any case
       result.putString("error", e.toString());
     } finally {
       if (output != null) {
@@ -834,7 +833,7 @@ public class RNSentryModuleImpl {
           if (!wasProfileSuccessfullyDeleted) {
             logger.log(SentryLevel.WARNING, "Profile not deleted from:" + output.getAbsolutePath());
           }
-        } catch (Throwable e) {
+        } catch (Throwable e) { // NOPMD - We don't want to crash in any case
           logger.log(SentryLevel.WARNING, "Profile not deleted from:" + output.getAbsolutePath());
         }
       }
@@ -848,7 +847,7 @@ public class RNSentryModuleImpl {
     }
     isProguardDebugMetaLoaded = true;
     final @Nullable List<Properties> debugMetaList =
-        (new AssetsDebugMetaLoader(this.getReactApplicationContext(), logger)).loadDebugMeta();
+        new AssetsDebugMetaLoader(this.getReactApplicationContext(), logger).loadDebugMeta();
     if (debugMetaList == null) {
       return null;
     }
@@ -866,7 +865,7 @@ public class RNSentryModuleImpl {
   }
 
   private String readStringFromFile(File path) throws IOException {
-    try (final BufferedReader br = new BufferedReader(new FileReader(path)); ) {
+    try (BufferedReader br = new BufferedReader(new FileReader(path)); ) {
 
       final StringBuilder text = new StringBuilder();
       String line;
@@ -943,7 +942,7 @@ public class RNSentryModuleImpl {
   private void addPackages(SentryEvent event, SdkVersion sdk) {
     SdkVersion eventSdk = event.getSdk();
     if (eventSdk != null
-        && eventSdk.getName().equals("sentry.javascript.react-native")
+        && "sentry.javascript.react-native".equals(eventSdk.getName())
         && sdk != null) {
       List<SentryPackage> sentryPackages = sdk.getPackages();
       if (sentryPackages != null) {

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

@@ -40,7 +40,7 @@ public class RNSentryReactFragmentLifecycleTracer extends FragmentLifecycleCallb
       @NotNull Fragment f,
       @NotNull View v,
       @Nullable Bundle savedInstanceState) {
-    if (!("com.swmansion.rnscreens.ScreenStackFragment".equals(f.getClass().getCanonicalName()))) {
+    if (!"com.swmansion.rnscreens.ScreenStackFragment".equals(f.getClass().getCanonicalName())) {
       logger.log(
           SentryLevel.DEBUG,
           "Fragment is not a ScreenStackFragment, won't listen for the first draw.");

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

@@ -13,8 +13,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
 public final class RNSentryReplayBreadcrumbConverter extends DefaultReplayBreadcrumbConverter {
-  public RNSentryReplayBreadcrumbConverter() {}
-
   @Override
   public @Nullable RRWebEvent convert(final @NotNull Breadcrumb breadcrumb) {
     if (breadcrumb.getCategory() == null) {
@@ -22,22 +20,22 @@ public final class RNSentryReplayBreadcrumbConverter extends DefaultReplayBreadc
     }
 
     // Do not add Sentry Event breadcrumbs to replay
-    if (breadcrumb.getCategory().equals("sentry.event")
-        || breadcrumb.getCategory().equals("sentry.transaction")) {
+    if ("sentry.event".equals(breadcrumb.getCategory())
+        || "sentry.transaction".equals(breadcrumb.getCategory())) {
       return null;
     }
-    if (breadcrumb.getCategory().equals("http")) {
+    if ("http".equals(breadcrumb.getCategory())) {
       // Drop native http breadcrumbs to avoid duplicates
       return null;
     }
 
-    if (breadcrumb.getCategory().equals("touch")) {
+    if ("touch".equals(breadcrumb.getCategory())) {
       return convertTouchBreadcrumb(breadcrumb);
     }
-    if (breadcrumb.getCategory().equals("navigation")) {
+    if ("navigation".equals(breadcrumb.getCategory())) {
       return convertNavigationBreadcrumb(breadcrumb);
     }
-    if (breadcrumb.getCategory().equals("xhr")) {
+    if ("xhr".equals(breadcrumb.getCategory())) {
       return convertNetworkBreadcrumb(breadcrumb);
     }
 
@@ -46,8 +44,7 @@ public final class RNSentryReplayBreadcrumbConverter extends DefaultReplayBreadc
     // ignore native navigation breadcrumbs
     if (nativeBreadcrumb instanceof RRWebBreadcrumbEvent) {
       final RRWebBreadcrumbEvent rrWebBreadcrumb = (RRWebBreadcrumbEvent) nativeBreadcrumb;
-      if (rrWebBreadcrumb.getCategory() != null
-          && rrWebBreadcrumb.getCategory().equals("navigation")) {
+      if ("navigation".equals(rrWebBreadcrumb.getCategory())) {
         return null;
       }
     }
@@ -69,8 +66,7 @@ public final class RNSentryReplayBreadcrumbConverter extends DefaultReplayBreadc
 
     rrWebBreadcrumb.setCategory("ui.tap");
 
-    rrWebBreadcrumb.setMessage(
-        RNSentryReplayBreadcrumbConverter.getTouchPathMessage(breadcrumb.getData("path")));
+    rrWebBreadcrumb.setMessage(getTouchPathMessage(breadcrumb.getData("path")));
 
     setRRWebEventDefaultsFrom(rrWebBreadcrumb, breadcrumb);
     return rrWebBreadcrumb;
@@ -83,7 +79,7 @@ public final class RNSentryReplayBreadcrumbConverter extends DefaultReplayBreadc
     }
 
     final @NotNull List path = (List) maybePath;
-    if (path.size() == 0) {
+    if (path.isEmpty()) {
       return null;
     }
 
@@ -145,7 +141,7 @@ public final class RNSentryReplayBreadcrumbConverter extends DefaultReplayBreadc
       return null;
     }
 
-    final HashMap<String, Object> data = new HashMap<>();
+    final Map<String, Object> data = new HashMap<>();
     if (breadcrumb.getData("method") instanceof String) {
       data.put("method", breadcrumb.getData("method"));
     }

package/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "6.0.0";
+export declare const SDK_VERSION = "6.1.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/js/version.js

@@ -1,4 +1,4 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '6.0.0';
+export const SDK_VERSION = '6.1.0';
 //# 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,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '6.0.0';\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/js/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,CAAC,MAAM,QAAQ,GAAG,gCAAgC,CAAC;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC","sourcesContent":["export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';\nexport const SDK_NAME = 'sentry.javascript.react-native';\nexport const SDK_VERSION = '6.1.0';\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": "6.0.0",
+  "version": "6.1.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -66,20 +66,20 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "2.20.1",
-    "@sentry/browser": "8.33.1",
+    "@sentry/browser": "8.34.0",
     "@sentry/cli": "2.37.0",
-    "@sentry/core": "8.33.1",
-    "@sentry/react": "8.33.1",
-    "@sentry/types": "8.33.1",
-    "@sentry/utils": "8.33.1"
+    "@sentry/core": "8.34.0",
+    "@sentry/react": "8.34.0",
+    "@sentry/types": "8.34.0",
+    "@sentry/utils": "8.34.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
     "@expo/metro-config": "0.17.5",
     "@mswjs/interceptors": "^0.25.15",
-    "@sentry-internal/eslint-config-sdk": "8.33.1",
-    "@sentry-internal/eslint-plugin-sdk": "8.33.1",
-    "@sentry-internal/typescript": "8.33.1",
+    "@sentry-internal/eslint-config-sdk": "8.34.0",
+    "@sentry-internal/eslint-plugin-sdk": "8.34.0",
+    "@sentry-internal/typescript": "8.34.0",
     "@sentry/wizard": "3.16.3",
     "@testing-library/react-native": "^12.6.1",
     "@types/jest": "^29.5.3",

package/plugin/build/utils.js

@@ -23,12 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SDK_PACKAGE_NAME = exports.sdkPackage = void 0;
-exports.writeSentryPropertiesTo = writeSentryPropertiesTo;
-exports.warnOnce = warnOnce;
-exports.logPrefix = logPrefix;
-exports.yellow = yellow;
-exports.bold = bold;
+exports.SDK_PACKAGE_NAME = exports.sdkPackage = exports.bold = exports.yellow = exports.logPrefix = exports.warnOnce = exports.writeSentryPropertiesTo = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 function writeSentryPropertiesTo(filepath, sentryProperties) {
@@ -37,6 +32,7 @@ function writeSentryPropertiesTo(filepath, sentryProperties) {
     }
     fs.writeFileSync(path.resolve(filepath, 'sentry.properties'), sentryProperties);
 }
+exports.writeSentryPropertiesTo = writeSentryPropertiesTo;
 const sdkPackage = require('../../package.json');
 exports.sdkPackage = sdkPackage;
 const SDK_PACKAGE_NAME = `${sdkPackage.name}/expo`;
@@ -49,9 +45,11 @@ function warnOnce(message) {
         console.warn(yellow(`${logPrefix()} ${message}`));
     }
 }
+exports.warnOnce = warnOnce;
 function logPrefix() {
     return `› ${bold('[@sentry/react-native/expo]')}`;
 }
+exports.logPrefix = logPrefix;
 /**
  * The same as `chalk.yellow`
  * This code is part of the SDK, we don't want to introduce a dependency on `chalk` just for this.
@@ -59,6 +57,7 @@ function logPrefix() {
 function yellow(message) {
     return `\x1b[33m${message}\x1b[0m`;
 }
+exports.yellow = yellow;
 /**
  * The same as `chalk.bold`
  * This code is part of the SDK, we don't want to introduce a dependency on `chalk` just for this.
@@ -66,3 +65,4 @@ function yellow(message) {
 function bold(message) {
     return `\x1b[1m${message}\x1b[22m`;
 }
+exports.bold = bold;

package/plugin/build/withSentry.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSentry = void 0;
-exports.getSentryProperties = getSentryProperties;
+exports.withSentry = exports.getSentryProperties = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const utils_1 = require("./utils");
 const withSentryAndroid_1 = require("./withSentryAndroid");
@@ -50,6 +49,7 @@ ${organization ? `defaults.org=${organization}` : missingOrgMessage}
 ${project ? `defaults.project=${project}` : missingProjectMessage}
 ${authToken ? `${existingAuthTokenMessage}\nauth.token=${authToken}` : missingAuthTokenMessage}`;
 }
+exports.getSentryProperties = getSentryProperties;
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 const withSentry = (0, config_plugins_1.createRunOncePlugin)(withSentryPlugin, utils_1.sdkPackage.name, utils_1.sdkPackage.version);
 exports.withSentry = withSentry;

package/plugin/build/withSentryAndroid.js

@@ -23,8 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSentryAndroid = void 0;
-exports.modifyAppBuildGradle = modifyAppBuildGradle;
+exports.modifyAppBuildGradle = exports.withSentryAndroid = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const path = __importStar(require("path"));
 const utils_1 = require("./utils");
@@ -66,3 +65,4 @@ function modifyAppBuildGradle(buildGradle) {
     const applyFrom = `apply from: new File(${resolveSentryReactNativePackageJsonPath}, "sentry.gradle")`;
     return buildGradle.replace(pattern, match => `${applyFrom}\n\n${match}`);
 }
+exports.modifyAppBuildGradle = modifyAppBuildGradle;

package/plugin/build/withSentryIOS.js

@@ -23,9 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withSentryIOS = void 0;
-exports.modifyExistingXcodeBuildScript = modifyExistingXcodeBuildScript;
-exports.addSentryWithBundledScriptsToBundleShellScript = addSentryWithBundledScriptsToBundleShellScript;
+exports.addSentryWithBundledScriptsToBundleShellScript = exports.modifyExistingXcodeBuildScript = exports.withSentryIOS = void 0;
 const config_plugins_1 = require("expo/config-plugins");
 const path = __importStar(require("path"));
 const utils_1 = require("./utils");
@@ -73,8 +71,10 @@ Run npx expo prebuild --clean`);
     const code = JSON.parse(script.shellScript);
     script.shellScript = JSON.stringify(addSentryWithBundledScriptsToBundleShellScript(code));
 }
+exports.modifyExistingXcodeBuildScript = modifyExistingXcodeBuildScript;
 function addSentryWithBundledScriptsToBundleShellScript(script) {
     return script.replace(/^.*?(packager|scripts)\/react-native-xcode\.sh\s*(\\'\\\\")?/m, 
     // eslint-disable-next-line no-useless-escape
     (match) => `/bin/sh ${SENTRY_REACT_NATIVE_XCODE_PATH} ${match}`);
 }
+exports.addSentryWithBundledScriptsToBundleShellScript = addSentryWithBundledScriptsToBundleShellScript;

package/ts3.8/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "6.0.0";
+export declare const SDK_VERSION = "6.1.0";
 //# sourceMappingURL=version.d.ts.map