Merge branch 'main' into v7

# Conflicts:
#	CHANGELOG.md
#	dev-packages/e2e-tests/package.json
#	dev-packages/type-check/package.json
#	dev-packages/utils/package.json
#	lerna.json
#	packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java
#	packages/core/ios/RNSentryVersion.m
#	packages/core/package.json
#	packages/core/src/js/feedback/FeedbackWidget.tsx
#	packages/core/src/js/feedback/ScreenshotButton.tsx
#	packages/core/src/js/version.ts
#	performance-tests/TestAppPlain/package.json
#	performance-tests/TestAppSentry/package.json
#	samples/expo/app.json
#	samples/expo/package.json
#	samples/react-native-macos/package.json
#	samples/react-native/android/app/build.gradle
#	samples/react-native/ios/sentryreactnativesample/Info.plist
#	samples/react-native/ios/sentryreactnativesampleTests/Info.plist
#	samples/react-native/package.json
#	yarn.lock

Author: antonis

.github/CODEOWNERS

@@ -1 +1 @@
-*       @krystofwoldrich @lucas-zimerman @antonis
+*       @antonis @lucas-zimerman

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v3.28.18
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # pin@v3.29.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,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@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v3.28.18
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # pin@v3.29.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v3.28.18
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # pin@v3.29.0

.github/workflows/e2e-v2.yml

@@ -163,15 +163,15 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.79.1']
+        rn-version: ['0.65.3', '0.80.0']
         rn-architecture: ['legacy', 'new']
         platform: ['android', 'ios']
         build-type: ['production']
         ios-use-frameworks: ['no', 'static', 'dynamic']
         engine: ['hermes', 'jsc']
         include:
           - platform: ios
-            rn-version: '0.79.1'
+            rn-version: '0.80.0'
             xcode-version: '16.2'
             runs-on: macos-15
           - platform: ios
@@ -182,7 +182,7 @@ jobs:
             runs-on: ubuntu-latest
         exclude:
           # exclude JSC for new RN versions (keeping the matrix manageable)
-          - rn-version: '0.79.1'
+          - rn-version: '0.80.0'
             engine: 'jsc'
           # exclude all rn versions lower than 0.70.0 for new architecture
           - rn-version: '0.65.3'
@@ -301,15 +301,15 @@ jobs:
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:
-        rn-version: ['0.65.3', '0.79.1']
+        rn-version: ['0.65.3', '0.80.0']
         rn-architecture: ['legacy', 'new']
         platform: ['android', 'ios']
         build-type: ['production']
         ios-use-frameworks: ['no'] # test only no framworks
         engine: ['hermes', 'jsc']
         include:
           - platform: ios
-            rn-version: '0.79.1'
+            rn-version: '0.80.0'
             runs-on: macos-15
           - platform: ios
             rn-version: '0.65.3'
@@ -323,7 +323,7 @@ jobs:
           # e2e test only the default combinations
           - rn-version: '0.65.3'
             engine: 'hermes'
-          - rn-version: '0.79.1'
+          - rn-version: '0.80.0'
             engine: 'jsc'
 
     steps:
@@ -391,8 +391,7 @@ jobs:
           force-avd-creation: false
           disable-animations: true
           disable-spellchecker: true
-          target: 'aosp_atd'
-          channel: canary # Necessary for ATDs
+          target: 'google_apis'
           emulator-options: >
             -no-window
             -no-snapshot-save

.github/workflows/skip-ci.yml

@@ -10,14 +10,18 @@ jobs:
   diff_check:
     runs-on: ubuntu-latest
     continue-on-error: true
+    env:
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+      BASE_REF: ${{ github.base_ref }}
+      HEAD_REF: ${{ github.head_ref }}
     outputs:
       skip_ci:
         ${{ steps.check_diff.outputs.skip_ci }}
     steps:
       - name: Check if is PR
         id: check-pr
         run: |
-          if [ -z "${{ github.event.pull_request.number }}" ] || [ -z "${{ github.base_ref }}" ] || [ -z "${{ github.head_ref }}" ]; then
+          if [ -z "$PR_NUMBER" ] || [ -z "$BASE_REF" ] || [ -z "$HEAD_REF" ]; then
             echo "This action is intended to be run on pull requests only."
             echo "is-pr=false" >> $GITHUB_OUTPUT
           else
@@ -34,16 +38,16 @@ jobs:
       - name: Checkout PR Head Branch
         if: steps.check-pr.outputs.is-pr == 'true'
         run: |
