- refactor : applyScope

+ move origin to Transport

dart/lib/src/browser_client.dart

@@ -54,7 +54,7 @@ class SentryBrowserClient extends SentryClient {
             sdk: Sdk(name: browserSdkName, version: sdkVersion),
             headersBuilder: SentryClient.buildHeaders,
             platform: platform,
+            origin: origin,
           ),
-          origin: origin,
         );
 }

dart/lib/src/client.dart

@@ -21,7 +21,6 @@ abstract class SentryClient {
 
   SentryClient.base(
     this.options, {
-    this.origin,
     @required this.transport,
   });
 
@@ -43,9 +42,6 @@ abstract class SentryClient {
   /// * https://docs.sentry.io/learn/context/#capturing-the-user
   User userContext;
 
-  /// Use for browser stacktrace
-  String origin;
-
   /// Reports an [event] to Sentry.io.
   Future<SentryId> captureEvent(
     SentryEvent event, {
@@ -54,6 +50,8 @@ abstract class SentryClient {
   }) async {
     event = _processEvent(event, eventProcessors: options.eventProcessors);
 
+    event = _applyScope(event: event, scope: scope);
+
     final data = <String, dynamic>{
       'event_id': event.eventId.toString(),
     };
@@ -62,16 +60,10 @@ abstract class SentryClient {
       mergeAttributes(options.environmentAttributes.toJson(), into: data);
     }
 
-    // Merge the user context.
-    if (userContext != null) {
-      mergeAttributes(<String, dynamic>{'user': userContext.toJson()},
-          into: data);
-    }
-
     mergeAttributes(
       event.toJson(
         stackFrameFilter: stackFrameFilter,
-        origin: origin,
+        origin: transport.origin,
       ),
       into: data,
     );
@@ -128,6 +120,46 @@ abstract class SentryClient {
     return event;
   }
 
+  Event _applyScope({@required Event event, @required Scope scope}) {
+    if (scope != null) {
+      // Merge the scope transaction.
+      if (event.transaction == null) {
+        event = event.copyWith(transaction: scope.transaction);
+      }
+
+      // Merge the user context.
+      if (event.userContext == null) {
+        event = event.copyWith(userContext: scope.user);
+      }
+
+      // Merge the scope fingerprint.
+      if (event.fingerprint == null) {
+        event = event.copyWith(fingerprint: scope.fingerprint);
+      }
+
+      // Merge the scope breadcrumbs.
+      if (event.breadcrumbs == null) {
+        event = event.copyWith(breadcrumbs: scope.breadcrumbs);
+      }
+
+      // Merge the scope tags.
+      if (event.tags == null) {
+        event = event.copyWith(tags: scope.tags);
+      }
+
+      // Merge the scope extra.
+      if (event.extra == null) {
+        event = event.copyWith(extra: scope.extra);
+      }
+
+      // Merge the scope level.
+      if (event.level == null) {
+        event = event.copyWith(level: scope.level);
+      }
+    }
+    return event;
+  }
+
   @override
   String toString() => '$SentryClient("${options.dsn}")';
 

dart/lib/src/noop_client.dart

@@ -21,9 +21,6 @@ class NoOpSentryClient implements SentryClient {
   @override
   SentryOptions options;
 
-  @override
-  String origin;
-
   @override
   Transport transport;
 

dart/lib/src/transport/transport.dart

@@ -37,14 +37,18 @@ class Transport {
 
   final ClockProvider _clock;
 
+  /// Use for browser stacktrace
+  final String origin;
+
   Transport({
+    @required String dsn,
     @required this.compressPayload,
     @required this.httpClient,
-    @required ClockProvider clock,
     @required this.sdk,
-    @required String dsn,
+    @required ClockProvider clock,
     @required this.headersBuilder,
     @required this.platform,
+    this.origin,
   })  : _dsn = Dsn.parse(dsn),
         _clock = clock ?? getUtcDateTime;
 

dart/test/test_utils.dart

@@ -339,30 +339,32 @@ void runTest({Codec<List<int>, List<int>> gzip, bool isWeb = false}) {
     });
 
     const clientUserContext = User(
-        id: 'client_user',
-        username: 'username',
-        email: '[email protected]',
-        ipAddress: '127.0.0.1');
+      id: 'client_user',
+      username: 'username',
+      email: '[email protected]',
+      ipAddress: '127.0.0.1',
+    );
     const eventUserContext = User(
-        id: 'event_user',
-        username: 'username',
-        email: '[email protected]',
-        ipAddress: '127.0.0.1',
-        extras: <String, String>{'foo': 'bar'});
+      id: 'event_user',
+      username: 'username',
+      email: '[email protected]',
+      ipAddress: '127.0.0.1',
+      extras: <String, String>{'foo': 'bar'},
+    );
 
-    final client = SentryClient(
-      SentryOptions(
-        dsn: testDsn,
-        httpClient: httpMock,
-        clock: fakeClockProvider,
-        compressPayload: false,
-        environmentAttributes: SentryEvent(
-          serverName: 'test.server.com',
-          release: '1.2.3',
-          environment: 'staging',
-        ),
+    final options = SentryOptions(
+      dsn: testDsn,
+      httpClient: httpMock,
+      clock: fakeClockProvider,
+      compressPayload: false,
+      environmentAttributes: SentryEvent(
+        serverName: 'test.server.com',
+        release: '1.2.3',
+        environment: 'staging',
       ),
     );
+
+    final client = SentryClient(options);
     client.userContext = clientUserContext;
 
     try {
@@ -379,9 +381,13 @@ void runTest({Codec<List<int>, List<int>> gzip, bool isWeb = false}) {
         stackTrace: stackTrace,
         userContext: eventUserContext,
       );
-      await client.captureEvent(eventWithoutContext);
+      await client.captureEvent(eventWithoutContext,
+          scope: Scope(options)..user = clientUserContext);
       expect(loggedUserId, clientUserContext.id);
-      await client.captureEvent(eventWithContext);
+      await client.captureEvent(
+        eventWithContext,
+        scope: Scope(options)..user = clientUserContext,
+      );
       expect(loggedUserId, eventUserContext.id);
     }