test: rethrow in automated test mode

getsentry · Sep 13, 2024 · b8bd4f1 · b8bd4f1
1 parent 4baf6aa
commit b8bd4f1
Show file tree

Hide file tree

Showing 23 changed files with 104 additions and 38 deletions.
diff --git a/dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart b/dart/lib/src/event_processor/enricher/io_enricher_event_processor.dart
@@ -100,6 +100,9 @@ class IoEnricherEventProcessor implements EnricherEventProcessor {
           exception: exception,
           stackTrace: stackTrace,
         );
+        if (_options.automatedTestMode) {
+          rethrow;
+        }
       }
     }
 

diff --git a/dart/lib/src/event_processor/enricher/io_platform_memory.dart b/dart/lib/src/event_processor/enricher/io_platform_memory.dart
@@ -75,6 +75,9 @@ class PlatformMemory {
       }
     } catch (e) {
       options.logger(SentryLevel.warning, "Failed to run process: $e");
+      if (options.automatedTestMode) {
+        rethrow;
+      }
     }
     return null;
   }

diff --git a/dart/lib/src/event_processor/exception/io_exception_event_processor.dart b/dart/lib/src/event_processor/exception/io_exception_event_processor.dart
@@ -69,6 +69,9 @@ class IoExceptionEventProcessor implements ExceptionEventProcessor {
         exception: exception,
         stackTrace: stackTrace,
       );
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
     }
 
     return event.copyWith(

diff --git a/dart/lib/src/hub.dart b/dart/lib/src/hub.dart
@@ -124,6 +124,9 @@ class Hub {
           exception: exception,
           stackTrace: stackTrace,
         );
+        if (_options.automatedTestMode) {
+          rethrow;
+        }
       } finally {
         _lastEventId = sentryId;
       }
@@ -183,6 +186,9 @@ class Hub {
           exception: exception,
           stackTrace: stackTrace,
         );
+        if (_options.automatedTestMode) {
+          rethrow;
+        }
       } finally {
         _lastEventId = sentryId;
       }
@@ -238,6 +244,9 @@ class Hub {
           exception: exception,
           stackTrace: stackTrace,
         );
+        if (_options.automatedTestMode) {
+          rethrow;
+        }
       } finally {
         _lastEventId = sentryId;
       }
@@ -271,6 +280,9 @@ class Hub {
         exception: exception,
         stackTrace: stacktrace,
       );
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
     }
   }
 
@@ -364,6 +376,9 @@ class Hub {
           exception: exception,
           stackTrace: stackTrace,
         );
+        if (_options.automatedTestMode) {
+          rethrow;
+        }
       }
 
       _isEnabled = false;
@@ -565,6 +580,9 @@ class Hub {
             exception: exception,
             stackTrace: stackTrace,
           );
+          if (_options.automatedTestMode) {
+            rethrow;
+          }
         }
       }
     }
@@ -602,6 +620,9 @@ class Hub {
           exception: exception,
           stackTrace: stackTrace,
         );
+        if (_options.automatedTestMode) {
+          rethrow;
+        }
       }
     }
     return sentryId;
@@ -682,6 +703,9 @@ class _WeakMap {
         exception: exception,
         stackTrace: stackTrace,
       );
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
     }
   }
 
@@ -699,6 +723,9 @@ class _WeakMap {
         exception: exception,
         stackTrace: stackTrace,
       );
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
     }
     return null;
   }

diff --git a/dart/lib/src/load_dart_debug_images_integration.dart b/dart/lib/src/load_dart_debug_images_integration.dart
@@ -42,6 +42,9 @@ class _LoadImageIntegrationEventProcessor implements EventProcessor {
         exception: e,
         stackTrace: stackTrace,
       );
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
       return event;
     }
   }

diff --git a/dart/lib/src/recursive_exception_cause_extractor.dart b/dart/lib/src/recursive_exception_cause_extractor.dart
@@ -41,6 +41,9 @@ class RecursiveExceptionCauseExtractor {
           exception: exception,
           stackTrace: stackTrace,
         );
+        if (_options.automatedTestMode) {
+          rethrow;
+        }
         break;
       }
     }

diff --git a/dart/lib/src/sentry_baggage.dart b/dart/lib/src/sentry_baggage.dart
@@ -55,6 +55,7 @@ class SentryBaggage {
           exception: exception,
           stackTrace: stackTrace,
         );
+        // TODO rehtow in automatedTestMode
       }
     }
 

diff --git a/dart/lib/src/sentry_envelope_item.dart b/dart/lib/src/sentry_envelope_item.dart
@@ -132,6 +132,7 @@ class SentryEnvelopeItem {
       // TODO the data copy could be avoided - this would be most significant with attachments.
       return [...itemHeader, ...newLine, ...data];
     } catch (e) {
+      // TODO rethrow in automatedTestMode
       return [];
     }
   }

