set options.sdk if null

dart/lib/src/browser_client.dart

@@ -8,7 +8,9 @@ import 'dart:html' show window;
 import 'package:http/browser_client.dart';
 
 import 'client.dart';
+import 'protocol.dart';
 import 'sentry_options.dart';
+import 'version.dart';
 
 SentryClient createSentryClient(SentryOptions options) =>
     SentryBrowserClient(options);
@@ -25,15 +27,15 @@ class SentryBrowserClient extends SentryClient {
   ///
   /// If [httpClient] is provided, it is used instead of the default client to
   /// make HTTP calls to Sentry.io. This is useful in tests.
-  factory SentryBrowserClient(SentryOptions options, {String origin}) {
+  factory SentryBrowserClient(SentryOptions options) {
     options.httpClient ??= BrowserClient();
 
+    options.sdk ??= Sdk(name: sdkName, version: sdkVersion);
+
     // origin is necessary for sentry to resolve stacktrace
-    return SentryBrowserClient._(options, origin: origin);
+    return SentryBrowserClient._(options);
   }
 
-  SentryBrowserClient._(
-    SentryOptions options, {
-    String origin,
-  }) : super.base(options, origin: '${window.location.origin}/');
+  SentryBrowserClient._(SentryOptions options)
+      : super.base(options, origin: '${window.location.origin}/');
 }

dart/lib/src/client.dart

@@ -23,7 +23,7 @@ abstract class SentryClient {
     if (_options.transport is NoOpTransport) {
       _options.transport = Transport(
         options: _options,
-        sdkIdentifier: '${sdkName}/${sdkVersion}',
+        sdkIdentifier: _options.sdk.identifier,
         origin: origin,
       );
     }

dart/lib/src/io_client.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:sentry/sentry.dart';
+
 /// A pure Dart client for Sentry.io crash reporting.
 import 'client.dart';
 import 'sentry_options.dart';
@@ -12,7 +14,10 @@ SentryClient createSentryClient(SentryOptions options) =>
 /// Logs crash reports and events to the Sentry.io service.
 class SentryIOClient extends SentryClient {
   /// Instantiates a client using [SentryOptions]
-  factory SentryIOClient(SentryOptions options) => SentryIOClient._(options);
+  factory SentryIOClient(SentryOptions options) {
+    options.sdk ??= Sdk(name: sdkName, version: sdkVersion);
+    return SentryIOClient._(options);
+  }
 
   SentryIOClient._(SentryOptions options) : super.base(options);
 }

dart/lib/src/sentry_options.dart

@@ -135,8 +135,8 @@ class SentryOptions {
   /// The server name used in the Sentry messages.
   String serverName;
 
-  /// SdkVersion object that contains the Sentry Client Name and its version
-  Sdk sdkVersion;
+  /// Sdk object that contains the Sentry Client Name and its version
+  Sdk sdk;
 
   // TODO: Scope observers, enableScopeSync