Merge branch 'feat/replay' into kw/add-rn-svg-block

Author: krystofwoldrich

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # pin@v2
+        uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # pin@v3.25.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@3ab4101902695724f9365a384f86c1074d94e18c # pin@v2
+        uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # pin@v3.25.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@3ab4101902695724f9365a384f86c1074d94e18c # pin@v2
+        uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # pin@v3.25.11

.github/workflows/e2e.yml

@@ -22,7 +22,7 @@ jobs:
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@01ce38bf961b4e243a6342cbade0dbc8ba3f0432 # [email protected].0
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # [email protected].1
         with:
           access_token: ${{ github.token }}
 
@@ -568,7 +568,7 @@ jobs:
         if: ${{ matrix.platform == 'android' }}
         env:
           APPIUM_APP: ./app-release.apk
-        uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # pin@v2
+        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 # pin@v2.31.0
         with:
           working-directory: test/e2e
           api-level: 30

.github/workflows/native-tests.yml

@@ -15,7 +15,7 @@ jobs:
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@01ce38bf961b4e243a6342cbade0dbc8ba3f0432 # [email protected].0
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # [email protected].1
         with:
           access_token: ${{ github.token }}
 
@@ -97,7 +97,7 @@ jobs:
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 #pin@v2.30.1
+        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
         with:
           api-level: 30
           force-avd-creation: false
@@ -117,7 +117,7 @@ jobs:
           script: echo "Generated AVD snapshot for caching."
 
       - name: Run connected tests
-        uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 #pin@v2.30.1
+        uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32 #pin@v2.31.0
         with:
           working-directory: RNSentryAndroidTester
           api-level: 30

.github/workflows/sample-application.yml