diff --git a/dart/lib/src/transport/http_transport.dart b/dart/lib/src/transport/http_transport.dart
@@ -64,6 +64,9 @@ class HttpTransport implements Transport {
       return eventId != null ? SentryId.fromId(eventId) : null;
     } catch (e) {
       _options.logger(SentryLevel.error, 'Error parsing response: $e');
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
       return null;
     }
   }

diff --git a/dart/lib/src/transport/spotlight_http_transport.dart b/dart/lib/src/transport/spotlight_http_transport.dart
@@ -31,6 +31,9 @@ class SpotlightHttpTransport extends Transport {
     } catch (e) {
       _options.logger(
           SentryLevel.warning, 'Failed to send envelope to Spotlight: $e');
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
     }
     return _transport.send(envelope);
   }

diff --git a/flutter/lib/src/binding_wrapper.dart b/flutter/lib/src/binding_wrapper.dart
@@ -26,6 +26,9 @@ class BindingWrapper {
         stackTrace: s,
         logger: 'BindingWrapper',
       );
+      if (_hub.options.automatedTestMode) {
+        rethrow;
+      }
       return null;
     }
   }

diff --git a/flutter/lib/src/event_processor/android_platform_exception_event_processor.dart b/flutter/lib/src/event_processor/android_platform_exception_event_processor.dart
@@ -58,6 +58,10 @@ class AndroidPlatformExceptionEventProcessor implements EventProcessor {
         exception: e,
         stackTrace: stackTrace,
       );
+      // ignore: invalid_use_of_internal_member
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
       return event;
     }
   }

diff --git a/flutter/lib/src/event_processor/native_app_start_event_processor.dart b/flutter/lib/src/event_processor/native_app_start_event_processor.dart
@@ -123,6 +123,9 @@ class NativeAppStartEventProcessor implements EventProcessor {
       } catch (e) {
         _hub.options.logger(SentryLevel.warning,
             'Failed to attach native span to app start transaction: $e');
+        if (_hub.options.automatedTestMode) {
+          rethrow;
+        }
       }
     });
   }

diff --git a/flutter/lib/src/event_processor/screenshot_event_processor.dart b/flutter/lib/src/event_processor/screenshot_event_processor.dart
@@ -138,6 +138,10 @@ class ScreenshotEventProcessor implements EventProcessor {
         exception: exception,
         stackTrace: stackTrace,
       );
+      // ignore: invalid_use_of_internal_member
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
     }
     return null;
   }

diff --git a/flutter/lib/src/file_system_transport.dart b/flutter/lib/src/file_system_transport.dart
@@ -28,6 +28,10 @@ class FileSystemTransport implements Transport {
         exception: exception,
         stackTrace: stackTrace,
       );
+      // ignore: invalid_use_of_internal_member
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
       return SentryId.empty();
     }
 

diff --git a/flutter/lib/src/integrations/load_contexts_integration.dart b/flutter/lib/src/integrations/load_contexts_integration.dart
@@ -212,6 +212,10 @@ class _LoadContextsIntegrationEventProcessor implements EventProcessor {
         exception: exception,
         stackTrace: stackTrace,
       );
+      // ignore: invalid_use_of_internal_member
+      if (_options.automatedTestMode) {
+        rethrow;
+      }
     }
     return event;
   }

diff --git a/flutter/lib/src/integrations/load_release_integration.dart b/flutter/lib/src/integrations/load_release_integration.dart
@@ -46,6 +46,10 @@ class LoadReleaseIntegration extends Integration<SentryFlutterOptions> {
         exception: exception,
         stackTrace: stackTrace,
       );
+      // ignore: invalid_use_of_internal_member
+      if (options.automatedTestMode) {
+        rethrow;
+      }
     }
 
     options.sdk.addIntegration('loadReleaseIntegration');

diff --git a/flutter/lib/src/integrations/native_app_start_integration.dart b/flutter/lib/src/integrations/native_app_start_integration.dart
@@ -155,6 +155,9 @@ class NativeAppStartIntegration extends Integration<SentryFlutterOptions> {
         } catch (e) {
           _hub.options.logger(
               SentryLevel.warning, 'Failed to parse native span times: $e');
+          if (_hub.options.automatedTestMode) {
+            rethrow;
+          }
           continue;
         }
       }

diff --git a/flutter/lib/src/integrations/on_error_integration.dart b/flutter/lib/src/integrations/on_error_integration.dart
@@ -143,6 +143,10 @@ class PlatformDispatcherWrapper {
         exception: exception,
         stackTrace: stacktrace,
       );
