chore(sdk): Better DEX when native disabled

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fix use Fetch transport when option `enableNative` is `false` ([#2897](https://github.com/getsentry/sentry-react-native/pull/2897))
+- Improve logs when `enableNative` is `false` ([#2897](https://github.com/getsentry/sentry-react-native/pull/2897))
+
 ### Dependencies
 
 - Bump JavaScript SDK from v7.40.0 to v7.43.0 ([#2874](https://github.com/getsentry/sentry-react-native/pull/2874))

src/js/sdk.tsx

@@ -67,7 +67,13 @@ export function init(passedOptions: ReactNativeOptions): void {
     ...DEFAULT_OPTIONS,
     ...passedOptions,
     // If custom transport factory fails the SDK won't initialize
-    transport: passedOptions.transport || makeNativeTransportFactory() || makeFetchTransport,
+    transport: passedOptions.transport
+      || makeNativeTransportFactory({
+        enableNative: passedOptions.enableNative !== undefined
+          ? passedOptions.enableNative
+          : DEFAULT_OPTIONS.enableNative
+      })
+      || makeFetchTransport,
     transportOptions: {
       ...DEFAULT_OPTIONS.transportOptions,
       ...(passedOptions.transportOptions ?? {}),

src/js/tracing/nativeframes.ts

@@ -55,6 +55,8 @@ export class NativeFramesInstrumentation {
       if (framesMetrics) {
         transaction.setData('__startFrames', framesMetrics);
       }
+    }).then(undefined, (error) => {
+      logger.error(`[ReactNativeTracing] Error while fetching native frames: ${error}`);
     });
 
     instrumentChildSpanFinish(transaction, (_: Span, endTimestamp?: number) => {
@@ -85,6 +87,8 @@ export class NativeFramesInstrumentation {
           nativeFrames,
         };
       }
+    }).then(undefined, (error) => {
+      logger.error(`[ReactNativeTracing] Error while fetching native frames: ${error}`);
     });
   }
 

src/js/transports/native.ts

@@ -53,8 +53,10 @@ export function makeNativeTransport(options: BaseNativeTransportOptions = {}): N
 /**
  * Creates a Native Transport factory if the native transport is available.
  */
-export function makeNativeTransportFactory(): typeof makeNativeTransport | null {
-  if (NATIVE.isNativeTransportAvailable()) {
+export function makeNativeTransportFactory(
+  { enableNative }: { enableNative?: boolean },
+): typeof makeNativeTransport | null {
+  if (enableNative && NATIVE.isNativeAvailable()) {
     return makeNativeTransport;
   }
   return null;

src/js/wrapper.ts

@@ -53,7 +53,7 @@ interface SentryNativeWrapper {
   ): module is Spec;
   _getBreadcrumbs(event: Event): Breadcrumb[] | undefined;
 
-  isNativeTransportAvailable(): boolean;
+  isNativeAvailable(): boolean;
 
   initNativeSdk(options: ReactNativeOptions): PromiseLike<boolean>;
   closeNativeSdk(): PromiseLike<void>;
@@ -267,10 +267,12 @@ export const NATIVE: SentryNativeWrapper = {
 
   async fetchNativeAppStart(): Promise<NativeAppStartResponse | null> {
     if (!this.enableNative) {
-      throw this._DisabledNativeError;
+      logger.warn(this._DisabledNativeError);
+      return null;
     }
     if (!this._isModuleLoaded(RNSentry)) {
-      throw this._NativeClientError;
+      logger.error(this._NativeClientError);
+      return null;
     }
 
     return RNSentry.fetchNativeAppStart();
@@ -468,16 +470,18 @@ export const NATIVE: SentryNativeWrapper = {
     RNSentry.enableNativeFramesTracking();
   },
 
-  isNativeTransportAvailable(): boolean {
+  isNativeAvailable(): boolean {
     return this.enableNative && this._isModuleLoaded(RNSentry);
   },
 
   async captureScreenshot(): Promise<Screenshot[] | null> {
     if (!this.enableNative) {
-      throw this._DisabledNativeError;
+      logger.warn(this._DisabledNativeError);
+      return null;
     }
     if (!this._isModuleLoaded(RNSentry)) {
-      throw this._NativeClientError;
+      logger.error(this._NativeClientError);
+      return null;
     }
 
     try {

test/sdk.test.ts

@@ -228,16 +228,32 @@ describe('Tests the SDK functionality', () => {
     });
 
     it('uses native transport', () => {
-      (NATIVE.isNativeTransportAvailable as jest.Mock).mockImplementation(() => true);
+      (NATIVE.isNativeAvailable as jest.Mock).mockImplementation(() => true);
       init({});
       expect(usedOptions()?.transport).toEqual(makeNativeTransport);
     });
 
     it('uses fallback fetch transport', () => {
-      (NATIVE.isNativeTransportAvailable as jest.Mock).mockImplementation(() => false);
+      (NATIVE.isNativeAvailable as jest.Mock).mockImplementation(() => false);
       init({});
       expect(usedOptions()?.transport).toEqual(makeFetchTransport);
     });
+
+    it('checks sdk options first', () => {
+      (NATIVE.isNativeAvailable as jest.Mock).mockImplementation(() => true);
+      init({ enableNative: false });
+      expect(usedOptions()?.transport).toEqual(makeFetchTransport);
+      // eslint-disable-next-line @typescript-eslint/unbound-method
+      expect(NATIVE.isNativeAvailable).not.toBeCalled();
+    });
+
+    it('check both options and native availability', () => {
+      (NATIVE.isNativeAvailable as jest.Mock).mockImplementation(() => true);
+      init({ enableNative: true });
+      expect(usedOptions()?.transport).toEqual(makeNativeTransport);
+      // eslint-disable-next-line @typescript-eslint/unbound-method
+      expect(NATIVE.isNativeAvailable).toBeCalled();
+    });
   });
 
   describe('initIsSafe', () => {