Merge branch 'main' into filtered-otel-spans

CHANGELOG.md

@@ -11,6 +11,12 @@
 
 - OTel activities that are marked as not recorded are no longer sent to Sentry ([#3890](https://github.com/getsentry/sentry-dotnet/pull/3890))
 
+### Dependencies
+
+- Bump Native SDK from v0.7.17 to v0.7.18 ([#3891](https://github.com/getsentry/sentry-dotnet/pull/3891))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0718)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.17...0.7.18)
+
 ## 5.0.1
 
 ### Fixes

src/Sentry/Internal/SdkComposer.cs

@@ -23,7 +23,7 @@ private ITransport CreateTransport()
         _options.LogDebug("Creating transport.");
 
         // Start from either the transport given on options, or create a new HTTP transport.
-        var transport = _options.Transport ?? CreateHttpTransport();
+        var transport = _options.Transport ?? new LazyHttpTransport(_options);
 
         // When a cache directory path is given, wrap the transport in a caching transport.
         if (!string.IsNullOrWhiteSpace(_options.CacheDirectoryPath))
@@ -75,18 +75,6 @@ You can set a different environment via SENTRY_ENVIRONMENT env var or programati
         return transport;
     }
 
-    private LazyHttpTransport CreateHttpTransport()
-    {
-        if (_options.SentryHttpClientFactory is not null)
-        {
-            _options.LogDebug(
-                "Using ISentryHttpClientFactory set through options: {0}.",
-                _options.SentryHttpClientFactory.GetType().Name);
-        }
-
-        return new LazyHttpTransport(_options);
-    }
-
     public IBackgroundWorker CreateBackgroundWorker()
     {
         if (_options.BackgroundWorker is { } worker)

src/Sentry/SentryOptions.cs

@@ -222,6 +222,13 @@ internal IEnumerable<ISdkIntegration> Integrations
 
     internal HttpClient GetHttpClient()
     {
+        if (SentryHttpClientFactory is not null)
+        {
+            DiagnosticLogger?.LogDebug(
+                "Using ISentryHttpClientFactory set through options: {0}.",
+                SentryHttpClientFactory.GetType().Name);
+        }
+
         var factory = SentryHttpClientFactory ?? new DefaultSentryHttpClientFactory();
         return factory.Create(this);
     }