Merge branch 'main' into feedback-ui-2

# Conflicts:
#	CHANGELOG.md
#	samples/react-native/src/App.tsx

Author: antonis

CHANGELOG.md

@@ -11,26 +11,32 @@
 ### Features
 
 - 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))
 - 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))
 
 ### Fixes
 
 - Expo Updates Context is passed to native after native init to be available for crashes ([#4808](https://github.com/getsentry/sentry-react-native/pull/4808))
+- Expo Updates Context values should all be lowercase ([#4809](https://github.com/getsentry/sentry-react-native/pull/4809))
 - Fixes Feedback Widget accessibility issue on iOS ([#4739](https://github.com/getsentry/sentry-react-native/pull/4739))
 
 ### Dependencies
 
-- Bump CLI from v2.43.1 to v2.44.0 ([#4804](https://github.com/getsentry/sentry-react-native/pull/4804))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2440)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.43.1...2.44.0)
+- Bump CLI from v2.43.1 to v2.45.0 ([#4804](https://github.com/getsentry/sentry-react-native/pull/4804), [#4818](https://github.com/getsentry/sentry-react-native/pull/4818))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2450)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.43.1...2.45.0)
 - Bump Bundler Plugins from v3.3.1 to v3.4.0 ([#4805](https://github.com/getsentry/sentry-react-native/pull/4805))
   - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#340)
   - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/3.3.1...3.4.0)
 - Bump Cocoa SDK from v8.49.2 to v8.50.0 ([#4807](https://github.com/getsentry/sentry-react-native/pull/4807))
   - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8500)
   - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.49.2...8.50.0)
 
+### Fixes
+
+- Avoid duplicate network requests (fetch, xhr) by default ([#4816](https://github.com/getsentry/sentry-react-native/pull/4816))
+  - `traceFetch` is disabled by default on mobile as RN uses a polyfill which will be traced by `traceXHR`
+
 ## 6.13.1
 
 ### Fixes

package.json

@@ -30,7 +30,7 @@
   "devDependencies": {
     "@expo/swiftlint": "^0.57.1",
     "@naturalcycles/ktlint": "^1.13.0",
-    "@sentry/cli": "2.44.0",
+    "@sentry/cli": "2.45.0",
     "clang-format": "^1.8.0",
     "downlevel-dts": "^0.11.0",
     "google-java-format": "^1.4.0",

packages/core/package.json

@@ -67,7 +67,7 @@
   "dependencies": {
     "@sentry/babel-plugin-component-annotate": "3.4.0",
     "@sentry/browser": "8.54.0",
-    "@sentry/cli": "2.44.0",
+    "@sentry/cli": "2.45.0",
     "@sentry/core": "8.54.0",
     "@sentry/react": "8.54.0",
     "@sentry/types": "8.54.0",

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

@@ -70,7 +70,10 @@ export const expoContextIntegration = (): Integration => {
   };
 };
 
-function getExpoUpdatesContext(): ExpoUpdatesContext {
+/**
+ * @internal Exposed for testing purposes
+ */
+export function getExpoUpdatesContext(): ExpoUpdatesContext {
   const expoUpdates = getExpoUpdates();
   if (!expoUpdates) {
     return {
@@ -85,19 +88,19 @@ function getExpoUpdatesContext(): ExpoUpdatesContext {
     is_using_embedded_assets: !!expoUpdates.isUsingEmbeddedAssets,
   };
 
-  if (typeof expoUpdates.updateId === 'string') {
-    updatesContext.update_id = expoUpdates.updateId;
+  if (typeof expoUpdates.updateId === 'string' && expoUpdates.updateId) {
+    updatesContext.update_id = expoUpdates.updateId.toLowerCase();
   }
-  if (typeof expoUpdates.channel === 'string') {
-    updatesContext.channel = expoUpdates.channel;
+  if (typeof expoUpdates.channel === 'string' && expoUpdates.channel) {
+    updatesContext.channel = expoUpdates.channel.toLowerCase();
   }
-  if (typeof expoUpdates.runtimeVersion === 'string') {
-    updatesContext.runtime_version = expoUpdates.runtimeVersion;
+  if (typeof expoUpdates.runtimeVersion === 'string' && expoUpdates.runtimeVersion) {
+    updatesContext.runtime_version = expoUpdates.runtimeVersion.toLowerCase();
   }
-  if (typeof expoUpdates.checkAutomatically === 'string') {
-    updatesContext.check_automatically = expoUpdates.checkAutomatically;
+  if (typeof expoUpdates.checkAutomatically === 'string' && expoUpdates.checkAutomatically) {
+    updatesContext.check_automatically = expoUpdates.checkAutomatically.toLowerCase();
   }
-  if (typeof expoUpdates.emergencyLaunchReason === 'string') {
+  if (typeof expoUpdates.emergencyLaunchReason === 'string' && expoUpdates.emergencyLaunchReason) {
     updatesContext.emergency_launch_reason = expoUpdates.emergencyLaunchReason;
   }
   if (typeof expoUpdates.launchDuration === 'number') {

packages/core/src/js/tracing/reactnativetracing.ts

@@ -29,7 +29,10 @@ export interface ReactNativeTracingOptions {
   /**
    * Flag to disable patching all together for fetch requests.
    *
-   * @default true
+   * Fetch in React Native is a `whatwg-fetch` polyfill which uses XHR under the hood.
+   * This causes duplicates when both `traceFetch` and `traceXHR` are enabled at the same time.
+   *
+   * @default false
    */
   traceFetch: boolean;
 
@@ -70,7 +73,11 @@ function getDefaultTracePropagationTargets(): RegExp[] | undefined {
 }
 
 export const defaultReactNativeTracingOptions: ReactNativeTracingOptions = {
-  traceFetch: true,
+  // Fetch in React Native is a `whatwg-fetch` polyfill which uses XHR under the hood.
+  // This causes duplicates when both `traceFetch` and `traceXHR` are enabled at the same time.
+  // https://github.com/facebook/react-native/blob/28945c68da056ab2ac01de7e542a845b2bca6096/packages/react-native/Libraries/Network/fetch.js
+  // (RN Web uses browsers native fetch implementation)
+  traceFetch: isWeb() ? true : false,
   traceXHR: true,
   enableHTTPTimings: true,
 };

packages/core/test/integrations/expocontext.test.ts

@@ -1,6 +1,10 @@
 import { type Client, type Event, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
 
-import { expoContextIntegration, OTA_UPDATES_CONTEXT_KEY } from '../../src/js/integrations/expocontext';
+import {
+  expoContextIntegration,
+  getExpoUpdatesContext,
+  OTA_UPDATES_CONTEXT_KEY,
+} from '../../src/js/integrations/expocontext';
 import * as environment from '../../src/js/utils/environment';
 import type { ExpoUpdates } from '../../src/js/utils/expoglobalobject';
 import { getExpoDevice } from '../../src/js/utils/expomodules';
@@ -311,6 +315,59 @@ describe('Expo Context Integration', () => {
     });
   });
 
+  describe('getExpoUpdatesContext', () => {
+    it('does not return empty values', () => {
+      jest.spyOn(expoModules, 'getExpoUpdates').mockReturnValue({
+        isEnabled: false,
+        isEmbeddedLaunch: false,
+        isEmergencyLaunch: false,
+        isUsingEmbeddedAssets: false,
+        updateId: '',
+        channel: '',
+        runtimeVersion: '',
+        checkAutomatically: '',
+        emergencyLaunchReason: '',
+        launchDuration: 0,
+        createdAt: new Date('2021-01-01T00:00:00.000Z'),
+      });
+
+      const expoUpdates = getExpoUpdatesContext();
+
+      expect(expoUpdates).toStrictEqual({
+        is_enabled: false,
+        is_embedded_launch: false,
+        is_emergency_launch: false,
+        is_using_embedded_assets: false,
+        launch_duration: 0,
+        created_at: '2021-01-01T00:00:00.000Z',
+      });
+    });
+
+    it('lowercases all string values', () => {
+      jest.spyOn(expoModules, 'getExpoUpdates').mockReturnValue({
+        updateId: 'UPPERCASE-123',
+        channel: 'UPPERCASE-123',
+        runtimeVersion: 'UPPERCASE-123',
+        checkAutomatically: 'UPPERCASE-123',
+        emergencyLaunchReason: 'This is a description of the reason.',
+        createdAt: new Date('2021-01-01T00:00:00.000Z'),
+      });
+
+      const expoUpdates = getExpoUpdatesContext();
+
+      expect(expoUpdates).toEqual(
+        expect.objectContaining({
+          update_id: 'uppercase-123',
+          channel: 'uppercase-123',
+          runtime_version: 'uppercase-123',
+          check_automatically: 'uppercase-123',
+          emergency_launch_reason: 'This is a description of the reason.', // Description should be kept as is
+          created_at: '2021-01-01T00:00:00.000Z', // Date should keep ISO string format
+        }),
+      );
+    });
+  });
+
   function executeIntegrationFor(mockedEvent: Event): Event {
     return expoContextIntegration().processEvent!(mockedEvent, {}, {} as Client) as Event;
   }

packages/core/test/tracing/timetodisplay.test.tsx

@@ -9,6 +9,7 @@ jest.mock('../../src/js/tracing/timetodisplaynative', () => mockedtimetodisplayn
 
 import { isTurboModuleEnabled } from '../../src/js/utils/environment';
 jest.mock('../../src/js/utils/environment', () => ({
+  isWeb: jest.fn().mockReturnValue(false),
   isTurboModuleEnabled: jest.fn().mockReturnValue(false),
 }));
 

samples/expo/app/(tabs)/index.tsx

@@ -2,14 +2,16 @@ import { Button, StyleSheet } from 'react-native';
 import Constants from 'expo-constants';
 import * as Sentry from '@sentry/react-native';
 import { reloadAppAsync } from 'expo';
+import * as DevClient from 'expo-dev-client';
 
 import { Text, View } from '@/components/Themed';
 import { setScopeProperties } from '@/utils/setScopeProperties';
 import React from 'react';
 import * as WebBrowser from 'expo-web-browser';
 import { useUpdates } from 'expo-updates';
+import { isWeb } from '../../utils/isWeb';
 
-const isRunningInExpoGo = Constants.appOwnership === 'expo'
+const isRunningInExpoGo = Constants.appOwnership === 'expo';
 
 export default function TabOneScreen() {
   const { currentlyRunning } = useUpdates();
@@ -20,6 +22,13 @@ export default function TabOneScreen() {
       <Text>Update ID: {currentlyRunning.updateId}</Text>
       <Text>Channel: {currentlyRunning.channel}</Text>
       <Text>Runtime Version: {currentlyRunning.runtimeVersion}</Text>
+      <Button
+        title="Open DevMenu"
+        onPress={() => {
+          DevClient.openMenu();
+        }}
+        disabled={isWeb()}
+      />
       <Button
         title="Capture message"
         onPress={() => {
@@ -35,8 +44,8 @@ export default function TabOneScreen() {
       <Button
         title="Capture exception with cause"
         onPress={() => {
-          const error = new Error('Captured exception')
-          error.cause = new Error('Cause of captured exception')
+          const error = new Error('Captured exception');
+          error.cause = new Error('Cause of captured exception');
           Sentry.captureException(error);
         }}
       />

samples/expo/package.json

@@ -21,6 +21,7 @@
     "@types/react": "~19.0.10",
     "expo": "^53.0.0",
     "expo-constants": "~17.1.5",
+    "expo-dev-client": "~5.1.8",
     "expo-image-picker": "~16.1.4",
     "expo-linking": "~7.1.4",
     "expo-router": "~5.0.5",

samples/react-native/e2e/captureSpaceflightNewsScreenTransaction.test.ts

@@ -108,4 +108,19 @@ describe('Capture Spaceflight News Screen Transaction', () => {
       }),
     );
   });
+
+  it('contains exactly two articles requests spans', () => {
+    // This test ensures we are to tracing requests multiple times on different layers
+    // fetch > xhr > native
+
+    const item = getFirstNewsEventItem();
+    const spans = item?.[1].spans;
+
+    console.log(spans);
+
+    const httpSpans = spans?.filter(
+      span => span.data?.['sentry.op'] === 'http.client',
+    );
+    expect(httpSpans).toHaveLength(2);
+  });
 });