Merge remote-tracking branch 'origin/main' into feat/improve_on_error

Author: ueman

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Unreleased
 
+# 6.0.0-beta.3
+
+* Fix: Re-initialization of Flutter SDK (#526)
 * Enhancement: Call `toString()` on all non-serializable fields (#528)
 * Fix: Always call `Flutter.onError` in order to not swallow messages (#533)
 * Bump: Android SDK to 5.1.0-beta.6 (#535)

dart/lib/src/isolate_error_integration.dart

@@ -10,21 +10,22 @@ import 'sentry_options.dart';
 import 'throwable_mechanism.dart';
 
 class IsolateErrorIntegration extends Integration {
-  late RawReceivePort _receivePort;
+  RawReceivePort? _receivePort;
 
   @override
   FutureOr<void> call(Hub hub, SentryOptions options) async {
-    _receivePort = _createPort(hub, options);
-
-    Isolate.current.addErrorListener(_receivePort.sendPort);
-
+    final safeReceivePort = _receivePort = _createPort(hub, options);
+    Isolate.current.addErrorListener(safeReceivePort.sendPort);
     options.sdk.addIntegration('isolateErrorIntegration');
   }
 
   @override
   void close() {
-    _receivePort.close();
-    Isolate.current.removeErrorListener(_receivePort.sendPort);
+    if (_receivePort != null) {
+      final safeReceivePort = _receivePort!;
+      safeReceivePort.close();
+      Isolate.current.removeErrorListener(safeReceivePort.sendPort);
+    }
   }
 }
 

dart/lib/src/version.dart

@@ -9,7 +9,7 @@
 library version;
 
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '6.0.0-beta.3';
+const String sdkVersion = '6.0.0-beta.4';
 
 String sdkName(bool isWeb) => isWeb ? _browserSdkName : _ioSdkName;
 

dart/pubspec.yaml

@@ -1,5 +1,5 @@
 name: sentry
-version: 6.0.0-beta.3
+version: 6.0.0-beta.4
 description: >
   A crash reporting library for Dart that sends crash reports to Sentry.io.
   This library supports Dart VM and Web. For Flutter consider sentry_flutter instead.

dart/test/initialization_test.dart

@@ -0,0 +1,41 @@
+@TestOn('vm')
+
+import 'package:sentry/sentry.dart';
+import 'package:test/test.dart';
+
+import 'mocks.dart';
+
+// Tests for the following issue
+// https://github.com/getsentry/sentry-dart/issues/508
+// There are no asserts, test are succesfull if no exceptions are thrown.
+void main() {
+  tearDown(() async {
+    await Sentry.close();
+  });
+
+  test('async re-initilization', () async {
+    await Sentry.init((options) {
+      options.dsn = fakeDsn;
+    });
+
+    await Sentry.close();
+
+    await Sentry.init((options) {
+      options.dsn = fakeDsn;
+    });
+  });
+
+  // This is the failure from
+  // https://github.com/getsentry/sentry-dart/issues/508
+  test('re-initilization', () {
+    Sentry.init((options) {
+      options.dsn = fakeDsn;
+    });
+
+    Sentry.close();
+
+    Sentry.init((options) {
+      options.dsn = fakeDsn;
+    });
+  });
+}

flutter/lib/src/default_integrations.dart

@@ -225,7 +225,7 @@ class NativeSdkIntegration extends Integration<SentryFlutterOptions> {
   NativeSdkIntegration(this._channel);
 
   final MethodChannel _channel;
-  late SentryFlutterOptions _options;
+  SentryFlutterOptions? _options;
 
   @override
   FutureOr<void> call(Hub hub, SentryFlutterOptions options) async {
@@ -272,7 +272,7 @@ class NativeSdkIntegration extends Integration<SentryFlutterOptions> {
     try {
       await _channel.invokeMethod<void>('closeNativeSdk');
     } catch (exception, stackTrace) {
-      _options.logger(
+      _options?.logger(
         SentryLevel.fatal,
         'nativeSdkIntegration failed to be closed',
         exception: exception,

flutter/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '6.0.0-beta.3';
+const String sdkVersion = '6.0.0-beta.4';
 
 /// The default SDK name reported to Sentry.io in the submitted events.
 const String sdkName = 'sentry.dart.flutter';

flutter/pubspec.yaml

@@ -1,5 +1,5 @@
 name: sentry_flutter
-version: 6.0.0-beta.3
+version: 6.0.0-beta.4
 description: Sentry SDK for Flutter. This package aims to support different Flutter targets by relying on the many platforms supported by Sentry with native SDKs.
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart

flutter/test/initialization_test.dart

@@ -0,0 +1,42 @@
+@TestOn('vm')
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sentry/sentry.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
+import 'mocks.dart';
+
+// Tests for the following issue
+// https://github.com/getsentry/sentry-dart/issues/508
+// There are no asserts, test are succesfull if no exceptions are thrown.
+void main() {
+  tearDown(() async {
+    await Sentry.close();
+  });
+
+  test('async re-initilization', () async {
+    await SentryFlutter.init((options) {
+      options.dsn = fakeDsn;
+    });
+
+    await Sentry.close();
+
+    await SentryFlutter.init((options) {
+      options.dsn = fakeDsn;
+    });
+  });
+
+  // This is the failure from
+  // https://github.com/getsentry/sentry-dart/issues/508
+  test('re-initilization', () {
+    SentryFlutter.init((options) {
+      options.dsn = fakeDsn;
+    });
+
+    Sentry.close();
+
+    SentryFlutter.init((options) {
+      options.dsn = fakeDsn;
+    });
+  });
+}