Merge branch 'main' into test/e2e-replay

.github/actions/disk-cleanup/action.yml

@@ -0,0 +1,19 @@
+name: Disk cleanup
+description: Free disk space
+
+runs:
+  using: composite
+
+  steps:
+    - shell: bash
+      run: |
+        df -h
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf /opt/ghc
+        sudo rm -rf /usr/local/.ghcup
+        sudo rm -rf /usr/share/swift
+        sudo rm -rf /usr/lib/google-cloud-sdk
+        sudo rm -rf /usr/local/aws*
+        sudo rm -rf /usr/local/julia*
+        sudo rm -rf /usr/local/share/chromium
+        df -h

.github/workflows/e2e.yml

@@ -50,6 +50,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: ./.github/actions/disk-cleanup
+        if: ${{ matrix.platform == 'android' }}
+
       - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer
         if: ${{ matrix.platform == 'ios' }}
 
@@ -217,6 +220,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: ./.github/actions/disk-cleanup
+        if: ${{ matrix.platform == 'android' }}
+
       - name: Sentry Release
         run: |
           SENTRY_RELEASE_CANDIDATE=$(echo 'e2e/${{ github.ref }}' | perl -pe 's/\//-/g')
@@ -365,6 +371,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: ./.github/actions/disk-cleanup
+        if: ${{ matrix.platform == 'android' }}
+
       - name: Setup Global Xcode Tools
         if: ${{ matrix.platform == 'ios' }}
         run: which xcbeautify || brew install xcbeautify
@@ -414,7 +423,7 @@ jobs:
 
       - name: Run tests on Android
         if: ${{ matrix.platform == 'android' }}
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 # pin@v2.31.0
+        uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 # pin@v2.32.0
         with:
           api-level: 30
           force-avd-creation: false

.github/workflows/native-tests.yml

@@ -63,6 +63,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: ./.github/actions/disk-cleanup
+
       - uses: actions/setup-java@v4
         with:
           java-version: '17'
@@ -87,7 +89,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Run connected tests
-        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
+        uses: reactivecircus/android-emulator-runner@f0d1ed2dcad93c7479e8b2f2226c83af54494915 #pin@v2.32.0
         with:
           working-directory: RNSentryAndroidTester
           api-level: 30

CHANGELOG.md

@@ -1,17 +1,28 @@
 # Changelog
 
-## Unreleased
+## 5.30.0
+
+### Features
 
 - Add `spotlight` option ([#4023](https://github.com/getsentry/sentry-react-native/pull/4023))
   - Deprecating `enableSpotlight` and `spotlightSidecarUrl`
 
+### Dependencies
+
+- Bump JavaScript SDK from v7.118.0 to v7.119.0 ([#4031](https://github.com/getsentry/sentry-react-native/pull/4031))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/v7/CHANGELOG.md#71190)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.118.0...7.119.0)
+- Bump Cocoa SDK from v8.33.0 to v8.34.0 ([#4026](https://github.com/getsentry/sentry-react-native/pull/4026))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8340)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.33.0...8.34.0)
+
 ## 5.29.0
 
 ### Features
 
 - `TimeToInitialDisplay` and `TimeToFullDisplay` start the time to display spans on mount ([#4020](https://github.com/getsentry/sentry-react-native/pull/4020))
 
-### Fixed
+### Fixes
 
 - fix(ttid): End and measure TTID regardless current active span ([#4019](https://github.com/getsentry/sentry-react-native/pull/4019))
   - Fixes possible missing TTID measurements and spans

RNSentry.podspec

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

RNSentryAndroidTester/gradle.properties

@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3072m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -20,4 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true

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": "5.29.0",
+  "version": "5.30.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -68,22 +68,22 @@
   },
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "2.20.1",
-    "@sentry/browser": "7.118.0",
+    "@sentry/browser": "7.119.0",
     "@sentry/cli": "2.31.2",
-    "@sentry/core": "7.118.0",
-    "@sentry/hub": "7.118.0",
-    "@sentry/integrations": "7.118.0",
-    "@sentry/react": "7.118.0",
-    "@sentry/types": "7.118.0",
-    "@sentry/utils": "7.118.0"
+    "@sentry/core": "7.119.0",
+    "@sentry/hub": "7.119.0",
+    "@sentry/integrations": "7.119.0",
+    "@sentry/react": "7.119.0",
+    "@sentry/types": "7.119.0",
+    "@sentry/utils": "7.119.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
     "@expo/metro-config": "0.17.5",
     "@mswjs/interceptors": "^0.25.15",
-    "@sentry-internal/eslint-config-sdk": "7.118.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.118.0",
-    "@sentry-internal/typescript": "7.118.0",
+    "@sentry-internal/eslint-config-sdk": "7.119.0",
+    "@sentry-internal/eslint-plugin-sdk": "7.119.0",
+    "@sentry-internal/typescript": "7.119.0",
     "@sentry/wizard": "3.16.3",
     "@types/jest": "^29.5.3",
     "@types/node": "^20.9.3",

samples/expo/app.json

@@ -4,7 +4,7 @@
     "slug": "sentry-react-native-expo-sample",
     "jsEngine": "hermes",
     "scheme": "sentry-expo-sample",
-    "version": "5.29.0",
+    "version": "5.30.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -19,15 +19,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "17"
+      "buildNumber": "18"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 17
+      "versionCode": 18
     },
     "web": {
       "bundler": "metro",

samples/expo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-expo-sample",
-  "version": "5.29.0",
+  "version": "5.30.0",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",

samples/react-native/android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 20
-        versionName "5.29.0"
+        versionCode 21
+        versionName "5.30.0"
     }
 
     signingConfigs {

samples/react-native/android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=512m
 org.gradle.logging.level=lifecycle
 
 # When configured, Gradle will run in incubating parallel mode.

samples/react-native/ios/sentryreactnativesample/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.29.0</string>
+	<string>5.30.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>25</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>

samples/react-native/ios/sentryreactnativesampleTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.29.0</string>
+	<string>5.30.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>25</string>
 </dict>
 </plist>

samples/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-sample",
-  "version": "5.29.0",
+  "version": "5.30.0",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",

scripts/e2e.mjs

@@ -160,7 +160,8 @@ if (actions.includes('build')) {
 
       appProduct = `${appDir}/ios/DerivedData/Build/Products/${buildType}-iphonesimulator/${appName}.app`;
     } else if (platform == 'android') {
-      execSync(`./gradlew assemble${buildType} -PreactNativeArchitectures=x86`, { stdio: 'inherit', cwd: `${appDir}/android`, env: env });
+      execSync(`./gradlew assemble${buildType} -PreactNativeArchitectures=x86 --no-daemon`,
+        { stdio: 'inherit', cwd: `${appDir}/android`, env: env });
       appProduct = `${appDir}/android/app/build/outputs/apk/release/app-release.apk`;
     }
 

src/js/version.ts

@@ -1,3 +1,3 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION = '5.29.0';
+export const SDK_VERSION = '5.30.0';

test/perf/TestAppPlain/android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

test/perf/TestAppSentry/android/gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

test/react-native/rn.patch.gradle.properties.js

@@ -22,21 +22,22 @@ if (enableHermes === null) {
 }
 
 logger.info('Patching gradle.properties', args['gradle-properties']);
-const content = fs.readFileSync(args['gradle-properties'], 'utf8');
+let content = fs.readFileSync(args['gradle-properties'], 'utf8');
 
 const isHermesEnabled = content.includes('hermesEnabled=true');
-const shouldPatch = enableHermes !== isHermesEnabled;
-if (shouldPatch) {
+if (enableHermes !== isHermesEnabled) {
   const patch = enableHermes ? 'hermesEnabled=true' : 'hermesEnabled=false';
-  const patched = content.match(/hermesEnabled=.*/)
-    ? content.replace(/hermesEnabled=.*/, patch)
+  content = content.match(/hermesEnabled=.*/)
+    ? content.replace(/hermesEnabled=.*/g, patch)
     : content.concat(`\n${patch}`);
   if (enableHermes) {
     logger.info('Patching gradle.properties for Hermes');
   } else {
     logger.info('Patching gradle.properties for JSC');
   }
-  fs.writeFileSync(args['gradle-properties'], patched);
-} else {
-  logger.info('gradle.properties is already patched!');
 }
+
+content = content.replace(/reactNativeArchitectures=.*/g, 'reactNativeArchitectures=x86');
+content = content.replace(/org.gradle.jvmargs=.*/g, 'org.gradle.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=512m');
+
+fs.writeFileSync(args['gradle-properties'], content);