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

# Conflicts:
#	CHANGELOG.md

Author: antonis

CHANGELOG.md

@@ -10,9 +10,15 @@
 
 ### Features
 
-- Add the `FeedbackButton` component that shows the Feedback Widget ([#4378](https://github.com/getsentry/sentry-react-native/pull/4378))
+- Adds 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))
+
+## 6.11.0-beta.0
+
+### Features
+
+- Improve Warm App Start reporting on Android ([#4641](https://github.com/getsentry/sentry-react-native/pull/4641), [#4695](https://github.com/getsentry/sentry-react-native/pull/4695))
+- Add `createTimeToInitialDisplay({useFocusEffect})` and `createTimeToFullDisplay({useFocusEffect})` to allow record full display on screen focus ([#4665](https://github.com/getsentry/sentry-react-native/pull/4665))
 - 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.
 
@@ -22,17 +28,25 @@
   });
   ```
 
-- Add `createTimeToInitialDisplay({useFocusEffect})` and `createTimeToFullDisplay({useFocusEffect})` to allow record full display on screen focus ([#4665](https://github.com/getsentry/sentry-react-native/pull/4665))
+- Add `useDispatchedActionData` option to the React Navigation integration to filter out navigation actions that should not create spans ([#4684](https://github.com/getsentry/sentry-react-native/pull/4684))
+  - For example `PRELOAD`, `SET_PARAMS`, `TOGGLE_DRAWER` and others.
+
+  ```js
+  Sentry.reactNavigationIntegration({
+    useDispatchedActionData: true,
+  });
+  ```
 
 ### 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))
+- Avoid loading Sentry native components in Expo Go ([#4696](https://github.com/getsentry/sentry-react-native/pull/4696))
 
 ### 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))
+- TTID and TTFD use native getters instead od events to pass timestamps to the JS layer ([#4669](https://github.com/getsentry/sentry-react-native/pull/4669), [#4681](https://github.com/getsentry/sentry-react-native/pull/4681))
 
 ## 6.10.0
 

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.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.10.0",
+    "@sentry/react-native": "6.11.0-beta.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",

dev-packages/type-check/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "6.10.0",
+  "version": "6.11.0-beta.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.10.0",
+  "version": "6.11.0-beta.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.10.0",
+  "version": "6.11.0-beta.0",
   "packages": [
     "packages/*",
     "dev-packages/*",

packages/core/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -29,7 +29,6 @@
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.JavascriptException;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import io.sentry.Breadcrumb;
 import io.sentry.HubAdapter;
 import io.sentry.ILogger;
@@ -154,11 +153,7 @@ private ReactApplicationContext getReactApplicationContext() {
   private @NotNull Runnable createEmitNewFrameEvent() {
     return () -> {
       final SentryDate endDate = dateProvider.now();
-      WritableMap event = Arguments.createMap();
-      event.putDouble("newFrameTimestampInSeconds", endDate.nanoTimestamp() / 1e9);
-      getReactApplicationContext()
-          .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-          .emit("rn_sentry_new_frame", event);
+      RNSentryTimeToDisplay.putTimeToInitialDisplayForActiveSpan(endDate.nanoTimestamp() / 1e9);
     };
   }
 
@@ -725,6 +720,11 @@ public void popTimeToDisplayFor(String screenId, Promise promise) {
     }
   }
 
+  public boolean setActiveSpanId(@Nullable String spanId) {
+    RNSentryTimeToDisplay.setActiveSpanId(spanId);
+    return true; // The return ensure RN executes the code synchronously
+  }
+
   public void setExtra(String key, String extra) {
     if (key == null || extra == null) {
       logger.log(

packages/core/android/src/main/java/io/sentry/react/RNSentryTimeToDisplay.java

@@ -8,6 +8,7 @@
 import io.sentry.SentryDateProvider;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import org.jetbrains.annotations.Nullable;
 
 public final class RNSentryTimeToDisplay {
 
@@ -22,10 +23,27 @@ protected boolean removeEldestEntry(Map.Entry<String, Double> eldest) {
         }
       };
 
+  /**
+   * The active span id that is used to attribute the time to display to the active span in case of
+   * a screen navigation where native time to display is not available to assign the span id
+   * received from JS.
+   */
+  private static @Nullable String activeSpanId = null;
+
+  public static void setActiveSpanId(@Nullable String spanId) {
+    activeSpanId = spanId;
+  }
+
   public static Double popTimeToDisplayFor(String screenId) {
     return screenIdToRenderDuration.remove(screenId);
   }
 
+  public static void putTimeToInitialDisplayForActiveSpan(Double value) {
+    if (activeSpanId != null) {
+      putTimeToDisplayFor("ttid-navigation-" + activeSpanId, value);
+    }
+  }
+
   public static void putTimeToDisplayFor(String screenId, Double value) {
     screenIdToRenderDuration.put(screenId, value);
   }

packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java

@@ -2,7 +2,7 @@
 
 class RNSentryVersion {
   static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native";
-  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.10.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "6.11.0-beta.0";
   static final String NATIVE_SDK_NAME = "sentry.native.android.react-native";
   static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
   static final String REACT_NATIVE_SDK_NAME = "sentry.javascript.react-native";

packages/core/android/src/newarch/java/io/sentry/react/RNSentryModule.java

@@ -187,4 +187,9 @@ public void getDataFromUri(String uri, Promise promise) {
   public void popTimeToDisplayFor(String key, Promise promise) {
     this.impl.popTimeToDisplayFor(key, promise);
   }
+
+  @Override
+  public boolean setActiveSpanId(String spanId) {
+    return this.impl.setActiveSpanId(spanId);
+  }
 }

packages/core/android/src/oldarch/java/io/sentry/react/RNSentryModule.java

@@ -182,4 +182,9 @@ public void crashedLastRun(Promise promise) {
   public void getNewScreenTimeToDisplay(Promise promise) {
     this.impl.getNewScreenTimeToDisplay(promise);
   }
+
+  @ReactMethod
+  public boolean setActiveSpanId(String spanId) {
+    return this.impl.setActiveSpanId(spanId);
+  }
 }

packages/core/ios/RNSentry.mm

@@ -288,13 +288,8 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
 - (void)initFramesTracking
 {
 #if SENTRY_HAS_UIKIT
-
     RNSentryEmitNewFrameEvent emitNewFrameEvent = ^(NSNumber *newFrameTimestampInSeconds) {
-        if (self->hasListeners) {
-            [self
-                sendEventWithName:RNSentryNewFrameEvent
-                             body:@{ @"newFrameTimestampInSeconds" : newFrameTimestampInSeconds }];
-        }
+        [RNSentryTimeToDisplay putTimeToInitialDisplayForActiveSpan:newFrameTimestampInSeconds];
     };
     [[RNSentryDependencyContainer sharedInstance]
         initializeFramesTrackerListenerWith:emitNewFrameEvent];
@@ -969,4 +964,10 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
     resolve([RNSentryTimeToDisplay popTimeToDisplayFor:key]);
 }
 
+RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, setActiveSpanId : (NSString *)spanId)
+{
+    [RNSentryTimeToDisplay setActiveSpanId:spanId];
+    return @YES; // The return ensures that the method is synchronous
+}
+
 @end

packages/core/ios/RNSentryTimeToDisplay.h

@@ -6,6 +6,8 @@ static const int TIME_TO_DISPLAY_ENTRIES_MAX_SIZE = 50;
 
 + (NSNumber *)popTimeToDisplayFor:(NSString *)screenId;
 + (void)putTimeToDisplayFor:(NSString *)screenId value:(NSNumber *)value;
++ (void)setActiveSpanId:(NSString *)spanId;
++ (void)putTimeToInitialDisplayForActiveSpan:(NSNumber *)timestampSeconds;
 
 - (void)getTimeToDisplay:(RCTResponseSenderBlock)callback;
 

packages/core/ios/RNSentryTimeToDisplay.m

@@ -11,23 +11,40 @@ @implementation RNSentryTimeToDisplay {
 static NSMutableArray<NSString *> *screenIdAge;
 static NSUInteger screenIdCurrentIndex;
 
+static NSString *activeSpanId;
+
 + (void)initialize
 {
     if (self == [RNSentryTimeToDisplay class]) {
         screenIdToRenderDuration =
             [[NSMutableDictionary alloc] initWithCapacity:TIME_TO_DISPLAY_ENTRIES_MAX_SIZE];
         screenIdAge = [[NSMutableArray alloc] initWithCapacity:TIME_TO_DISPLAY_ENTRIES_MAX_SIZE];
         screenIdCurrentIndex = 0;
+
+        activeSpanId = nil;
     }
 }
 
++ (void)setActiveSpanId:(NSString *)spanId
+{
+    activeSpanId = spanId;
+}
+
 + (NSNumber *)popTimeToDisplayFor:(NSString *)screenId
 {
     NSNumber *value = screenIdToRenderDuration[screenId];
     [screenIdToRenderDuration removeObjectForKey:screenId];
     return value;
 }
 
++ (void)putTimeToInitialDisplayForActiveSpan:(NSNumber *)value
+{
+    if (activeSpanId != nil) {
+        NSString *prefixedSpanId = [@"ttid-navigation-" stringByAppendingString:activeSpanId];
+        [self putTimeToDisplayFor:prefixedSpanId value:value];
+    }
+}
+
 + (void)putTimeToDisplayFor:(NSString *)screenId value:(NSNumber *)value
 {
     if (!screenId)
@@ -77,8 +94,7 @@ - (void)getTimeToDisplay:(RCTResponseSenderBlock)callback
 - (void)handleDisplayLink:(CADisplayLink *)link
 {
     // Get the current time
-    NSTimeInterval currentTime =
-        [[NSDate date] timeIntervalSince1970] * 1000.0; // Convert to milliseconds
+    NSTimeInterval currentTime = [[NSDate date] timeIntervalSince1970];
 
     // Ensure the callback is valid and pass the current time back
     if (resolveBlock) {

packages/core/ios/RNSentryVersion.m

@@ -3,4 +3,4 @@
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.10.0";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"6.11.0-beta.0";

packages/core/package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "6.10.0",
+  "version": "6.11.0-beta.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",

packages/core/src/js/NativeRNSentry.ts

@@ -50,6 +50,7 @@ export interface Spec extends TurboModule {
   crashedLastRun(): Promise<boolean | undefined | null>;
   getDataFromUri(uri: string): Promise<number[]>;
   popTimeToDisplayFor(key: string): Promise<number | undefined | null>;
+  setActiveSpanId(spanId: string): boolean;
 }
 
 export type NativeStackFrame = {

packages/core/src/js/integrations/appRegistry.ts

@@ -1,6 +1,7 @@
 import type { Client, Integration } from '@sentry/core';
 import { getClient, logger } from '@sentry/core';
 
+import { isWeb } from '../utils/environment';
 import { fillTyped } from '../utils/fill';
 import { ReactNativeLibraries } from '../utils/rnlibraries';
 
@@ -14,6 +15,10 @@ export const appRegistryIntegration = (): Integration & {
   return {
     name: INTEGRATION_NAME,
     setupOnce: () => {
+      if (isWeb()) {
+        return;
+      }
+
       patchAppRegistryRunApplication(callbacks);
     },
     onRunApplication: (callback: () => void) => {
@@ -28,6 +33,9 @@ export const appRegistryIntegration = (): Integration & {
 
 export const patchAppRegistryRunApplication = (callbacks: (() => void)[]): void => {
   const { AppRegistry } = ReactNativeLibraries;
+  if (!AppRegistry) {
+    return;
+  }
 
   fillTyped(AppRegistry, 'runApplication', originalRunApplication => {
     return (...args) => {

packages/core/src/js/replay/CustomMask.tsx

@@ -3,6 +3,8 @@ import * as React from 'react';
 import type { HostComponent, ViewProps } from 'react-native';
 import { UIManager, View } from 'react-native';
 
+import { isExpoGo } from '../utils/environment';
+
 const NativeComponentRegistry: {
   get<T, C extends Record<string, unknown>>(componentName: string, createViewConfig: () => C): HostComponent<T>;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -35,7 +37,7 @@ const UnmaskFallback = (viewProps: ViewProps): React.ReactElement => {
 const hasViewManagerConfig = (nativeComponentName: string): boolean => UIManager.hasViewManagerConfig && UIManager.hasViewManagerConfig(nativeComponentName);
 
 const Mask = ((): HostComponent<ViewProps> | React.ComponentType<ViewProps> => {
-  if (!hasViewManagerConfig(MaskNativeComponentName)) {
+  if (isExpoGo() || !hasViewManagerConfig(MaskNativeComponentName)) {
     logger.warn(`[SentrySessionReplay] Can't load ${MaskNativeComponentName}.`);
     return MaskFallback;
   }
@@ -48,7 +50,7 @@ const Mask = ((): HostComponent<ViewProps> | React.ComponentType<ViewProps> => {
 })()
 
 const Unmask = ((): HostComponent<ViewProps> | React.ComponentType<ViewProps> => {
-  if (!hasViewManagerConfig(UnmaskNativeComponentName)) {
+  if (isExpoGo() || !hasViewManagerConfig(UnmaskNativeComponentName)) {
     logger.warn(`[SentrySessionReplay] Can't load ${UnmaskNativeComponentName}.`);
     return UnmaskFallback;
   }