Dynamic Sampling Context propagates correctly for HttpClient spans (#…

…3208)
getsentry · Mar 12, 2024 · 0ee3904 · 0ee3904
1 parent 626d807
commit 0ee3904
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Dynamic Sampling Context not propagated correctly for HttpClient spans ([#3208](https://github.com/getsentry/sentry-dotnet/pull/3208))
+
 ## 4.2.0
 
 ### Features

diff --git a/src/Sentry/Internal/Hub.cs b/src/Sentry/Internal/Hub.cs
@@ -214,7 +214,8 @@ public SentryTraceHeader GetTraceHeader()
 
     public BaggageHeader GetBaggage()
     {
-        if (GetSpan() is TransactionTracer { DynamicSamplingContext: { IsEmpty: false } dsc })
+        var span = GetSpan();
+        if (span?.GetTransaction() is TransactionTracer { DynamicSamplingContext: { IsEmpty: false } dsc })
         {
             return dsc.ToBaggageHeader();
         }

diff --git a/src/Sentry/SentryMessageHandler.cs b/src/Sentry/SentryMessageHandler.cs
@@ -82,10 +82,10 @@ protected override async Task<HttpResponseMessage> SendAsync(
         var method = request.Method.Method.ToUpperInvariant();
         var url = request.RequestUri?.ToString() ?? string.Empty;
 
-        PropagateTraceHeaders(request, url);
         var span = ProcessRequest(request, method, url);
         try
         {
+            PropagateTraceHeaders(request, url);
             var response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
             HandleResponse(response, span, method, url);
             return response;
@@ -104,10 +104,10 @@ protected override HttpResponseMessage Send(HttpRequestMessage request, Cancella
         var method = request.Method.Method.ToUpperInvariant();
         var url = request.RequestUri?.ToString() ?? string.Empty;
 
-        PropagateTraceHeaders(request, url);
         var span = ProcessRequest(request, method, url);
         try
         {
+            PropagateTraceHeaders(request, url);
             var response = base.Send(request, cancellationToken);
             HandleResponse(response, span, method, url);
             return response;