+      // ignore: invalid_use_of_internal_member
+      if (options.automatedTestMode) {
+        rethrow;
+      }
       return false;
     }
     return true;

diff --git a/flutter/lib/src/navigation/sentry_navigator_observer.dart b/flutter/lib/src/navigation/sentry_navigator_observer.dart
@@ -331,6 +331,9 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
         exception: exception,
         stackTrace: stacktrace,
       );
+      if (_hub.options.automatedTestMode) {
+        rethrow;
+      }
     } finally {
       await transaction?.finish();
       if (clearAfter) {
@@ -379,6 +382,9 @@ class SentryNavigatorObserver extends RouteObserver<PageRoute<dynamic>> {
         exception: exception,
         stackTrace: stacktrace,
       );
+      if (_hub.options.automatedTestMode) {
+        rethrow;
+      }
     } finally {
       _clear();
     }

diff --git a/flutter/temp/native-test/dist/sentry.dll b/flutter/temp/native-test/dist/sentry.dll
diff --git a/flutter/test/initialization_test.dart b/flutter/test/initialization_test.dart
@@ -14,48 +14,22 @@ void main() {
     await Sentry.close();
   });
 
-  test('async re-initilization', () async {
-    await SentryFlutter.init(
-      (options) {
-        options.dsn = fakeDsn;
-        // ignore: invalid_use_of_internal_member
-        options.automatedTestMode = true;
-      },
-    );
-
-    await Sentry.close();
+  void optionsInitializer(SentryFlutterOptions options) {
+    options.dsn = fakeDsn;
+    // ignore: invalid_use_of_internal_member
+    options.automatedTestMode = true;
 
-    await SentryFlutter.init(
-      (options) {
-        options.dsn = fakeDsn;
-        // ignore: invalid_use_of_internal_member
-        options.automatedTestMode = true;
-      },
-    );
+    // LoadReleaseIntegration throws because package_info channel is not available
+    options.removeIntegration(
+        options.integrations.firstWhere((i) => i is LoadReleaseIntegration));
+  }
 
-    await Sentry.close();
-  });
-
-  // This is the failure from
-  // https://github.com/getsentry/sentry-dart/issues/508
-  test('re-initilization', () async {
-    await SentryFlutter.init(
-      (options) {
-        options.dsn = fakeDsn;
-        // ignore: invalid_use_of_internal_member
-        options.automatedTestMode = true;
-      },
-    );
+  test('async re-initilization', () async {
+    await SentryFlutter.init(optionsInitializer);
 
     await Sentry.close();
 
-    await SentryFlutter.init(
-      (options) {
-        options.dsn = fakeDsn;
-        // ignore: invalid_use_of_internal_member
-        options.automatedTestMode = true;
-      },
-    );
+    await SentryFlutter.init(optionsInitializer);
 
     await Sentry.close();
   });

diff --git a/flutter/test/sentry_navigator_observer_test.dart b/flutter/test/sentry_navigator_observer_test.dart
@@ -598,6 +598,7 @@ void main() {
       const op = 'navigation';
       final hub = _MockHub();
       final span = getMockSentryTracer(name: oldRouteName);
+      when(span.children).thenReturn([]);
       when(span.context).thenReturn(SentrySpanContext(operation: op));
       when(span.status).thenReturn(null);
       when(span.finished).thenReturn(false);
@@ -982,6 +983,7 @@ void main() {
       final secondRoute = route(RouteSettings(name: 'testRoute'));
 
       final hub = _MockHub();
+      _whenAnyStart(hub, NoOpSentrySpan());
 
       final sut = fixture.getSut(hub: hub, ignoreRoutes: ["testRoute"]);
 
@@ -1002,6 +1004,7 @@ void main() {
       final secondRoute = route(RouteSettings(name: 'testRoute'));
 
       final hub = _MockHub();
+      _whenAnyStart(hub, NoOpSentrySpan());
 
       final sut = fixture.getSut(hub: hub, ignoreRoutes: ["testRoute"]);
 
@@ -1086,7 +1089,7 @@ class _MockHub extends MockHub {
   }
 }
 
-ISentrySpan getMockSentryTracer({String? name, bool? finished}) {
+MockSentryTracer getMockSentryTracer({String? name, bool? finished}) {
   final tracer = MockSentryTracer();
   when(tracer.name).thenReturn(name ?? 'name');
   when(tracer.finished).thenReturn(finished ?? true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ class SentryBaggage { @@
               exception: exception,
               stackTrace: stackTrace,
             );
+            // TODO rehtow in automatedTestMode
           }
         }
@@ Expand Down @@