Merge branch 'main' into antonis/bump-postcss

Author: antonis

CHANGELOG.md

@@ -16,6 +16,10 @@
 ### Fixes
 
 - Stop the Hermes sampling profiler on React instance teardown to prevent `pthread_kill` SIGABRT when the JS thread is torn down with profiling active ([#6035](https://github.com/getsentry/sentry-react-native/pull/6035))
+- Restrict the Metro source-context middleware to files within the project root ([#6044](https://github.com/getsentry/sentry-react-native/pull/6044))
+- Escape `name` and `version` values when injecting release constants into the web bundle ([#6044](https://github.com/getsentry/sentry-react-native/pull/6044))
+- Mask the Sentry auth token in the `sentry.gradle` upload-task lifecycle log ([#6057](https://github.com/getsentry/sentry-react-native/pull/6057))
+- Discard invalid navigation/interaction transactions via an event processor instead of mutating the internal `_sampled` flag, removing misleading "dropped due to sampling" debug logs ([#6051](https://github.com/getsentry/sentry-react-native/pull/6051))
 
 ### Dependencies
 

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.m

@@ -28,15 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)setEnableLogs:(BOOL)enabled sentryOptions:(SentryOptions *)sentryOptions;
 
-/**
- * Sets the enableSessionReplayInUnreliableEnvironment experimental option on SentryOptions
- * @param sentryOptions The SentryOptions instance to configure
- * @param enabled Whether enableSessionReplayInUnreliableEnvironment from sentry Cocoa should be
- * enabled
- */
-+ (void)setEnableSessionReplayInUnreliableEnvironment:(BOOL)enabled
-                                        sentryOptions:(SentryOptions *)sentryOptions;
-
 /**
  * Configures iOS UI profiling options on SentryOptions
  * @param profilingOptions Dictionary containing profiling configuration

packages/core/ios/RNSentryExperimentalOptions.h

@@ -28,15 +28,6 @@ + (void)setEnableLogs:(BOOL)enabled sentryOptions:(SentryOptions *)sentryOptions
     sentryOptions.enableLogs = enabled;
 }
 
-+ (void)setEnableSessionReplayInUnreliableEnvironment:(BOOL)enabled
-                                        sentryOptions:(SentryOptions *)sentryOptions
-{
-    if (sentryOptions == nil) {
-        return;
-    }
-    sentryOptions.experimental.enableSessionReplayInUnreliableEnvironment = enabled;
-}
-
 + (void)configureProfilingWithOptions:(NSDictionary *)profilingOptions
                         sentryOptions:(SentryOptions *)sentryOptions
 {

packages/core/ios/RNSentryExperimentalOptions.m

@@ -3,9 +3,8 @@
 
 /**
  * Updates the session replay options
- * @return true when session replay is enabled
  */
-+ (BOOL)updateOptions:(NSMutableDictionary *)options;
++ (void)updateOptions:(NSMutableDictionary *)options;
 
 + (void)postInit;
 

packages/core/ios/RNSentryReplay.h

@@ -12,14 +12,14 @@
 @implementation RNSentryReplay {
 }
 
-+ (BOOL)updateOptions:(NSMutableDictionary *)options
++ (void)updateOptions:(NSMutableDictionary *)options
 {
     NSNumber *sessionSampleRate = options[@"replaysSessionSampleRate"];
     NSNumber *errorSampleRate = options[@"replaysOnErrorSampleRate"];
 
     if (sessionSampleRate == nil && errorSampleRate == nil) {
         NSLog(@"Session replay disabled via configuration");
-        return NO;
+        return;
     }
 
     NSLog(@"Setting up session replay");
@@ -45,8 +45,6 @@ + (BOOL)updateOptions:(NSMutableDictionary *)options
             @ { @"name" : REACT_NATIVE_SDK_NAME, @"version" : REACT_NATIVE_SDK_PACKAGE_VERSION }
     }
                forKey:@"sessionReplay"];
-    return (errorSampleRate != nil && [errorSampleRate doubleValue] > 0)
-        || (sessionSampleRate != nil && [sessionSampleRate doubleValue] > 0);
 }
 
 + (NSArray *_Nonnull)getReplayRNRedactClasses:(NSDictionary *_Nullable)replayOptions

packages/core/ios/RNSentryReplay.mm

@@ -44,9 +44,7 @@ + (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
     NSMutableDictionary *mutableOptions = [options mutableCopy];
 
 #if SENTRY_TARGET_REPLAY_SUPPORTED
-    BOOL isSessionReplayEnabled = [RNSentryReplay updateOptions:mutableOptions];
-#else
-    BOOL isSessionReplayEnabled = NO;
+    [RNSentryReplay updateOptions:mutableOptions];
 #endif
 
     SentryOptions *sentryOptions = [PrivateSentrySDKOnly optionsWithDictionary:mutableOptions
@@ -170,11 +168,6 @@ + (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
         }
     }
 
-    if (isSessionReplayEnabled) {
-        [RNSentryExperimentalOptions setEnableSessionReplayInUnreliableEnvironment:YES
-                                                                     sentryOptions:sentryOptions];
-    }
-
     return sentryOptions;
 }
 

packages/core/ios/RNSentryStart.m

@@ -16,12 +16,9 @@
 + (void)startWithOptions:(SentryOptions *)options;
 
 + (SentryOptions *)createOptionsWithDictionary:(NSDictionary *)options
-                        isSessionReplayEnabled:(BOOL)isSessionReplayEnabled
                                          error:(NSError **)errorPointer;
 
-+ (void)setupWithDictionary:(NSDictionary *)options
-     isSessionReplayEnabled:(BOOL)isSessionReplayEnabled
-                      error:(NSError **)errorPointer;
++ (void)setupWithDictionary:(NSDictionary *)options error:(NSError **)errorPointer;
 
 + (BOOL)debug;
 

packages/core/ios/SentrySDKWrapper.h

@@ -31,7 +31,6 @@ + (void)configureScope:(void (^)(SentryScope *scope))callback
 }
 
 + (SentryOptions *)createOptionsWithDictionary:(NSDictionary *)options
-                        isSessionReplayEnabled:(BOOL)isSessionReplayEnabled
                                          error:(NSError *__autoreleasing *)errorPointer
 {
     NSString *dsn = [self getURLFromDSN:[options valueForKey:@"dsn"]];
@@ -115,10 +114,6 @@ + (SentryOptions *)createOptionsWithDictionary:(NSDictionary *)options
         }
     }
 
-    if (isSessionReplayEnabled) {
-        [RNSentryExperimentalOptions setEnableSessionReplayInUnreliableEnvironment:YES
-                                                                     sentryOptions:sentryOptions];
-    }
     return sentryOptions;
 }
 
@@ -132,12 +127,9 @@ + (NSString *_Nullable)getURLFromDSN:(NSString *)dsn
 }
 
 + (void)setupWithDictionary:(NSDictionary *_Nonnull)options
-     isSessionReplayEnabled:(BOOL)isSessionReplayEnabled
                       error:(NSError *_Nonnull *_Nonnull)errorPointer
 {
-    SentryOptions *sentryOptions = [self createOptionsWithDictionary:options
-                                              isSessionReplayEnabled:isSessionReplayEnabled
-                                                               error:errorPointer];
+    SentryOptions *sentryOptions = [self createOptionsWithDictionary:options error:errorPointer];
     if (!options) {
         return;
     }

packages/core/ios/SentrySDKWrapper.m

@@ -269,7 +269,9 @@ plugins.withId('com.android.application') {
 
                                 args.addAll(extraArgs)
 
-                                project.logger.lifecycle("Sentry-CLI arguments: ${args}")
+                                // Mask sentryAuthToken in the logged args; do not pass loggedArgs to the CLI.
+                                def loggedArgs = sentryAuthToken ? args.collect { it == sentryAuthToken ? "***" : it } : args
+                                project.logger.lifecycle("Sentry-CLI arguments: ${loggedArgs}")
                                 def osCompatibility = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'node'] : []
                                 if (!System.getenv('SENTRY_DOTENV_PATH') && file("$reactRoot/.env.sentry-build-plugin").exists()) {
                                     environment('SENTRY_DOTENV_PATH', "$reactRoot/.env.sentry-build-plugin")