Merge branch 'antonis/4358-Feedback-Form-Autoinject-Button' into antonis/feedback-theme

# Conflicts:
#	CHANGELOG.md

Author: antonis

.github/workflows/codeql-analysis.yml

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

.github/workflows/e2e.yml

@@ -159,6 +159,7 @@ jobs:
       USE_FRAMEWORKS: ${{ matrix.ios-use-frameworks }}
       PRODUCTION: ${{ matrix.build-type == 'production' && '1' || '0' }}
       RCT_NEW_ARCH_ENABLED: ${{ matrix.rn-architecture == 'new' && '1' || '0' }}
+      SENTRY_DISABLE_AUTO_UPLOAD: 'false'
     strategy:
       fail-fast: false # keeps matrix running if one fails
       matrix:

.github/workflows/release.yml

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

CHANGELOG.md

@@ -12,10 +12,35 @@
 
 - Add the `FeedbackButton` component that shows the Feedback Widget ([#4378](https://github.com/getsentry/sentry-react-native/pull/4378))
 - Add Feedback Widget theming ([#4677](https://github.com/getsentry/sentry-react-native/pull/4677))
+- Improve Warm App Start reporting on Android ([#4641](https://github.com/getsentry/sentry-react-native/pull/4641))
+- Add support for measuring Time to Initial Display for already seen routes ([#4661](https://github.com/getsentry/sentry-react-native/pull/4661))
+  - Introduce `enableTimeToInitialDisplayForPreloadedRoutes` option to the React Navigation integration.
+
+  ```js
+  Sentry.reactNavigationIntegration({
+    enableTimeToInitialDisplayForPreloadedRoutes: true,
+  });
+  ```
+
+- Add `createTimeToInitialDisplay({useFocusEffect})` and `createTimeToFullDisplay({useFocusEffect})` to allow record full display on screen focus ([#4665](https://github.com/getsentry/sentry-react-native/pull/4665))
+
+### Fixes
+
+- Equalize TTID and TTFD duration when TTFD manual API is called and resolved before auto TTID ([#4680](https://github.com/getsentry/sentry-react-native/pull/4680))
+
+### Changes
+
+- Change `gradle.projectsEvaluated` to `project.afterEvaluate` in the Sentry Gradle Plugin to fix tasks not being created when using `--configure-on-demand` ([#4687](https://github.com/getsentry/sentry-react-native/pull/4687))
+- Remove `SENTRY_FORCE_FOREGROUND` from Xcode Scripts as the underlying `--force-foreground` Sentry CLI is no-op since v2.37.0 ([#4689](https://github.com/getsentry/sentry-react-native/pull/4689))
+- TTID and TTFD use native getters instead of events to pass timestamps to the JS layer ([#4669](https://github.com/getsentry/sentry-react-native/pull/4669))
+
+## 6.10.0
+
+### 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))
-- Improve Warm App Start reporting on Android ([#4641](https://github.com/getsentry/sentry-react-native/pull/4641))
-- Add experimental flags `enableExperimentalViewRenderer` and `enableFastViewRendering` to enable up to 5x times more performance in Session Replay on iOS ([#4660](https://github.com/getsentry/sentry-react-native/pull/4660))
+- Add `enableExperimentalViewRenderer` to enable up to 5x times more performance in Session Replay on iOS ([#4660](https://github.com/getsentry/sentry-react-native/pull/4660))
 
   ```js
   import * as Sentry from '@sentry/react-native';
@@ -24,7 +49,6 @@
     integrations: [
       Sentry.mobileReplayIntegration({
         enableExperimentalViewRenderer: true,
-        enableFastViewRendering: true,
       }),
     ],
   });
@@ -48,9 +72,9 @@
 - Bump Cocoa SDK from v8.45.0 to v8.48.0 ([#4621](https://github.com/getsentry/sentry-react-native/pull/4621), [#4651](https://github.com/getsentry/sentry-react-native/pull/4651), [#4662](https://github.com/getsentry/sentry-react-native/pull/4662))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8480)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.45.0...8.48.0)
-- Bump Android SDK from v7.22.1 to v7.22.4 ([#4675](https://github.com/getsentry/sentry-react-native/pull/4675))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7224)
-  - [diff](https://github.com/getsentry/sentry-java/compare/7.22.1...7.22.4)
+- Bump Android SDK from v7.22.1 to v7.22.5 ([#4675](https://github.com/getsentry/sentry-react-native/pull/4675), [#4683](https://github.com/getsentry/sentry-react-native/pull/4683))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7225)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.22.1...7.22.5)
 
 ## 6.9.1
 

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "6.9.1",
+  "version": "6.10.0",
   "private": true,
   "description": "Sentry React Native End to End Tests Library",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
     "@sentry/core": "8.54.0",
-    "@sentry/react-native": "6.9.1",
+    "@sentry/react-native": "6.10.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",

dev-packages/e2e-tests/patch-scripts/rn.patch.xcode.js

@@ -32,15 +32,13 @@ if (semver.satisfies(args['rn-version'], `< ${newBundleScriptRNVersion}`, { incl
   logger.info('Applying old bundle script patch');
   bundleScript = `
 export NODE_BINARY=node
-export SENTRY_CLI_EXTRA_ARGS="--force-foreground"
 ../node_modules/@sentry/react-native/scripts/sentry-xcode.sh ../node_modules/react-native/scripts/react-native-xcode.sh
 `;
   bundleScriptRegex = /(packager|scripts)\/react-native-xcode\.sh\b/;
   bundlePatchRegex = /sentry-cli\s+react-native[\s-]xcode/;
 } else if (semver.satisfies(args['rn-version'], `>= ${newBundleScriptRNVersion}`, { includePrerelease: true })) {
   logger.info('Applying new bundle script patch');
   bundleScript = `
-export SENTRY_CLI_EXTRA_ARGS="--force-foreground"
 WITH_ENVIRONMENT="../node_modules/react-native/scripts/xcode/with-environment.sh"
 REACT_NATIVE_XCODE="../node_modules/react-native/scripts/react-native-xcode.sh"
 

dev-packages/type-check/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "6.9.1",
+  "version": "6.10.0",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }

dev-packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-samples-utils",
-  "version": "6.9.1",
+  "version": "6.10.0",
   "description": "Internal Samples Utils",
   "main": "index.js",
   "license": "MIT",

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.9.1",
+  "version": "6.10.0",
   "packages": [
     "packages/*",
     "dev-packages/*",

packages/core/RNSentryAndroidTester/app/build.gradle

@@ -43,6 +43,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.test:core-ktx:1.6.1'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.10.0'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1'

packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryOnDrawReporterTest.kt

@@ -0,0 +1,166 @@
+package io.sentry.react
+
+import android.app.Activity
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.facebook.react.bridge.ReactApplicationContext
+import io.sentry.android.core.BuildInfoProvider
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.mockito.MockitoAnnotations
+import org.mockito.kotlin.whenever
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class RNSentryOnDrawReporterTest {
+    companion object {
+        private const val TTID_PREFIX = RNSentryOnDrawReporterManager.TTID_PREFIX
+        private const val TTFD_PREFIX = RNSentryOnDrawReporterManager.TTFD_PREFIX
+        private const val SPAN_ID = "test-span-id"
+        private const val NEW_SPAN_ID = "new-test-span-id"
+    }
+
+    @Before
+    fun setUp() {
+        MockitoAnnotations.openMocks(this)
+    }
+
+    @Test
+    fun `when parentSpanId and timeToFullDisplay are set the next render timestamp is saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setFullDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+
+        assertNotNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + SPAN_ID))
+    }
+
+    @Test
+    fun `when parentSpanId and timeToInitialDisplay are set the next render timestamp is saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setInitialDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+
+        assertNotNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + SPAN_ID))
+    }
+
+    @Test
+    fun `when parentSpanId and timeToFullDisplay are set the next render timestamp is saved - reversed order`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setParentSpanId(SPAN_ID)
+        reporter.setFullDisplay(true)
+
+        assertNotNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + SPAN_ID))
+    }
+
+    @Test
+    fun `when parentSpanId and timeToInitialDisplay are set the next render timestamp is saved - reversed order`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setParentSpanId(SPAN_ID)
+        reporter.setInitialDisplay(true)
+
+        assertNotNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + SPAN_ID))
+    }
+
+    @Test
+    fun `when display flag and parentSpanId changes the next full display render is saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setFullDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + SPAN_ID)
+
+        reporter.setFullDisplay(false)
+        reporter.setFullDisplay(true)
+        reporter.setParentSpanId(NEW_SPAN_ID)
+        assertNotNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + NEW_SPAN_ID))
+    }
+
+    @Test
+    fun `when display flag and parentSpanId changes the next initial display render is saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setInitialDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + SPAN_ID)
+
+        reporter.setInitialDisplay(false)
+        reporter.setInitialDisplay(true)
+        reporter.setParentSpanId(NEW_SPAN_ID)
+        assertNotNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + NEW_SPAN_ID))
+    }
+
+    @Test
+    fun `when parentSpanId doesn't change the next full display render is not saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setFullDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + SPAN_ID)
+
+        reporter.setFullDisplay(false)
+        reporter.setFullDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        assertNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + SPAN_ID))
+    }
+
+    @Test
+    fun `when parentSpanId doesn't change the next initial display render is not saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setInitialDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + SPAN_ID)
+
+        reporter.setInitialDisplay(false)
+        reporter.setInitialDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        assertNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + SPAN_ID))
+    }
+
+    @Test
+    fun `when display flag doesn't change the next full display render is not saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setFullDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + SPAN_ID)
+
+        reporter.setFullDisplay(true)
+        assertNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTFD_PREFIX + SPAN_ID))
+    }
+
+    @Test
+    fun `when display flag doesn't change the next initial display render is not saved`() {
+        val reporter = createTestRNSentryOnDrawReporterView()
+        reporter.setInitialDisplay(true)
+        reporter.setParentSpanId(SPAN_ID)
+        RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + SPAN_ID)
+
+        reporter.setInitialDisplay(true)
+        assertNull(RNSentryTimeToDisplay.popTimeToDisplayFor(TTID_PREFIX + SPAN_ID))
+    }
+
+    class TestRNSentryOnDrawReporterView(
+        context: Context,
+        reactContext: ReactApplicationContext,
+        buildInfo: BuildInfoProvider,
+    ) : RNSentryOnDrawReporterManager.RNSentryOnDrawReporterView(context, reactContext, buildInfo) {
+        override fun registerForNextDraw(
+            activity: Activity,
+            callback: Runnable,
+            buildInfo: BuildInfoProvider,
+        ) {
+            callback.run()
+        }
+    }
+
+    private fun createTestRNSentryOnDrawReporterView(): TestRNSentryOnDrawReporterView =
+        TestRNSentryOnDrawReporterView(ApplicationProvider.getApplicationContext(), mockReactContext(), mockBuildInfo())
+
+    private fun mockReactContext(): ReactApplicationContext {
+        val reactContext = mock<ReactApplicationContext>()
+        whenever(reactContext.getCurrentActivity()).thenReturn(mock<Activity>())
+        return reactContext
+    }
+
+    private fun mockBuildInfo(): BuildInfoProvider = mock()
+}

packages/core/RNSentryAndroidTester/app/src/test/java/io/sentry/react/RNSentryTimeToDisplayTest.kt

@@ -0,0 +1,48 @@
+package io.sentry.react
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class RNSentryTimeToDisplayTest {
+    companion object {
+        val TEST_ID = "test-id"
+        val TEST_VAL = 123.4
+    }
+
+    @Before
+    fun setUp() {
+    }
+
+    @Test
+    fun `puts and pops record`() {
+        RNSentryTimeToDisplay.putTimeToDisplayFor(TEST_ID, TEST_VAL)
+
+        val firstPop = RNSentryTimeToDisplay.popTimeToDisplayFor(TEST_ID)
+        val secondPop = RNSentryTimeToDisplay.popTimeToDisplayFor(TEST_ID)
+
+        assertEquals(firstPop, TEST_VAL, 0.0)
+        assertNull(secondPop)
+    }
+
+    @Test
+    fun `removes oldes entry when full`() {
+        val maxSize = RNSentryTimeToDisplay.ENTRIES_MAX_SIZE + 1
+        for (i in 1..maxSize) {
+            RNSentryTimeToDisplay.putTimeToDisplayFor("$TEST_ID-$i", i.toDouble())
+        }
+
+        val oldestEntry = RNSentryTimeToDisplay.popTimeToDisplayFor("$TEST_ID-1")
+        val secondOldestEntry = RNSentryTimeToDisplay.popTimeToDisplayFor("$TEST_ID-2")
+        val newestEntry = RNSentryTimeToDisplay.popTimeToDisplayFor("$TEST_ID-$maxSize")
+
+        assertNull(oldestEntry)
+        assertNotNull(secondOldestEntry)
+        assertNotNull(newestEntry)
+    }
+}