Merge branch 'main' into antonis/appstart-frames

# Conflicts:
#	CHANGELOG.md

Author: antonis

CHANGELOG.md

@@ -10,26 +10,50 @@
 
 ### 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))
 
 ### Fixes
 
 - 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))
 - Report slow and frozen frames as app start span data ([#4865](https://github.com/getsentry/sentry-react-native/pull/4865))
 
 ### Dependencies
 
 - Bump Bundler Plugins from v3.4.0 to v3.5.0 ([#4850](https://github.com/getsentry/sentry-react-native/pull/4850))
   - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#350)
   - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.4.0...3.5.0)
-- Bump Cocoa SDK from v8.50.2 to v8.51.1 ([#4839](https://github.com/getsentry/sentry-react-native/pull/4839))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8511)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.50.2...8.51.1)
+- Bump Cocoa SDK from v8.50.2 to v8.52.0 ([#4839](https://github.com/getsentry/sentry-react-native/pull/4839), [#4887](https://github.com/getsentry/sentry-react-native/pull/4887))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8520)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.50.2...8.52.0)
 - Bump CLI from v2.45.0 to v2.46.0 ([#4866](https://github.com/getsentry/sentry-react-native/pull/4866))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2460)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.45.0...2.46.0)

packages/core/RNSentry.podspec

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

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

@@ -81,7 +81,7 @@
     "@sentry-internal/eslint-config-sdk": "8.54.0",
     "@sentry-internal/eslint-plugin-sdk": "8.54.0",
     "@sentry-internal/typescript": "8.54.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",

yarn.lock

@@ -8897,7 +8897,7 @@ __metadata:
     "@sentry/react": 8.54.0
     "@sentry/types": 8.54.0
     "@sentry/utils": 8.54.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
@@ -8990,9 +8990,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
@@ -9011,7 +9011,7 @@ __metadata:
     yargs: ^16.2.0
   bin:
     sentry-wizard: dist/bin.js
-  checksum: bfa966fad28329d2c9c5adee3591689ea1fae6769a77ca06f2d622481fa169e05f05a8cadf8e49e6814cedfb1431641416ce77611585e413960a01b73472015b
+  checksum: d50b46266b2680872cd21a03c9daafa7b5f9d10c319c27d665585e66042b990c451fddaa8d4eff94ceb6b4803f0e721c9804b81e8672df51e3af7f057206d7d9
   languageName: node
   linkType: hard