@@ -23,7 +23,7 @@ jobs:
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@01ce38bf961b4e243a6342cbade0dbc8ba3f0432 # [email protected].0
+        uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # [email protected].1
         with:
           access_token: ${{ github.token }}
 

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Features
 
 - Redact `react-native-svg` SVGs when `maskAllVectors` ([#3930](https://github.com/getsentry/sentry-react-native/pull/3930))
+- Set `currentScreen` on native scope ([#3927](https://github.com/getsentry/sentry-react-native/pull/3927))
 - Add `annotateReactComponents` option to `@sentry/react-native/metro` ([#3916](https://github.com/getsentry/sentry-react-native/pull/3916))
 
   ```js
@@ -18,6 +19,19 @@
   module.exports = withSentryConfig(getDefaultConfig(__dirname), { annotateReactComponents: true });
   ```
 
+### Fixes
+
+- Add `app.foreground/background` breadcrumbs to iOS Replays ([#3932](https://github.com/getsentry/sentry-react-native/pull/3932))
+- errors with cause are now correctly serialized on debug build ([#3920](https://github.com/getsentry/sentry-react-native/pull/3920))
+- Flavor aware Android builds use `SENTRY_AUTH_TOKEN` env as fallback when token not found in `sentry-flavor-type.properties`. ([#3917](https://github.com/getsentry/sentry-react-native/pull/3917))
+- `mechanism.handled:false` should crash current session ([#3900](https://github.com/getsentry/sentry-react-native/pull/3900))
+
+### Dependencies
+
+- Bump Android SDK from v7.11.0-alpha.2 to v7.12.0-alpha.3 ([#3830](https://github.com/getsentry/sentry-react-native/pull/3830))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/7.12.0-alpha.3/CHANGELOG.md#7120-alpha3)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.11.0-alpha.2...7.12.0-alpha.3)
+
 ## 5.25.0-alpha.2
 
 ### Features

RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryBreadcrumbTest.kt

@@ -0,0 +1,66 @@
+package io.sentry.rnsentryandroidtester
+
+import com.facebook.react.bridge.JavaOnlyMap
+import io.sentry.react.RNSentryBreadcrumb
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class RNSentryBreadcrumbTest {
+
+    @Test
+    fun nullForMissingCategory() {
+        val map = JavaOnlyMap.of()
+        val actual = RNSentryBreadcrumb.getCurrentScreenFrom(map)
+        assertEquals(null, actual)
+    }
+
+
+    @Test
+    fun nullForNonNavigationCategory() {
+        val map = JavaOnlyMap.of(
+            "category", "unknown"
+        )
+        val actual = RNSentryBreadcrumb.getCurrentScreenFrom(map)
+        assertEquals(null, actual)
+    }
+
+
+    @Test
+    fun nullForMissingData() {
+        val map = JavaOnlyMap.of(
+            "category", "navigation"
+        )
+        val actual = RNSentryBreadcrumb.getCurrentScreenFrom(map)
+        assertEquals(null, actual)
+    }
+
+
+    @Test
+    fun nullForNonStringDataToKey() {
+        val map = JavaOnlyMap.of(
+            "category", "unknown",
+            "data", mapOf(
+                "to" to 123,
+            ),
+        )
+        val actual = RNSentryBreadcrumb.getCurrentScreenFrom(map)
+        assertEquals(null, actual)
+    }
+
+    @Test
+    fun screenNameForValidNavigationBreadcrumb() {
+        val map = JavaOnlyMap.of(
+            "category", "navigation",
+            "data", JavaOnlyMap.of(
+                "to", "newScreen",
+            ),
+        )
+        val actual = RNSentryBreadcrumb.getCurrentScreenFrom(map)
+        assert(actual is String)
+        assertEquals("newScreen", actual)
+    }
+
+}

RNSentryAndroidTester/app/src/test/java/io/sentry/rnsentryandroidtester/RNSentryReplayBreadcrumbConverterTest.kt

@@ -2,6 +2,7 @@ package io.sentry.rnsentryandroidtester
 
 import io.sentry.Breadcrumb
 import io.sentry.react.RNSentryReplayBreadcrumbConverter
+import io.sentry.rrweb.RRWebBreadcrumbEvent
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,6 +11,30 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class RNSentryReplayBreadcrumbConverterTest {
 
+    @Test
+    fun testConvertForegroundBreadcrumb() {
+        val converter = RNSentryReplayBreadcrumbConverter()
+        val testBreadcrumb = Breadcrumb()
+        testBreadcrumb.type = "navigation"
+        testBreadcrumb.category = "app.lifecycle"
+        testBreadcrumb.setData("state", "foreground");
+        val actual = converter.convert(testBreadcrumb) as RRWebBreadcrumbEvent
+
+        assertEquals("app.foreground", actual.category)
+    }
+
+    @Test
+    fun testConvertBackgroundBreadcrumb() {
+        val converter = RNSentryReplayBreadcrumbConverter()
+        val testBreadcrumb = Breadcrumb()
+        testBreadcrumb.type = "navigation"
+        testBreadcrumb.category = "app.lifecycle"
+        testBreadcrumb.setData("state", "background");
+        val actual = converter.convert(testBreadcrumb) as RRWebBreadcrumbEvent
+
+        assertEquals("app.background", actual.category)
+    }
+
     @Test
     fun doesNotConvertSentryEventBreadcrumb() {
         val converter = RNSentryReplayBreadcrumbConverter()

RNSentryCocoaTester/RNSentryCocoaTester.xcodeproj/project.pbxproj

@@ -18,11 +18,11 @@
 
 /* Begin PBXFileReference section */
 		1482D5685A340AB93348A43D /* Pods-RNSentryCocoaTesterTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNSentryCocoaTesterTests.release.xcconfig"; path = "Target Support Files/Pods-RNSentryCocoaTesterTests/Pods-RNSentryCocoaTesterTests.release.xcconfig"; sourceTree = "<group>"; };
-		330F308B2C0F3840002A0D4E /* RNSentryBreadcrumbTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSentryBreadcrumbTests.m; sourceTree = "<group>"; };
 		330F308D2C0F385A002A0D4E /* RNSentryBreadcrumb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSentryBreadcrumb.h; path = ../ios/RNSentryBreadcrumb.h; sourceTree = "<group>"; };
 		336084372C32E382008CC412 /* RNSentryCocoaTesterTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNSentryCocoaTesterTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		336084382C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNSentryReplayBreadcrumbConverterTests.swift; sourceTree = "<group>"; };
 		3360843A2C32E3A8008CC412 /* RNSentryReplayBreadcrumbConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSentryReplayBreadcrumbConverter.h; path = ../ios/RNSentryReplayBreadcrumbConverter.h; sourceTree = "<group>"; };
+		3360843C2C340C76008CC412 /* RNSentryBreadcrumbTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RNSentryBreadcrumbTests.swift; sourceTree = "<group>"; };
 		3360898D29524164007C7730 /* RNSentryCocoaTesterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNSentryCocoaTesterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		338739072A7D7D2800950DDD /* RNSentryTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSentryTests.h; sourceTree = "<group>"; };
 		33958C672BFCEF5A00AD1FB6 /* RNSentryOnDrawReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNSentryOnDrawReporter.h; path = ../ios/RNSentryOnDrawReporter.h; sourceTree = "<group>"; };
@@ -88,8 +88,8 @@
 				33AFDFF02B8D15E500AAB120 /* RNSentryDependencyContainerTests.m */,
 				33AFDFF22B8D15F600AAB120 /* RNSentryDependencyContainerTests.h */,
 				33958C682BFCF12600AD1FB6 /* RNSentryOnDrawReporterTests.m */,
-				330F308B2C0F3840002A0D4E /* RNSentryBreadcrumbTests.m */,
-				336084372C32E382008CC412 /* RNSentryCocoaTesterTests-Bridging-Header.h */,
+				3360843C2C340C76008CC412 /* RNSentryBreadcrumbTests.swift */,
+				3360843B2C340C75008CC412 /* RNSentryCocoaTesterTests-Bridging-Header.h */,
 			);
 			path = RNSentryCocoaTesterTests;
 			sourceTree = "<group>";
@@ -219,7 +219,7 @@
 				336084392C32E382008CC412 /* RNSentryReplayBreadcrumbConverterTests.swift in Sources */,
 				33F58AD02977037D008F60EA /* RNSentryTests.mm in Sources */,
 				33958C692BFCF12600AD1FB6 /* RNSentryOnDrawReporterTests.m in Sources */,
-				330F308C2C0F3840002A0D4E /* RNSentryBreadcrumbTests.m in Sources */,
+				3360843D2C340C76008CC412 /* RNSentryBreadcrumbTests.swift in Sources */,
 				33AFDFED2B8D14B300AAB120 /* RNSentryFramesTrackerListenerTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryBreadcrumbTests.m

@@ -0,0 +1,68 @@
+import XCTest
+import Sentry
+
+class RNSentryBreadcrumbTests: XCTestCase {
+
+    func testGeneratesSentryBreadcrumbFromNSDictionary() {
+        let actualCrumb = RNSentryBreadcrumb.from([
+            "level": "error",
+            "category": "testCategory",
+            "type": "testType",
+            "message": "testMessage",
+            "data": [
+                "test": "data"
+            ]
+        ])
+
+        XCTAssertEqual(actualCrumb!.level, SentryLevel.error)
+        XCTAssertEqual(actualCrumb!.category, "testCategory")
+        XCTAssertEqual(actualCrumb!.type, "testType")
+        XCTAssertEqual(actualCrumb!.message, "testMessage")
+        XCTAssertEqual((actualCrumb!.data)!["test"] as! String, "data")
+    }
+
+    func testUsesInfoAsDefaultSentryLevel() {
+        let actualCrumb = RNSentryBreadcrumb.from([
+            "message": "testMessage"
+        ])
+
+        XCTAssertEqual(actualCrumb!.level, SentryLevel.info)
+    }
+
+    func testNullForMissingCategory() {
+        let map: [String: Any] = [:]
+        let actual = RNSentryBreadcrumb.getCurrentScreen(from: map)
+        XCTAssertNil(actual)
+    }
+
+    func testNullForNonNavigationCategory() {
+        let map: [String: Any] = ["category": "unknown"]
+        let actual = RNSentryBreadcrumb.getCurrentScreen(from: map)
+        XCTAssertNil(actual)
+    }
+
+    func testNullForMissingData() {
+        let map: [String: Any] = ["category": "navigation"]
+        let actual = RNSentryBreadcrumb.getCurrentScreen(from: map)
+        XCTAssertNil(actual)
+    }
+
+    func testNullForNonStringDataToKey() {
+        let map: [String: Any] = [
+            "category": "unknown",
+            "data": ["to": 123]
+        ]
+        let actual = RNSentryBreadcrumb.getCurrentScreen(from: map)
+        XCTAssertNil(actual)
+    }
+
+    func testScreenNameForValidNavigationBreadcrumb() {
+        let map: [String: Any] = [
+            "category": "navigation",
+            "data": ["to": "newScreen"]
+        ]
+        let actual = RNSentryBreadcrumb.getCurrentScreen(from: map)
+        XCTAssertEqual(actual, "newScreen")
+    }
+
+}