Refactor Dsn type (#532)

Co-authored-by: Bruno Garcia <[email protected]>

Author: Tyrrrz

README.md

@@ -71,7 +71,7 @@ void Main()
 {
     using (SentrySdk.Init(o =>
     {
-        o.Dsn = new Dsn("dsn");
+        o.Dsn = "dsn";
         o.Proxy = new WebProxy("https://localhost:3128");
     }))
     {

benchmarks/Sentry.Benchmarks/CaptureExceptionDuplicateDetectionBenchmarks.cs

@@ -12,7 +12,7 @@ public class CaptureExceptionDuplicateDetectionBenchmarks
 
         private static Action<SentryOptions> SharedConfig => (o =>
         {
-            o.Dsn = new Dsn(Constants.ValidDsn);
+            o.Dsn = Constants.ValidDsn;
             o.SentryHttpClientFactory = new FakeHttpClientFactory();
         });
 

benchmarks/Sentry.Benchmarks/FakeHttpClientFactory.cs

@@ -10,7 +10,7 @@ namespace Sentry.Benchmarks
 {
     internal class FakeHttpClientFactory : ISentryHttpClientFactory
     {
-        public HttpClient Create(Dsn dsn, SentryOptions options) => new HttpClient(new FakeMessageHandler());
+        public HttpClient Create(SentryOptions options) => new HttpClient(new FakeMessageHandler());
     }
 
     internal class FakeMessageHandler : HttpMessageHandler

samples/Sentry.Samples.Console.Customized/Program.cs

@@ -96,14 +96,14 @@ await SentrySdk.ConfigureScopeAsync(async scope =>
             o.HttpProxy = null; //new WebProxy("https://localhost:3128");
 
             // Example customizing the HttpClientHandlers created
-            o.CreateHttpClientHandler = dsn => new HttpClientHandler
+            o.CreateHttpClientHandler = () => new HttpClientHandler
             {
                 ServerCertificateCustomValidationCallback = (sender, certificate, chain, sslPolicyErrors) =>
                     !certificate.Archived
             };
 
             // Access to the HttpClient created to serve the SentryClint
-            o.ConfigureClient = (client, dsn) =>
+            o.ConfigureClient = client =>
             {
                 client.DefaultRequestHeaders.TryAddWithoutValidation("CustomHeader", new[] { "my value" });
             };
@@ -187,8 +187,7 @@ await SentrySdk.ConfigureScopeAsync(async scope =>
             SentrySdk.CaptureEvent(evt);
 
             // Using a different DSN:
-            var adminDsn = new Dsn(AdminDsn);
-            using (var adminClient = new SentryClient(new SentryOptions { Dsn = adminDsn }))
+            using (var adminClient = new SentryClient(new SentryOptions { Dsn = AdminDsn }))
             {
                 // Make believe web framework middleware
                 var middleware = new AdminPartMiddleware(adminClient, null);

samples/Sentry.Samples.NLog/Program.cs

@@ -109,7 +109,7 @@ private static void UsingCodeConfiguration()
 
                     // If DSN is not set, the SDK will look for an environment variable called SENTRY_DSN. If
                     // nothing is found, SDK is disabled.
-                    o.Dsn = new Dsn(DsnSample);
+                    o.Dsn = DsnSample;
 
                     o.AttachStacktrace = true;
                     o.SendDefaultPii = true; // Send Personal Identifiable information like the username of the user logged in to the device

samples/Sentry.Samples.Serilog/Program.cs

@@ -18,7 +18,7 @@ private static void Main()
                 o.MinimumBreadcrumbLevel = LogEventLevel.Debug; // Debug and higher are stored as breadcrumbs (default os Information)
                 o.MinimumEventLevel = LogEventLevel.Error; // Error and higher is sent as event (default is Error)
                 // If DSN is not set, the SDK will look for an environment variable called SENTRY_DSN. If nothing is found, SDK is disabled.
-                o.Dsn = new Dsn("https://[email protected]/5428537");
+                o.Dsn = "https://[email protected]/5428537";
                 o.AttachStacktrace = true;
                 o.SendDefaultPii = true; // send PII like the username of the user logged in to the device
                 // Other configuration

src/Sentry.Extensions.Logging/SentryLoggingOptions.cs

@@ -40,21 +40,6 @@ public class SentryLoggingOptions : SentryOptions
         /// </value>
         public LogLevel MinimumEventLevel { get; set; } = LogLevel.Error;
 
-        /// <summary>
-        /// The DSN which defines where events are sent
-        /// </summary>
-        public new string? Dsn
-        {
-            get => base.Dsn?.ToString();
-            set
-            {
-                if (value != null && !Sentry.Dsn.IsDisabled(value))
-                {
-                    base.Dsn = new Dsn(value);
-                }
-            }
-        }
-
         /// <summary>
         /// Whether to initialize this SDK through this integration
         /// </summary>

src/Sentry.NLog/ConfigurationExtensions.cs

@@ -96,9 +96,9 @@ public static LoggingConfiguration AddSentry(this LoggingConfiguration configura
                 Layout = "${message}",
             };
 
-            if (dsn != null && options.Dsn == null)
+            if (dsn != null && string.IsNullOrWhiteSpace(options.Dsn))
             {
-                options.Dsn = new Dsn(dsn);
+                options.Dsn = dsn;
             }
 
             configuration.AddTarget(targetName, target);

src/Sentry.NLog/SentryTarget.cs

@@ -274,7 +274,7 @@ protected override void InitializeTarget()
             var customDsn = Dsn?.Render(LogEventInfo.CreateNullEvent());
             if (!string.IsNullOrEmpty(customDsn))
             {
-                Options.Dsn = new Dsn(customDsn);
+                Options.Dsn = customDsn;
             }
 
             var customRelease = Release?.Render(LogEventInfo.CreateNullEvent());

src/Sentry.Serilog/SentrySinkExtensions.cs

@@ -186,7 +186,7 @@ public static void ConfigureSentrySerilogOptions(
         {
             if (!string.IsNullOrWhiteSpace(dsn))
             {
-                sentrySerilogOptions.Dsn = new Dsn(dsn);
+                sentrySerilogOptions.Dsn = dsn;
             }
 
             if (minimumEventLevel.HasValue)