Refacto : add a Transport class

dart/lib/src/browser_client.dart

@@ -10,7 +10,6 @@ import 'package:meta/meta.dart';
 
 import 'client.dart';
 import 'sentry_options.dart';
-import 'transport/transport.dart';
 import 'version.dart';
 
 SentryClient createSentryClient(SentryOptions options) =>
@@ -32,7 +31,6 @@ class SentryBrowserClient extends SentryClient {
     options.httpClient ??= BrowserClient();
 
     // origin is necessary for sentry to resolve stacktrace
-    origin ??= '${window.location.origin}/';
 
     return SentryBrowserClient._(
       options,
@@ -45,13 +43,5 @@ class SentryBrowserClient extends SentryClient {
     SentryOptions options, {
     String origin,
     @required String platform,
-  }) : super.base(
-          options,
-          transport: Transport(
-            options: options,
-            sdkIdentifier: '${browserSdkName}/${sdkVersion}',
-            platform: platform,
-            origin: origin,
-          ),
-        );
+  }) : super.base(options, origin: '${window.location.origin}/');
 }

dart/lib/src/client.dart

@@ -2,12 +2,12 @@ import 'dart:async';
 
 import 'package:meta/meta.dart';
 import 'package:sentry/sentry.dart';
+import 'package:sentry/src/transport/noop_transport.dart';
 
 import 'client_stub.dart'
     if (dart.library.html) 'browser_client.dart'
     if (dart.library.io) 'io_client.dart';
 import 'protocol.dart';
