Merge branch 'main' into hotfix/6.9.1

Author: krystofwoldrich

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,61 +1,63 @@
-name: "🐞 Bug Report"
+name: '🐞 Bug Report'
 description: "Tell us about something that's not working the way we (probably) intend."
-labels: ["Platform: React-Native", "Type: 🪲 Bug"]
+labels: ['Platform: React-Native', 'Type: 🪲 Bug']
+type: Bug
 body:
   - type: dropdown
     id: environment
     validations:
       required: true
     attributes:
-      label: "What React Native libraries do you use?"
-      description: "Select all options that describe your application."
+      label: 'What React Native libraries do you use?'
+      description: 'Select all options that describe your application.'
       multiple: true
       options:
-        - "React Native without Frameworks"
-        - "React Navigation"
-        - "Hermes"
-        - "RN New Architecture"
-        - "Expo Application Services (EAS)"
-        - "Expo (mobile only)"
-        - "Expo Web"
-        - "Expo Router"
-        - "React Native Web"
-        - "React Native Navigation by Wix"
+        - 'React Native without Frameworks'
+        - 'React Navigation'
+        - 'Hermes'
+        - 'RN New Architecture'
+        - 'Expo Application Services (EAS)'
+        - 'Expo (mobile only)'
+        - 'Expo Web'
+        - 'Expo Router'
+        - 'React Native Web'
+        - 'React Native Navigation by Wix'
 
   - type: dropdown
     id: sentry
     validations:
       required: true
     attributes:
-      label: "Are you using sentry.io or on-premise?"
-      description: "Select exactly one option."
+      label: 'Are you using sentry.io or on-premise?'
+      description: 'Select exactly one option.'
       options:
-        - "sentry.io (SaS)"
-        - "on-premise (Self-Hosted)"
+        - 'sentry.io (SaS)'
+        - 'on-premise (Self-Hosted)'
 
   - type: input
     id: version
     validations:
       required: true
     attributes:
-      label: "@sentry/react-native SDK Version"
-      description: "If the issue started after the SDK upgrade, please input both old and new versions."
-      placeholder: "5.33.1 ← should look like this"
+      label: '@sentry/react-native SDK Version'
+      description: 'If the issue started after the SDK upgrade, please input both old and new versions.'
+      placeholder: '5.33.1 ← should look like this'
 
   - type: textarea
     id: doctor
     validations:
       required: true
     attributes:
-      label: "How does your development environment look like?"
-      description: "Output of the command `npx react-native@latest info` or manully describe your development environment?"
+      label: 'How does your development environment look like?'
+      description:
+        'Output of the command `npx react-native@latest info` or manully describe your development environment?'
       placeholder: |-
         info Fetching system and libraries information...
         OS: OS version
         Node: Your version
         Yarn: Yarn version
         Expo SDK: Expo SDK version
-        react: React version 
+        react: React version
         react-native: React Native version
         hermesEnabled: bool
         newArchEnabled: bool
@@ -65,8 +67,8 @@ body:
     validations:
       required: true
     attributes:
