- Instantiate Transport from options

- move the postUri logic to Dsn

dart/lib/src/browser_client.dart

@@ -42,15 +42,14 @@ class SentryBrowserClient extends SentryClient {
     );
   }
 
-  SentryBrowserClient._(SentryOptions options,
-      {String origin, @required String platform})
-      : super.base(
+  SentryBrowserClient._(
+    SentryOptions options, {
+    String origin,
+    @required String platform,
+  }) : super.base(
           options,
           transport: Transport(
-            dsn: options.dsn,
-            httpClient: options.httpClient,
-            clock: options.clock,
-            compressPayload: false,
+            options: options,
             sdk: Sdk(name: browserSdkName, version: sdkVersion),
             platform: platform,
             origin: origin,

dart/lib/src/io_client.dart

@@ -25,13 +25,6 @@ class SentryIOClient extends SentryClient {
   SentryIOClient._(SentryOptions options, {@required String platform})
       : super.base(
           options,
-          transport: Transport(
-            compressPayload: options.compressPayload,
-            httpClient: options.httpClient,
-            clock: options.clock,
-            sdk: sdk,
-            dsn: options.dsn,
-            platform: platform,
-          ),
+          transport: Transport(options: options, sdk: sdk, platform: platform),
         );
 }

dart/lib/src/protocol/dsn.dart

@@ -24,6 +24,26 @@ class Dsn {
   /// The DSN URI.
   final Uri uri;
 
+  String get postUri {
+    final port = uri.hasPort &&
+            ((uri.scheme == 'http' && uri.port != 80) ||
+                (uri.scheme == 'https' && uri.port != 443))
+        ? ':${uri.port}'
+        : '';
+
+    final pathLength = uri.pathSegments.length;
+
+    String apiPath;
+    if (pathLength > 1) {
+      // some paths would present before the projectID in the uri
+      apiPath =
+          (uri.pathSegments.sublist(0, pathLength - 1) + ['api']).join('/');
+    } else {
+      apiPath = 'api';
+    }
+    return '${uri.scheme}://${uri.host}$port/$apiPath/$projectId/store/';
+  }
+
   static Dsn parse(String dsn) {
     final uri = Uri.parse(dsn);
     final userInfo = uri.userInfo.split(':');
@@ -45,4 +65,15 @@ class Dsn {
       uri: uri,
     );
   }
+
+  String buildAuthHeader({int timestamp, String clientId}) {
+    var header = 'Sentry sentry_version=6, sentry_client=$clientId, '
+        'sentry_timestamp=$timestamp, sentry_key=${publicKey}';
+
+    if (secretKey != null) {
+      header += ', sentry_secret=${secretKey}';
+    }
+
+    return header;
+  }
 }

dart/lib/src/transport/transport.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:http/http.dart';
 import 'package:meta/meta.dart';
 import 'package:sentry/src/utils.dart';
 
@@ -18,92 +17,45 @@ typedef BodyEncoder = List<int> Function(
 
 /// A transport is in charge of sending the event to the Sentry server.
 class Transport {
-  final Client httpClient;
+  final SentryOptions _options;
 
-  final Dsn _dsn;
-
-  final Sdk sdk;
+  @visibleForTesting
+  final Dsn dsn;
 
-  final bool compressPayload;
+  /// Use for browser stacktrace
+  final String origin;
 
   /// Used by sentry to differentiate browser from io environment
   final String platform;
 
-  final ClockProvider _clock;
-
-  /// Use for browser stacktrace
-  final String origin;
+  final Sdk sdk;
 
   Transport({
-    @required String dsn,
-    @required this.compressPayload,
-    @required this.httpClient,
+    @required SentryOptions options,
     @required this.sdk,
-    @required ClockProvider clock,
     @required this.platform,
     this.origin,
-  })  : _dsn = Dsn.parse(dsn),
-        _clock = clock ?? getUtcDateTime;
-
-  /// The DSN URI.
-  @visibleForTesting
-  Uri get dsnUri => _dsn.uri;
-
-  /// The Sentry.io public key for the project.
-  @visibleForTesting
-  // ignore: invalid_use_of_visible_for_testing_member
-  String get publicKey => _dsn.publicKey;
-
-  /// The Sentry.io secret key for the project.
-  @visibleForTesting
-  // ignore: invalid_use_of_visible_for_testing_member
-  String get secretKey => _dsn.secretKey;
-
-  /// The ID issued by Sentry.io to your project.
-  ///
-  /// Attached to the event payload.
-  String get projectId => _dsn.projectId;
-
-  String get clientId => sdk.identifier;
-
-  @visibleForTesting
-  String get postUri {
-    final port = dsnUri.hasPort &&
-            ((dsnUri.scheme == 'http' && dsnUri.port != 80) ||
-                (dsnUri.scheme == 'https' && dsnUri.port != 443))
-        ? ':${dsnUri.port}'
-        : '';
-
-    final pathLength = dsnUri.pathSegments.length;
-
-    String apiPath;
-    if (pathLength > 1) {
-      // some paths would present before the projectID in the dsnUri
-      apiPath =
-          (dsnUri.pathSegments.sublist(0, pathLength - 1) + ['api']).join('/');
-    } else {
-      apiPath = 'api';
-    }
-    return '${dsnUri.scheme}://${dsnUri.host}$port/$apiPath/$projectId/store/';
-  }
+  })  : _options = options,
+        dsn = Dsn.parse(options.dsn);
 
   Future<SentryId> send(Map<String, dynamic> data) async {
-    final now = _clock();
+    final now = _options.clock();
 
-    var authHeader = 'Sentry sentry_version=6, sentry_client=$clientId, '
-        'sentry_timestamp=${now.millisecondsSinceEpoch}, sentry_key=$publicKey';
-    if (secretKey != null) {
-      authHeader += ', sentry_secret=$secretKey';
-    }
+    var authHeader = dsn.buildAuthHeader(
+        timestamp: now.millisecondsSinceEpoch, clientId: sdk.identifier);
 
     mergeAttributes(_getContext(now), into: data);
 
     final headers = buildHeaders(authHeader, sdk: sdk);
 
-    final body = bodyEncoder(data, headers, compressPayload: compressPayload);
+    final body = bodyEncoder(
+      data,
+      headers,
+      compressPayload: _options.compressPayload,
+    );
 
-    final response = await httpClient.post(
-      postUri,
+    final response = await _options.httpClient.post(
+      dsn.postUri,
       headers: headers,
       body: body,
     );
@@ -117,7 +69,7 @@ class Transport {
   }
 
   Map<String, dynamic> _getContext(DateTime now) => {
-        'project': projectId,
+        'project': dsn.projectId,
         'timestamp': formatDateAsIso8601WithSecondPrecision(now),
         'platform': platform,
       };

dart/test/test_utils.dart

@@ -91,7 +91,7 @@ Future testCaptureException(
     expect('$sentryId', 'testeventid');
   }
 
-  expect(postUri, client.transport.postUri);
+  expect(postUri, client.transport.dsn.postUri);
 
   testHeaders(
     headers,
@@ -182,46 +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.dsnUri, Uri.parse(testDsn));
-    expect(client.transport.postUri, 'https://sentry.example.com/api/1/store/');
-    expect(client.transport.publicKey, 'public');
-    expect(client.transport.secretKey, 'secret');
-    expect(client.transport.projectId, '1');
+    expect(client.transport.dsn.uri, Uri.parse(testDsn));
+    expect(client.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');
     await client.close();
   });
 
   test('can parse DSN without secret', () async {
     final client = SentryClient(SentryOptions(dsn: _testDsnWithoutSecret));
-    expect(client.transport.dsnUri, Uri.parse(_testDsnWithoutSecret));
-    expect(client.transport.postUri, 'https://sentry.example.com/api/1/store/');
-    expect(client.transport.publicKey, 'public');
-    expect(client.transport.secretKey, null);
-    expect(client.transport.projectId, '1');
+    expect(client.transport.dsn.uri, Uri.parse(_testDsnWithoutSecret));
+    expect(client.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');
     await client.close();
   });
 
   test('can parse DSN with path', () async {
     final client = SentryClient(SentryOptions(dsn: _testDsnWithPath));
-    expect(client.transport.dsnUri, Uri.parse(_testDsnWithPath));
+    expect(client.transport.dsn.uri, Uri.parse(_testDsnWithPath));
     expect(
-      client.transport.postUri,
+      client.transport.dsn.postUri,
       'https://sentry.example.com/path/api/1/store/',
     );
-    expect(client.transport.publicKey, 'public');
-    expect(client.transport.secretKey, 'secret');
-    expect(client.transport.projectId, '1');
+    expect(client.transport.dsn.publicKey, 'public');
+    expect(client.transport.dsn.secretKey, 'secret');
+    expect(client.transport.dsn.projectId, '1');
     await client.close();
   });
   test('can parse DSN with port', () async {
     final client = SentryClient(SentryOptions(dsn: _testDsnWithPort));
-    expect(client.transport.dsnUri, Uri.parse(_testDsnWithPort));
+    expect(client.transport.dsn.uri, Uri.parse(_testDsnWithPort));
     expect(
-      client.transport.postUri,
+      client.transport.dsn.postUri,
       'https://sentry.example.com:8888/api/1/store/',
     );
-    expect(client.transport.publicKey, 'public');
-    expect(client.transport.secretKey, 'secret');
-    expect(client.transport.projectId, '1');
+    expect(client.transport.dsn.publicKey, 'public');
+    expect(client.transport.dsn.secretKey, 'secret');
+    expect(client.transport.dsn.projectId, '1');
     await client.close();
   });
   test('sends client auth header without secret', () async {