fix merge conflict

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Added Scope and Breadcrumb ring buffer #109
 - Added Hub to SDK #113
 - Ref: Hub passes the Scope to SentryClient
+- feat: sentry options #116
 
 # `package:sentry` changelog
 

dart/lib/src/noop_hub.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'client.dart';
 import 'hub.dart';
 import 'protocol/event.dart';
-import 'protocol/level.dart';
+import 'protocol/sentry_level.dart';
 import 'protocol/sentry_id.dart';
 
 class NoOpHub implements Hub {
@@ -28,7 +28,7 @@ class NoOpHub implements Hub {
   @override
   Future<SentryId> captureMessage(
     String message, {
-    SeverityLevel level = SeverityLevel.info,
+    SentryLevel level = SentryLevel.info,
     String template,
     List params,
   }) =>

dart/lib/src/sentry.dart

@@ -32,11 +32,13 @@ class Sentry {
   static void _init(SentryOptions options) {
     if (isEnabled) {
       options.logger(
-        SeverityLevel.warning,
+        SentryLevel.warning,
         'Sentry has been already initialized. Previous configuration will be overwritten.',
       );
     }
 
+    _setDefaultConfiguration(options);
+
     final hub = currentHub;
     _hub = Hub(options);
     hub.close();
@@ -57,7 +59,7 @@ class Sentry {
 
   Future<SentryId> captureMessage(
     String message, {
-    SeverityLevel level,
+    SentryLevel level,
     String template,
     List<dynamic> params,
   }) async {

dart/test/hub_test.dart

@@ -79,7 +79,7 @@ void main() {
       verify(
         client.captureMessage(
           fakeMessage.formatted,
-          level: SeverityLevel.info,
+          level: SentryLevel.info,
           scope: anyNamed('scope'),
         ),
       ).called(1);