-      label: "Sentry.init()"
-      description: "Code snipped of Sentry initialization from your application."
+      label: 'Sentry.init()'
+      description: 'Code snipped of Sentry initialization from your application.'
       placeholder: |-
         Sentry.init({
           dsn: 'https://[email protected]/...'
@@ -78,10 +80,10 @@ body:
     validations:
       required: true
     attributes:
-      label: "Steps to Reproduce"
+      label: 'Steps to Reproduce'
       description: "How can we see what you're seeing? Specific is terrific."
       placeholder: |-
-        1. Build Android using `npx react-native run-android --mode Debug` 
+        1. Build Android using `npx react-native run-android --mode Debug`
         2. Start Metro Dev server using `npx react-native start`
         3. Click on button executing `Sentry.capture(new Error("This is not captured :("))`
 
@@ -90,15 +92,15 @@ body:
     validations:
       required: true
     attributes:
-      label: "Expected Result"
+      label: 'Expected Result'
 
   - type: textarea
     id: actual
     validations:
       required: true
     attributes:
-      label: "Actual Result"
-      description: "JS Console? iOS Console? Logcat? Screenshots? Yes, please."
+      label: 'Actual Result'
+      description: 'JS Console? iOS Console? Logcat? Screenshots? Yes, please.'
 
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,37 @@
+name: 💡 Feature Request
+description: Tell us about a problem our SDK could solve but doesn't.
+labels: ['Platform: React-Native', 'enhancement']
+type: Feature
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem Statement
+      description: What problem could Sentry solve that it doesn't?
+      placeholder: |-
+        I want to make whirled peas, but Sentry doesn't blend.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Solution Brainstorm
+      description: We know you have bright ideas to share ... share away, friend.
+      placeholder: |-
+        Add a blender to Sentry.
+
+  - type: dropdown
+    id: submit-a-pr
+    attributes:
+      label: Are you willing to submit a PR?
+      description: We accept contributions!
+      options:
+        - 'Yes'
+        - 'No'
+
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # [email protected].9
+        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # [email protected].11
         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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # [email protected].9
+        uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # [email protected].11
 
       # ℹ️ 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@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # [email protected].9
+        uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # [email protected].11

.github/workflows/codeql-analysis.yml

@@ -171,9 +171,11 @@ jobs:
         include:
           - platform: ios
             rn-version: '0.77.1'
-            runs-on: macos-14
+            xcode-version: '16.2'
+            runs-on: macos-15
           - platform: ios
             rn-version: '0.65.3'
+            xcode-version: '14.2'
             runs-on: macos-13
           - platform: android
             runs-on: ubuntu-latest
@@ -221,8 +223,8 @@ jobs:
           echo "SENTRY_RELEASE=$SENTRY_RELEASE"
           echo "SENTRY_DIST=$SENTRY_DIST"
 
-      - run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer
-        if: ${{ matrix.platform == 'ios' && matrix.rn-version == '0.65.3' }}
+      - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
+        if: ${{ matrix.platform == 'ios' }}
 
       - run: corepack enable
       - uses: actions/setup-node@v4

.github/workflows/e2e.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
+        uses: actions/create-github-app-token@21cfef2b496dd8ef5b904c159339626a10ad380e # v1.11.6
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/release.yml

@@ -14,12 +14,12 @@ jobs:
 
   upload_to_testflight:
     name: Build and Upload React Native Sample to Testflight
-    runs-on: macos-14
+    runs-on: macos-15
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
       - uses: actions/checkout@v4
-      - run: sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
+      - run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
       - uses: ruby/setup-ruby@v1
         with:
           working-directory: samples/react-native

.github/workflows/testflight.yml

@@ -6,6 +6,30 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
+## Unreleased
+
+### Features
+
+- Add thread information to spans ([#4579](https://github.com/getsentry/sentry-react-native/pull/4579))
+- Exposed `getDataFromUri` as a public API to retrieve data from a URI ([#4638](https://github.com/getsentry/sentry-react-native/pull/4638))
+
+### Fixes
+
+- Considers the `SENTRY_DISABLE_AUTO_UPLOAD` and `SENTRY_DISABLE_NATIVE_DEBUG_UPLOAD` environment variables in the configuration of the Sentry Android Gradle Plugin for Expo plugin ([#4583](https://github.com/getsentry/sentry-react-native/pull/4583))
+- Handle non-string category in getCurrentScreen on iOS ([#4629](https://github.com/getsentry/sentry-react-native/pull/4629))
+
+### Dependencies
+
+- Bump Bundler Plugins from v3.2.0 to v3.2.2 ([#4585](https://github.com/getsentry/sentry-react-native/pull/4585), [#4620](https://github.com/getsentry/sentry-react-native/pull/4620))
+  - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#322)
+  - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.2.0...3.2.2)
+- Bump CLI from v2.42.1 to v2.42.2 ([#4586](https://github.com/getsentry/sentry-react-native/pull/4586))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2422)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.42.1...2.42.2)
+- Bump Cocoa SDK from v8.45.0 to v8.46.0 ([#4621](https://github.com/getsentry/sentry-react-native/pull/4621))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8460)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.45.0...8.46.0)
+
 ## 6.9.1
 
 ### Fixes
@@ -21,6 +45,10 @@
 
 ## 6.9.0
 
+> [!WARNING]
+> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 6.4.0 if you use this feature on Android.
+> See issue [#4598](https://github.com/getsentry/sentry-react-native/issues/4598) for more details.
+
 ### Features
 
 - User Feedback Widget Beta ([#4435](https://github.com/getsentry/sentry-react-native/pull/4435))
@@ -56,6 +84,10 @@
 
 ## 6.8.0
 
+> [!WARNING]
+> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 6.4.0 if you use this feature on Android.
+> See issue [#4598](https://github.com/getsentry/sentry-react-native/issues/4598) for more details.
+
 ### Features
 
 - Adds Sentry Android Gradle Plugin as an experimental Expo plugin feature ([#4440](https://github.com/getsentry/sentry-react-native/pull/4440))
@@ -101,6 +133,10 @@
 
 ## 6.7.0
 
+> [!WARNING]
+> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 6.4.0 if you use this feature on Android.
+> See issue [#4598](https://github.com/getsentry/sentry-react-native/issues/4598) for more details.
+
 ### Features
 
 - Add `ignoredComponents` option to `annotateReactComponents` to exclude specific components from React component annotations ([#4517](https://github.com/getsentry/sentry-react-native/pull/4517))
@@ -133,6 +169,10 @@
 
 ## 6.6.0
 
+> [!WARNING]
+> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 6.4.0 if you use this feature on Android.
+> See issue [#4598](https://github.com/getsentry/sentry-react-native/issues/4598) for more details.
+
 ### Features
 
 - Send Sentry React Native SDK version in the Session Replay Events on iOS ([#4450](https://github.com/getsentry/sentry-react-native/pull/4450))
@@ -169,6 +209,10 @@
 
 ## 6.5.0
 
+> [!WARNING]
+> This release contains an issue where Cold starts can be incorrectly reported as Warm starts on Android. We recommend staying on version 6.4.0 if you use this feature on Android.
+> See issue [#4598](https://github.com/getsentry/sentry-react-native/issues/4598) for more details.
+
 ### Features
 
 - Mobile Session Replay is now generally available and ready for production use ([#4384](https://github.com/getsentry/sentry-react-native/pull/4384))

CHANGELOG.md

@@ -20,6 +20,11 @@ declare global {
   }
   interface PerformanceEntry {}
 }
+
+declare module 'react-native' {
+  export interface TurboModule {}
+}
+
 import 'react-native';
 
 // we need to import the SDK to ensure tsc check the types

dev-packages/type-check/ts3.8-test/index.ts

@@ -30,7 +30,7 @@
   "devDependencies": {
     "@expo/swiftlint": "^0.57.1",
     "@naturalcycles/ktlint": "^1.13.0",
-    "@sentry/cli": "2.42.1",
+    "@sentry/cli": "2.42.2",
     "clang-format": "^1.8.0",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",

package.json

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

packages/core/RNSentry.podspec

@@ -54,6 +54,12 @@ final class RNSentryBreadcrumbTests: XCTestCase {
         XCTAssertNil(actual)
     }
 
+    func testNullForNonStringCategory() {
+        let map: [String: Any] = ["category": false]
+        let actual = RNSentryBreadcrumb.getCurrentScreen(from: map)
+        XCTAssertNil(actual)
+    }
+
     func testNullForNonNavigationCategory() {
         let map: [String: Any] = ["category": "unknown"]
         let actual = RNSentryBreadcrumb.getCurrentScreen(from: map)

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.swift

@@ -39,7 +39,8 @@ + (SentryBreadcrumb *)from:(NSDictionary *)dict
 + (NSString *_Nullable)getCurrentScreenFrom:(NSDictionary<NSString *, id> *_Nonnull)dict
 {
     NSString *_Nullable maybeCategory = [dict valueForKey:@"category"];
-    if (![maybeCategory isEqualToString:@"navigation"]) {
+    if ([maybeCategory isKindOfClass:[NSString class]]
+        && ![maybeCategory isEqualToString:@"navigation"]) {
         return nil;
     }