-          git fetch origin pull/${{ github.event.pull_request.number }}/head:${{ github.head_ref }}
-          git checkout ${{ github.head_ref }}
+          git fetch origin "pull/$PR_NUMBER/head:$HEAD_REF"
+          git checkout "$HEAD_REF"
 
       - name: Check diff from Pull Request
         if: steps.check-pr.outputs.is-pr == 'true'
         id: check_diff
         run: |
           skipList=(".github/CODEOWNERS" ".prettierignore")
           # Ignores changelog.md, readme.md,...
-          fileChangesArray=($(git diff --name-only ${{ github.base_ref }}...${{ github.head_ref }} | grep -v '\.md$' || true))
+          fileChangesArray=($(git diff --name-only "$BASE_REF...$HEAD_REF" | grep -v '\.md$' || true))
           printf '%s\n' "${fileChangesArray[@]}"
           for item in "${fileChangesArray[@]}"
           do

CHANGELOG.md

@@ -112,6 +112,43 @@ Version 7 of the SDK is compatible with Sentry self-hosted versions 24.4.2 or hi
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8132)
   - [diff](https://github.com/getsentry/sentry-java/compare/7.20.1...8.13.2)
 
+## 6.16.0
+
+### Features
+
+- Introducing `@sentry/react-native/playground` ([#4916](https://github.com/getsentry/sentry-react-native/pull/4916))
+
+  The new `withSentryPlayground` component allows developers to verify
+  that the SDK is properly configured and reports errors as expected.
+
+  ```jsx
+  import * as Sentry from '@sentry/react-native';
+  import { withSentryPlayground } from '@sentry/react-native/playground';
+
+  function App() {
+    return <View>...</View>;
+  }
+
+  export default withSentryPlayground(
+    Sentry.wrap(App)
+  );
+  ```
+
+### Fixes
+
+- Adds support for React Native 0.80 ([#4938](https://github.com/getsentry/sentry-react-native/pull/4938))
+- Report slow and frozen frames as app start span data ([#4865](https://github.com/getsentry/sentry-react-native/pull/4865))
+- User set by `Sentry.setUser` is prefilled in Feedback Widget ([#4901](https://github.com/getsentry/sentry-react-native/pull/4901))
+  - User data are considered from all scopes in the following order current, isolation and global.
+
+## 6.15.1
+
+### Dependencies
+
+- Bump Cocoa SDK from v8.52.0 to v8.52.1 ([#4899](https://github.com/getsentry/sentry-react-native/pull/4899))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8521)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.52.0...8.52.1)
+
 ## 6.15.0
 
 ### Features

dev-packages/e2e-tests/cli.mjs

@@ -68,6 +68,25 @@ const testApp = `${e2eDir}/${testAppName}`;
 const appId = platform === 'ios' ? 'org.reactjs.native.example.RnDiffApp' : 'com.rndiffapp';
 const sentryAuthToken = env.SENTRY_AUTH_TOKEN;
 
+function runCodegenIfNeeded(rnVersion, platform, appDir) {
+  const versionNumber = parseFloat(rnVersion.replace(/[^\d.]/g, ''));
+  const shouldRunCodegen = platform === 'android' && versionNumber >= 0.80;
+
+  if (shouldRunCodegen) {
+    console.log(`Running codegen for React Native ${rnVersion}...`);
+    try {
+      execSync('./gradlew generateCodegenArtifactsFromSchema', {
+        stdio: 'inherit',
+        cwd: path.join(appDir, 'android'),
+        env: env
+      });
+      console.log('Gradle codegen task completed successfully');
+    } catch (error) {
+      console.error('Codegen failed:', error.message);
+    }
+  }
+}
+
 // Build and publish the SDK - we only need to do this once in CI.
 // Locally, we may want to get updates from the latest build so do it on every app build.
 if (actions.includes('create') || (env.CI === undefined && actions.includes('build'))) {
@@ -198,6 +217,8 @@ if (actions.includes('build')) {
 
     appProduct = `${appDir}/ios/DerivedData/Build/Products/${buildType}-iphonesimulator/${appName}.app`;
   } else if (platform == 'android') {
+    runCodegenIfNeeded(RNVersion, platform, appDir);
+
     execSync(`./gradlew assemble${buildType} -PreactNativeArchitectures=x86 --no-daemon`, {
       stdio: 'inherit',
       cwd: `${appDir}/android`,

dev-packages/e2e-tests/maestro/feedback.yml

@@ -17,3 +17,13 @@ jsEngine: graaljs
     file: feedback/happyFlow-android.yml
     when:
       platform: Android
+
+- runFlow:
+    file: feedback/captureFlow-ios.yml
+    when:
+      platform: iOS
+
+- runFlow:
+    file: feedback/captureFlow-android.yml
+    when:
+      platform: Android

dev-packages/e2e-tests/maestro/feedback/captureFlow-android.yml

@@ -0,0 +1,54 @@
+# This is a happy path test for the feedback widget on Android.
+# It verifies that the feedback form can be opened, filled out, and submitted successfully
+appId: ${APP_ID}
+jsEngine: graaljs
+---
+
+# Show feedback button
+- tapOn: 'Feedback'
+
+# Open feedback widget
+- tapOn: 'Report a Bug'
+
+# Assert that the feedback form is visible
+- extendedWaitUntil:
+    visible: 'Report a Bug'
+    timeout: 5_000
+
+# Fill out name field
+- tapOn: 'Your Name'
+- inputText: 'John Doe'
+
+# Fill out email field
+- tapOn: '[email protected]'
+- inputText: '[email protected]'
+
+# Fill out message field
+- tapOn: "What's the bug? What did you expect?"
+- inputText: 'This is a test feedback message with a screenshot from CI e2e tests'
+
+# Take screenshot
+- scrollUntilVisible:
+    element:
+      text: 'Take a screenshot'
+- tapOn: 'Take a screenshot'
+- tapOn: 'Take Screenshot'
+
+# Assert that the feedback form is visible
+- extendedWaitUntil:
+    visible: 'Report a Bug'
+    timeout: 5_000
+
+# Hide keyboard by tapping on a non-tappable element
+- tapOn: 'Email'
+
+# Submit feedback
+- scrollUntilVisible:
+    element:
+      text: 'Send Bug Report'
+- tapOn: 'Send Bug Report'
+- assertVisible: 'Thank you for your report!'
+- tapOn: 'OK'
+
+# Verify feedback form is closed and the home screen is visible
+- assertVisible: 'Welcome to React Native'

dev-packages/e2e-tests/maestro/feedback/captureFlow-ios.yml

@@ -0,0 +1,58 @@
+# This is a happy path test for the feedback widget on iOS.
+# It verifies that the feedback form can be opened, filled out, and submitted successfully
+appId: ${APP_ID}
+jsEngine: graaljs
+---
+
+# Show feedback button
+- tapOn: 'Feedback'
+
+# Open feedback widget
+- tapOn:
+    id: 'sentry-feedback-button'
+
+# Assert that the feedback form is visible
+- extendedWaitUntil:
+    visible:
+      id: 'sentry-feedback-form-title'
+    timeout: 5_000
+
+# Fill out name field
+- tapOn:
+    id: 'sentry-feedback-name-input'
+- inputText: 'John Doe'
+
+# Fill out email field
+- tapOn:
+    id: 'sentry-feedback-email-input'
+- inputText: '[email protected]'
+
+# Fill out message field
+- tapOn:
+    id: 'sentry-feedback-message-input'
+- inputText: 'This is a test feedback message with a screenshot from CI e2e tests'
+
+# Take screenshot
+- scrollUntilVisible:
+    element:
+      id: 'sentry-feedback-take-screenshot-button'
+- tapOn:
+    id: 'sentry-feedback-take-screenshot-button'
+- tapOn:
+    id: 'sentry-feedback-screenshot-button'
+
+# Hide keyboard by tapping on a non-tappable element
+- tapOn:
+    id: 'sentry-logo'
+
+# Submit feedback
+- scrollUntilVisible:
+    element:
+      id: 'sentry-feedback-submit-button'
+- tapOn:
+    id: 'sentry-feedback-submit-button'
+- assertVisible: 'Thank you for your report!'
+- tapOn: 'OK'
+
+# Verify feedback form is closed and the home screen is visible
+- assertVisible: 'Welcome to React Native'

dev-packages/e2e-tests/maestro/feedback/happyFlow-android.yml

@@ -27,6 +27,9 @@ jsEngine: graaljs
 - tapOn: "What's the bug? What did you expect?"
 - inputText: 'This is a test feedback message from CI e2e tests'
 
+# Hide keyboard by tapping on a non-tappable element
+- tapOn: 'Email'
+
 # Submit feedback
 - scrollUntilVisible:
     element: