Merge remote-tracking branch 'origin/main' into 5.0.0

Author: krystofwoldrich

.github/dependabot.yml

@@ -5,6 +5,8 @@ updates:
   schedule:
     interval: weekly
   open-pull-requests-limit: 2
+  ignore:
+    - dependency-name: "@sentry*"
 - package-ecosystem: gradle
   directory: "/android"
   schedule:

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@807578363a7869ca324a79039e6db9c843e0e100 # pin@v2
+        uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@807578363a7869ca324a79039e6db9c843e0e100 # pin@v2
+        uses: github/codeql-action/autobuild@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -61,4 +61,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@807578363a7869ca324a79039e6db9c843e0e100 # pin@v2
+        uses: github/codeql-action/analyze@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2

.github/workflows/e2e.yml

@@ -19,8 +19,8 @@ jobs:
         platform: ['ios', 'android']
         include:
           - platform: ios
-            runtime: '15.2'
-            device: 'iPhone 12'
+            runtime: '16.0'
+            device: 'iPhone 14'
     env:
       PLATFORM: ${{ matrix.platform }}
       RUNTIME: ${{ matrix.runtime }}
@@ -107,15 +107,15 @@ jobs:
 
         # Wait until the Appium server starts.
       - name: Check Appium Server
-        uses: nick-fields/retry@b4fa57557dda8c2f30bcb2d19372cc3237190f7f # pin@v2
+        uses: nick-fields/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # pin@v2
         with:
           timeout_seconds: 60
           max_attempts: 10
           command: curl --output /dev/null --silent --head --fail http://127.0.0.1:4723/sessions
 
       - name: Run tests on Android
         if: ${{ matrix.platform == 'android' }}
-        uses: reactivecircus/android-emulator-runner@d7b53ddc6e44254e1f4cf4a6ad67345837027a66 # pin@v2
+        uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0 # pin@v2
         with:
           api-level: 29
           emulator-options: -accel on -no-snapshot -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -camera-front none -timezone US/Pacific

CHANGELOG.md

@@ -12,6 +12,33 @@
 
 - Send react native js engine, turbo module, fabric flags and component stack in Event contexts ([#2552](https://github.com/getsentry/sentry-react-native/pull/2552))
 
+### Features
+
+- Add `maxQueueSize` option ([#2578](https://github.com/getsentry/sentry-react-native/pull/2578))
+
+### Fixes
+
+- Use `Scope` class rather than `Scope` type for top-level functions ([#2627](https://github.com/getsentry/sentry-react-native/pull/2627))
+
+### Dependencies
+
+- Bump JavaScript SDK from v7.16.0 to v7.20.1 ([#2582](https://github.com/getsentry/sentry-react-native/pull/2582), [#2598](https://github.com/getsentry/sentry-react-native/pull/2598), [#2632](https://github.com/getsentry/sentry-react-native/pull/2632), [#2607](https://github.com/getsentry/sentry-react-native/pull/2607))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7201)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.16.0...7.20.1)
+- Bump Cocoa SDK from v7.29.0 to v7.31.2 ([#2592](https://github.com/getsentry/sentry-react-native/pull/2592), [#2601](https://github.com/getsentry/sentry-react-native/pull/2601), [#2629](https://github.com/getsentry/sentry-react-native/pull/2629))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7312)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.29.0...7.31.2)
+- Bump Android SDK from v6.6.0 to v6.8.0 ([#2600](https://github.com/getsentry/sentry-react-native/pull/2600), [#2628](https://github.com/getsentry/sentry-react-native/pull/2628))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#680)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.6.0...6.8.0)
+
+## 4.8.0
+
+### Fixes
+
+- Message event can have attached stacktrace ([#2577](https://github.com/getsentry/sentry-react-native/pull/2577))
+- Fixed maximum call stack exceeded error resulting from large payloads ([#2579](https://github.com/getsentry/sentry-react-native/pull/2579))
+
 ### Dependencies
 
 - Bump CLI from v1.74.4 to v2.7.0 ([#2457](https://github.com/getsentry/sentry-react-native/pull/2457))

CONTRIBUTING.md

@@ -83,3 +83,85 @@ You can optionally start the Metro bundler if you want to control where it runs:
 ```sh
 yarn start --reset-cache
 ```
+
+Run the emulators:
+
+```sh
+yarn react-native run-ios
+yarn react-native run-android
+```
+
+## Develop with sentry-cocoa
+
+Here are step on how to test your changes in `sentry-cocoa` with `sentry-react-native`. We assume you have both repositories cloned in siblings folders.
+
+1. Build `sentry-cocoa`.
+
+```sh
+cd sentry-cocoa
+make init
+make build-xcframework
+```
+
+2. Link local `sentry-cocoa` build in `sentry-react-native`
+
+```sh
+cd sentry-react-native
+```
+
+Comment out sentry dependency in `RNSentry.podspec`.
+
+```diff
+-   s.dependency 'Sentry/HybridSDK', '7.31.0'
++   # s.dependency 'Sentry/HybridSDK', '7.31.0'
+```
+
+Add local pods to `sample/ios/Podfile`.
+
+```diff
+target 'sample' do
+
+  # ... react native config
+
++  pod 'Sentry/HybridSDK', :path => '../../../sentry-cocoa'
+
+  # ... rest of the configuration
+
+end
+```
+
+## Develop with sentry-java
+
+Here are step on how to test your changes in `sentry-java` with `sentry-react-native`. We assume that you have `sentry-java` setup, Android SDK installed, correct JAVA version etc.
+
+1. Build and publish `sentry-java` locally.
+
+```sh
+cd sentry-java
+make dryRelease
+ls ~/.m2/repository/io/sentry/sentry-android # check that `sentry-java` was published
+```
+
+2. Add local maven to the sample project.
+
+```sh
+cd sentry-react-native/sample
+```
+
+Add local maven to `sample/android/build.gradle`.
+
+```diff
+allprojects {
+    repositories {
++        mavenLocal()
+```
+
+Update `sentry-android` version, to the one locally published, in `android/build.gradle`.
+
+```diff
+dependencies {
+    implementation 'com.facebook.react:react-native:+'
+-    api 'io.sentry:sentry-android:5.4.0'
++    api 'io.sentry:sentry-android:6.7.7-my-local-version'
+}
+```

RNSentry.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = '*.js'
 
   s.dependency 'React-Core'
-  s.dependency 'Sentry', '7.29.0'
+  s.dependency 'Sentry/HybridSDK', '7.31.2'
 
   s.source_files = 'ios/RNSentry.{h,mm}'
   s.public_header_files = 'ios/RNSentry.h'

android/build.gradle

@@ -42,5 +42,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:6.6.0'
+    api 'io.sentry:sentry-android:6.8.0'
 }

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

@@ -130,6 +130,9 @@ public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
             if (rnOptions.hasKey("sendDefaultPii")) {
                 options.setSendDefaultPii(rnOptions.getBoolean("sendDefaultPii"));
             }
+            if (rnOptions.hasKey("maxQueueSize")) {
+                options.setMaxQueueSize(rnOptions.getInt("maxQueueSize"));
+            }
 
             options.setBeforeSend((event, hint) -> {
                 // React native internally throws a JavascriptException

ios/RNSentry.mm

@@ -7,6 +7,7 @@
 #endif
 
 #import <Sentry/Sentry.h>
+#import <Sentry/PrivateSentrySDKOnly.h>
 #import <Sentry/SentryScreenFrames.h>
 
 // Thanks to this guard, we won't import this header when we build for the old architecture.
@@ -30,7 +31,6 @@ + (void)storeEnvelope:(SentryEnvelope *)envelope;
 
 @implementation RNSentry {
     bool sentHybridSdkDidBecomeActive;
-    SentryOptions *sentryOptions;
 }
 
 - (dispatch_queue_t)methodQueue
@@ -73,7 +73,7 @@ + (BOOL)requiresMainQueueSetup {
     [mutableOptions removeObjectForKey:@"tracesSampleRate"];
     [mutableOptions removeObjectForKey:@"tracesSampler"];
 
-    sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions didFailWithError:&error];
+    SentryOptions *sentryOptions = [[SentryOptions alloc] initWithDict:mutableOptions didFailWithError:&error];
     if (error) {
         reject(@"SentryReactNative", error.localizedDescription, error);
         return;
@@ -108,7 +108,7 @@ + (BOOL)requiresMainQueueSetup {
 #endif
 
     // If the app is active/in foreground, and we have not sent the SentryHybridSdkDidBecomeActive notification, send it.
-    if (appIsActive && !sentHybridSdkDidBecomeActive && (sentryOptions.enableAutoSessionTracking || sentryOptions.enableOutOfMemoryTracking)) {
+    if (appIsActive && !sentHybridSdkDidBecomeActive && (PrivateSentrySDKOnly.options.enableAutoSessionTracking || PrivateSentrySDKOnly.options.enableOutOfMemoryTracking)) {
         [[NSNotificationCenter defaultCenter]
             postNotificationName:@"SentryHybridSdkDidBecomeActive"
             object:nil];
@@ -155,13 +155,9 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
 RCT_EXPORT_METHOD(fetchNativeSdkInfo:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    if (sentryOptions == nil) {
-        return reject(@"SentryReactNative",@"Called fetchNativeSdkInfo without initializing the SDK first.", nil);
-    }
-
     resolve(@{
-        @"name": sentryOptions.sdkInfo.name,
-        @"version": sentryOptions.sdkInfo.version
+        @"name": PrivateSentrySDKOnly.getSdkName,
+        @"version": PrivateSentrySDKOnly.getSdkVersionString
             });
 }
 
@@ -190,7 +186,7 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
         if (tempContexts != nil) {
             [contexts setValue:tempContexts forKey:@"context"];
         }
-        if (sentryOptions != nil && sentryOptions.debug) {
+        if (PrivateSentrySDKOnly.options.debug) {
             NSData *data = [NSJSONSerialization dataWithJSONObject:contexts options:0 error:nil];
             NSString *debugContext = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
             NSLog(@"Contexts: %@", debugContext);

package.json

@@ -40,32 +40,32 @@
     "react-native": ">=0.70.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.16.0",
-    "@sentry/cli": "2.7.0",
-    "@sentry/core": "7.16.0",
-    "@sentry/hub": "7.16.0",
-    "@sentry/integrations": "7.16.0",
-    "@sentry/react": "7.16.0",
-    "@sentry/tracing": "7.16.0",
-    "@sentry/types": "7.16.0",
-    "@sentry/utils": "7.16.0"
+    "@sentry/browser": "7.20.1",
+    "@sentry/cli": "2.9.0",
+    "@sentry/core": "7.20.1",
+    "@sentry/hub": "7.20.1",
+    "@sentry/integrations": "7.20.1",
+    "@sentry/react": "7.20.1",
+    "@sentry/tracing": "7.20.1",
+    "@sentry/types": "7.20.1",
+    "@sentry/utils": "7.20.1"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.16.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.16.0",
+    "@sentry-internal/eslint-config-sdk": "7.20.1",
+    "@sentry-internal/eslint-plugin-sdk": "7.20.1",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "2.2.0",
     "@types/jest": "^26.0.15",
-    "@types/react": "^18",
-    "@types/react-native": "^0.70.0",
+    "@types/react": "^18.0.25",
+    "@types/react-native": "^0.70.6",
     "babel-jest": "^26.1.0",
     "eslint": "^7.6.0",
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-native": "^3.8.1",
     "jest": "^24.9.0",
     "prettier": "^2.0.5",
-    "react": "^18",
-    "react-native": "^0.70.0",
+    "react": "^18.2.0",
+    "react-native": "^0.70.5",
     "replace-in-file": "^6.0.0",
     "rimraf": "^3.0.0",
     "ts-jest": "^24.3.0",