Merge remote-tracking branch 'origin/main' into v7

Author: krystofwoldrich

.github/workflows/e2e.yml renamed to .github/workflows/e2e-v2.yml

@@ -1,4 +1,4 @@
-name: End-to-End Tests
+name: End-to-End Tests V2
 
 on:
   push:

CHANGELOG.md

@@ -10,9 +10,32 @@
 
 ### Features
 
-- Adds the `FeedbackButton` component that shows the Feedback Widget ([#4378](https://github.com/getsentry/sentry-react-native/pull/4378))
-- Adds the `ScreenshotButton` component that takes a screenshot ([#4714](https://github.com/getsentry/sentry-react-native/issues/4714))
-- Add Feedback Widget theming ([#4677](https://github.com/getsentry/sentry-react-native/pull/4677))
+- User Feedback Widget Updates
+  - `FeedbackButton` for easy access to the widget ([#4378](https://github.com/getsentry/sentry-react-native/pull/4378))
+  - `ScreenshotButton` for capturing the application visuals ([#4714](https://github.com/getsentry/sentry-react-native/issues/4714))
+  - Theming support to better align with the application styles ([#4677](https://github.com/getsentry/sentry-react-native/pull/4677))
+
+  ```js
+  Sentry.init({
+    integrations: [
+      Sentry.feedbackIntegration({
+        enableTakeScreenshot: true, // Enables `ScreenshotButton`
+        themeDark: {
+          // Add dark theme styles here
+        },
+        themeLight: {
+          // Add light theme styles here
+        },
+      }),
+    ],
+  });
+
+  Sentry.showFeedbackButton();
+  Sentry.hideFeedbackButton();
+  ```
+
+  To learn more visit [the documentation](https://docs.sentry.io/platforms/react-native/user-feedback).
+
 - Re-export `ErrorEvent` and `TransactionEvent` types ([#4859](https://github.com/getsentry/sentry-react-native/pull/4859))
 
 ### Major Changes
@@ -31,6 +54,7 @@
 - crashedLastRun now returns the correct value ([#4829](https://github.com/getsentry/sentry-react-native/pull/4829))
 - Use engine-specific promise rejection tracking ([#4826](https://github.com/getsentry/sentry-react-native/pull/4826))
 - Fixes Feedback Widget accessibility issue on iOS ([#4739](https://github.com/getsentry/sentry-react-native/pull/4739))
+- Measuring TTID or TTFD could cause a crash when `parentSpanId` was removed ([#4881](https://github.com/getsentry/sentry-react-native/pull/4881))
 
 ### Dependencies
 

dev-packages/e2e-tests/cli.mjs

@@ -234,16 +234,35 @@ if (actions.includes('test')) {
   if (!sentryAuthToken) {
     console.log('Skipping maestro test due to unavailable or empty SENTRY_AUTH_TOKEN');
   } else {
-    execSync(
-      `maestro test maestro \
-        --env=APP_ID="${appId}" \
-        --env=SENTRY_AUTH_TOKEN="${sentryAuthToken}" \
-        --debug-output maestro-logs \
-        --flatten-debug-output`,
-      {
-        stdio: 'inherit',
-        cwd: e2eDir,
-      },
-    );
+    try {
+      execSync(
+        `maestro test maestro \
+          --env=APP_ID="${appId}" \
+          --env=SENTRY_AUTH_TOKEN="${sentryAuthToken}" \
+          --debug-output maestro-logs \
+          --flatten-debug-output`,
+        {
+          stdio: 'inherit',
+          cwd: e2eDir,
+        },
+      );
+    } finally {
+      // Always redact sensitive data, even if the test fails
+      const redactScript = `
+        if [[ "$(uname)" == "Darwin" ]]; then
+          find ./maestro-logs -type f -exec sed -i '' "s/${sentryAuthToken}/[REDACTED]/g" {} +
+          echo 'Redacted sensitive data from logs on MacOS'
+        else
+          find ./maestro-logs -type f -exec sed -i "s/${sentryAuthToken}/[REDACTED]/g" {} +
+          echo 'Redacted sensitive data from logs on Ubuntu'
+        fi
+      `;
+
+      try {
+        execSync(redactScript, { stdio: 'inherit', cwd: e2eDir, shell: '/bin/bash' });
+      } catch (error) {
+        console.warn('Failed to redact sensitive data from logs:', error.message);
+      }
+    }
   }
 }

dev-packages/e2e-tests/maestro/utils/launchTestAppClear.yml

@@ -8,7 +8,6 @@ jsEngine: graaljs
 - launchApp:
     clearState: true
     arguments:
-      sentryAuthToken: ${SENTRY_AUTH_TOKEN}
       replaysOnErrorSampleRate: ${replaysOnErrorSampleRate}
 
 - runFlow: assertTestReady.yml

dev-packages/e2e-tests/src/EndToEndTests.tsx

@@ -1,28 +1,9 @@
 import * as Sentry from '@sentry/react-native';
 import * as React from 'react';
 import { Text, View } from 'react-native';
-import { LaunchArguments } from "react-native-launch-arguments";
 
 const E2E_TESTS_READY_TEXT = 'E2E Tests Ready';
 
-const getSentryAuthToken = ():
-  | { token: string }
-  | { error: string } => {
-  const { sentryAuthToken } = LaunchArguments.value<{
-    sentryAuthToken: unknown;
-  }>();
-
-  if (typeof sentryAuthToken !== 'string') {
-    return { error: 'Sentry Auth Token is required' };
-  }
-
-  if (sentryAuthToken.length === 0) {
-    return { error: 'Sentry Auth Token must not be empty' };
-  }
-
-  return { token: sentryAuthToken };
-};
-
 const EndToEndTestsScreen = (): JSX.Element => {
   const [isReady, setIsReady] = React.useState(false);
   const [eventId, setEventId] = React.useState<string | null>(null);

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryOnDrawReporterTests.swift

@@ -119,4 +119,30 @@ final class RNSentryOnDrawReporterTests: XCTestCase {
 
         XCTAssertNil(RNSentryTimeToDisplay.pop(for: ttidPrefix + spanId))
     }
+
+    func testFullDisplayEmitNewFrameCallbackHandlesMissingParentSpanId() {
+        let reporter = RNSentryOnDrawReporterView.createWithMockedListener()
+
+        // We call the callback manually in this test to simulate a change between
+        // start of listening for next frame and the next frame render
+        let emitNewFrameCallback = reporter!.createEmitNewFrameEvent()
+
+        reporter!.fullDisplay = true
+        reporter!.parentSpanId = nil
+
+        emitNewFrameCallback!(1)
+    }
+
+    func testInitialDisplayEmitNewFrameCallbackHandlesMissingParentSpanId() {
+        let reporter = RNSentryOnDrawReporterView.createWithMockedListener()
+
+        // We call the callback manually in this test to simulate a change between
+        // start of listening for next frame and the next frame render
+        let emitNewFrameCallback = reporter!.createEmitNewFrameEvent()
+
+        reporter!.initialDisplay = true
+        reporter!.parentSpanId = nil
+
+        emitNewFrameCallback!(1)
+    }
 }

packages/core/ios/RNSentryOnDrawReporter.m

@@ -42,6 +42,10 @@ - (RNSentryEmitNewFrameEvent)createEmitNewFrameEvent
     return ^(NSNumber *newFrameTimestampInSeconds) {
         self->isListening = NO;
 
+        if (![_parentSpanId isKindOfClass:[NSString class]]) {
+            return;
+        }
+
         if (self->_fullDisplay) {
             [RNSentryTimeToDisplay
                 putTimeToDisplayFor:[@"ttfd-" stringByAppendingString:self->_parentSpanId]

packages/core/package.json

@@ -80,7 +80,7 @@
     "@sentry-internal/eslint-config-sdk": "9.22.0",
     "@sentry-internal/eslint-plugin-sdk": "9.22.0",
     "@sentry-internal/typescript": "9.22.0",
-    "@sentry/wizard": "5.0.0",
+    "@sentry/wizard": "5.1.0",
     "@testing-library/react-native": "^12.7.2",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.9.3",

scripts/update-maestro.sh

@@ -8,7 +8,7 @@ fi
 
 # yml files to search and update MAESTRO_VERSION
 files=(
-  "$(dirname "$0")/../.github/workflows/e2e.yml"
+  "$(dirname "$0")/../.github/workflows/e2e-v2.yml"
   "$(dirname "$0")/../.github/workflows/sample-application.yml"
 )
 

yarn.lock

@@ -8895,7 +8895,7 @@ __metadata:
     "@sentry/core": 9.22.0
     "@sentry/react": 9.22.0
     "@sentry/types": 9.22.0
-    "@sentry/wizard": 5.0.0
+    "@sentry/wizard": 5.1.0
     "@testing-library/react-native": ^12.7.2
     "@types/jest": ^29.5.13
     "@types/node": ^20.9.3
@@ -8979,9 +8979,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/wizard@npm:5.0.0":
-  version: 5.0.0
-  resolution: "@sentry/wizard@npm:5.0.0"
+"@sentry/wizard@npm:5.1.0":
+  version: 5.1.0
+  resolution: "@sentry/wizard@npm:5.1.0"
   dependencies:
     "@clack/core": ^0.3.4
     "@clack/prompts": 0.7.0
@@ -9000,7 +9000,7 @@ __metadata:
     yargs: ^16.2.0
   bin:
     sentry-wizard: dist/bin.js
-  checksum: bfa966fad28329d2c9c5adee3591689ea1fae6769a77ca06f2d622481fa169e05f05a8cadf8e49e6814cedfb1431641416ce77611585e413960a01b73472015b
+  checksum: d50b46266b2680872cd21a03c9daafa7b5f9d10c319c27d665585e66042b990c451fddaa8d4eff94ceb6b4803f0e721c9804b81e8672df51e3af7f057206d7d9
   languageName: node
   linkType: hard