-import 'transport/transport.dart';
 
 /// Logs crash reports and events to the Sentry.io service.
 abstract class SentryClient {
@@ -17,13 +17,19 @@ abstract class SentryClient {
   /// `dart:html` is available, otherwise it will throw an unsupported error.
   factory SentryClient(SentryOptions options) => createSentryClient(options);
 
-  SentryClient.base(this.options, {@required this.transport});
+  SentryClient.base(this.options, {String origin}) {
+    if (options.transport is NoOpTransport) {
+      options.transport = Transport(
+        options: options,
+        sdkIdentifier: '${sdkName}/${sdkVersion}',
+        origin: origin,
+      );
+    }
+  }
 
   @protected
-  SentryOptions options;
-
   @visibleForTesting
-  final Transport transport;
+  SentryOptions options;
 
   /// Information about the current user.
   ///
@@ -47,9 +53,9 @@ abstract class SentryClient {
 
     event = _applyScope(event: event, scope: scope);
 
-    event = event.copyWith(platform: transport.platform);
+    event = event.copyWith(platform: sdkPlatform);
 
-    return transport.send(event);
+    return options.transport.send(event);
   }
 
   /// Reports the [throwable] and optionally its [stackTrace] to Sentry.io.

dart/lib/src/io_client.dart

@@ -5,10 +5,9 @@
 import 'package:meta/meta.dart';
 
 /// A pure Dart client for Sentry.io crash reporting.
-import 'package:sentry/sentry.dart';
-import 'package:sentry/src/transport/transport.dart';
-
 import 'client.dart';
+import 'sentry_options.dart';
+import 'version.dart';
 
 SentryClient createSentryClient(SentryOptions options) =>
     SentryIOClient(options);
@@ -20,12 +19,5 @@ class SentryIOClient extends SentryClient {
       SentryIOClient._(options, platform: sdkPlatform);
 
   SentryIOClient._(SentryOptions options, {@required String platform})
-      : super.base(
-          options,
-          transport: Transport(
-            options: options,
-            sdkIdentifier: '${sdkName}/${sdkVersion}',
-            platform: platform,
-          ),
-        );
+      : super.base(options);
 }

dart/lib/src/noop_client.dart

@@ -4,7 +4,6 @@ import 'client.dart';
 import 'protocol.dart';
 import 'scope.dart';
 import 'sentry_options.dart';
-import 'transport/transport.dart';
 
 class NoOpSentryClient implements SentryClient {
   NoOpSentryClient._();
@@ -21,9 +20,6 @@ class NoOpSentryClient implements SentryClient {
   @override
   SentryOptions options;
 
-  @override
-  Transport transport;
-
   @override
   Future<SentryId> captureEvent(
     SentryEvent event, {

dart/lib/src/sentry_options.dart

@@ -1,5 +1,7 @@
 import 'package:http/http.dart';
 import 'package:sentry/sentry.dart';
+import 'package:sentry/src/transport/noop_transport.dart';
+
 import 'diagnostic_logger.dart';
 import 'hub.dart';
 import 'protocol.dart';
@@ -118,7 +120,14 @@ class SentryOptions {
 
   List<String> get inAppIncludes => List.unmodifiable(_inAppIncludes);
 
-  // TODO: transport, transportGate, connectionTimeoutMillis, readTimeoutMillis, hostnameVerifier, sslSocketFactory, proxy
+  Transport _transport = NoOpTransport();
+
+  Transport get transport => _transport;
+
+  set transport(Transport transport) =>
+      _transport = transport ?? NoOpTransport();
+
+  // TODO: transportGate, connectionTimeoutMillis, readTimeoutMillis, hostnameVerifier, sslSocketFactory, proxy
 
   /// Sets the distribution. Think about it together with release and environment
   String dist;
@@ -139,8 +148,9 @@ class SentryOptions {
     this.environmentAttributes,
     this.compressPayload,
     this.httpClient,
+    Transport transport,
     ClockProvider clock = getUtcDateTime,
-  }) {
+  }) : _transport = transport ?? NoOpTransport() {
     _clock = clock;
   }
 

dart/lib/src/transport/noop_transport.dart

@@ -0,0 +1,17 @@
+import 'dart:async';
+
+import 'package:sentry/sentry.dart';
+
+class NoOpTransport implements Transport {
+  @override
+  Dsn get dsn => null;
+
+  @override
+  String get origin => null;
+
+  @override
+  String get sdkIdentifier => null;
+
+  @override
+  Future<SentryId> send(SentryEvent event) => Future.value(SentryId.empty());
+}

dart/lib/src/transport/transport.dart

@@ -24,9 +24,6 @@ class Transport {
   /// Use for browser stacktrace
   final String origin;
 
-  /// Used by sentry to differentiate browser from io environment
-  final String platform;
-
   final String sdkIdentifier;
 
   CredentialBuilder _credentialBuilder;
@@ -36,7 +33,6 @@ class Transport {
   Transport({
     @required SentryOptions options,
     @required this.sdkIdentifier,
-    @required this.platform,
     this.origin,
   })  : _options = options,
         dsn = Dsn.parse(options.dsn),

dart/lib/src/version.dart

@@ -24,7 +24,12 @@ const String browserSdkName = 'sentry.dart.browser';
 /// The name of the SDK platform reported to Sentry.io in the submitted events.
 ///
 /// Used for IO version.
-const String sdkPlatform = 'dart';
+String get sdkPlatform => isWeb ? browserPlatform : ioSdkPlatform;
+
+/// The name of the SDK platform reported to Sentry.io in the submitted events.
+///
+/// Used for IO version.
+const String ioSdkPlatform = 'dart';
 
 /// Used to report browser Stacktrace to sentry.
 const String browserPlatform = 'javascript';

dart/test/test_utils.dart

@@ -93,14 +93,14 @@ Future testCaptureException(
     expect('$sentryId', 'testeventid');
   }
 
-  expect(postUri, client.transport.dsn.postUri);
+  expect(postUri, client.options.transport.dsn.postUri);
 
   testHeaders(
     headers,
     fakeClockProvider,
     compressPayload: compressPayload,
     withUserAgent: !isWeb,
-    sdkName: isWeb ? browserSdkName : sdkName,
+    sdkName: sdkName,
   );
 
   Map<String, dynamic> data;
@@ -182,48 +182,48 @@ Future testCaptureException(
 void runTest({Codec<List<int>, List<int>> gzip, bool isWeb = false}) {
   test('can parse DSN', () async {
     final client = SentryClient(SentryOptions(dsn: testDsn));
-    expect(client.transport.dsn.uri, Uri.parse(testDsn));
-    expect(client.transport.dsn.postUri,
+    expect(client.options.transport.dsn.uri, Uri.parse(testDsn));
+    expect(client.options.transport.dsn.postUri,
         'https://sentry.example.com/api/1/store/');
-    expect(client.transport.dsn.publicKey, 'public');
-    expect(client.transport.dsn.secretKey, 'secret');
-    expect(client.transport.dsn.projectId, '1');
+    expect(client.options.transport.dsn.publicKey, 'public');
+    expect(client.options.transport.dsn.secretKey, 'secret');
+    expect(client.options.transport.dsn.projectId, '1');
     await client.close();
   });
 
   test('can parse DSN without secret', () async {
     final client = SentryClient(SentryOptions(dsn: _testDsnWithoutSecret));
-    expect(client.transport.dsn.uri, Uri.parse(_testDsnWithoutSecret));
-    expect(client.transport.dsn.postUri,
+    expect(client.options.transport.dsn.uri, Uri.parse(_testDsnWithoutSecret));
+    expect(client.options.transport.dsn.postUri,
         'https://sentry.example.com/api/1/store/');
-    expect(client.transport.dsn.publicKey, 'public');
-    expect(client.transport.dsn.secretKey, null);
-    expect(client.transport.dsn.projectId, '1');
+    expect(client.options.transport.dsn.publicKey, 'public');
+    expect(client.options.transport.dsn.secretKey, null);
+    expect(client.options.transport.dsn.projectId, '1');
     await client.close();
   });
 
   test('can parse DSN with path', () async {
     final client = SentryClient(SentryOptions(dsn: _testDsnWithPath));
-    expect(client.transport.dsn.uri, Uri.parse(_testDsnWithPath));
+    expect(client.options.transport.dsn.uri, Uri.parse(_testDsnWithPath));
     expect(
-      client.transport.dsn.postUri,
+      client.options.transport.dsn.postUri,
       'https://sentry.example.com/path/api/1/store/',
     );
-    expect(client.transport.dsn.publicKey, 'public');
-    expect(client.transport.dsn.secretKey, 'secret');
-    expect(client.transport.dsn.projectId, '1');
+    expect(client.options.transport.dsn.publicKey, 'public');
+    expect(client.options.transport.dsn.secretKey, 'secret');
+    expect(client.options.transport.dsn.projectId, '1');
     await client.close();
   });
   test('can parse DSN with port', () async {
     final client = SentryClient(SentryOptions(dsn: _testDsnWithPort));
-    expect(client.transport.dsn.uri, Uri.parse(_testDsnWithPort));
+    expect(client.options.transport.dsn.uri, Uri.parse(_testDsnWithPort));
     expect(
-      client.transport.dsn.postUri,
+      client.options.transport.dsn.postUri,
       'https://sentry.example.com:8888/api/1/store/',
     );
-    expect(client.transport.dsn.publicKey, 'public');
-    expect(client.transport.dsn.secretKey, 'secret');
-    expect(client.transport.dsn.projectId, '1');
+    expect(client.options.transport.dsn.publicKey, 'public');
+    expect(client.options.transport.dsn.secretKey, 'secret');
+    expect(client.options.transport.dsn.projectId, '1');
     await client.close();
   });
   test('sends client auth header without secret', () async {
@@ -268,7 +268,7 @@ void runTest({Codec<List<int>, List<int>> gzip, bool isWeb = false}) {
       withUserAgent: !isWeb,
       compressPayload: false,
       withSecret: false,
-      sdkName: isWeb ? browserSdkName : sdkName,
+      sdkName: sdkName,
     );
 
     await client.close();