feat: Tracing without performance

src/Sentry/BaggageHeader.cs

@@ -59,7 +59,7 @@ public override string ToString()
     /// <returns>
     /// An object representing the members baggage header, or <c>null</c> if there are no members parsed.
     /// </returns>
-    public static BaggageHeader? TryParse(string baggage, bool onlySentry = false)
+    internal static BaggageHeader? TryParse(string baggage, bool onlySentry = false)
     {
         // Example from W3C baggage spec:
         // "key1=value1;property1;property2, key2 = value2, key3=value3; propertyKey=propertyValue"

src/Sentry/DynamicSamplingContext.cs

@@ -127,6 +127,14 @@ public static DynamicSamplingContext CreateFromTransaction(TransactionTracer tra
             userSegment,
             transactionName);
     }
+
+    public static DynamicSamplingContext CreateFromPropagationContext(SentryPropagationContext propagationContext, SentryOptions options)
+    {
+        var publicKey = Dsn.Parse(options.Dsn!).PublicKey;
+        var traceId = propagationContext.TraceId;
+
+        return new DynamicSamplingContext(traceId, publicKey, 1.0f);
+    }
 }
 
 internal static class DynamicSamplingContextExtensions

src/Sentry/Internal/Hub.cs

@@ -197,26 +197,39 @@ public void BindException(Exception exception, ISpan span)
 
     public SentryTraceHeader? GetTraceHeader() => GetTraceParent();
 
-    public SentryTraceHeader? GetTraceParent()
+    public SentryTraceHeader GetTraceParent()
     {
-        var traceHeader = GetSpan()?.GetTraceHeader();
-        if (traceHeader is not null)
+        if (_options.IsTracingEnabled)
         {
-            return traceHeader;
+            var traceHeader = GetSpan()?.GetTraceHeader();
+            if (traceHeader is not null)
+            {
+                return traceHeader;
+            }
         }
 
         var propagationContext = ScopeManager.GetCurrent().Key.PropagationContext;
-        if (propagationContext is not null)
-        {
-            return new SentryTraceHeader(propagationContext.TraceId, propagationContext.SpanId, null);
-        }
-
-        return null;
+        return new SentryTraceHeader(propagationContext.TraceId, propagationContext.SpanId, null);
     }
 
     public BaggageHeader? GetBaggage()
     {
-        throw new NotImplementedException();
+        if (_options.IsTracingEnabled)
+        {
+            var transaction = GetSpan();
+            if (transaction is TransactionTracer {DynamicSamplingContext: {IsEmpty: false} dsc})
+            {
+                return dsc.ToBaggageHeader();
+            }
+        }
+
+        var propagationContext = ScopeManager.GetCurrent().Key.PropagationContext;
+        if (propagationContext?.DynamicSamplingContext is not null)
+        {
+            return propagationContext.DynamicSamplingContext.ToBaggageHeader();
+        }
+
+        return null;
     }
 
     public TransactionContext? ContinueTrace(string? sentryTrace, string? baggageHeaders)
@@ -228,10 +241,8 @@ public void BindException(Exception exception, ISpan span)
         {
             return new TransactionContext(propagationContext.SpanId,propagationContext.ParentSpanId, propagationContext.TraceId, "", "", "", null, null, null);
         }
-        else
-        {
-            return null;
-        }
+
+        return null;
     }
 
     public void StartSession()
@@ -375,14 +386,6 @@ SentryId IHubEx.CaptureEventInternal(SentryEvent evt, Hint? hint, Scope? scope)
             var currentScope = ScopeManager.GetCurrent();
             var actualScope = scope ?? currentScope.Key;
 
-            // Inject trace information from a linked span
-            if (GetLinkedSpan(evt, actualScope) is { } linkedSpan)
-            {
-                evt.Contexts.Trace.SpanId = linkedSpan.SpanId;
-                evt.Contexts.Trace.TraceId = linkedSpan.TraceId;
-                evt.Contexts.Trace.ParentSpanId = linkedSpan.ParentSpanId;
-            }
-
             var hasTerminalException = evt.HasTerminalException();
             if (hasTerminalException)
             {
@@ -397,9 +400,26 @@ SentryId IHubEx.CaptureEventInternal(SentryEvent evt, Hint? hint, Scope? scope)
                 actualScope.SessionUpdate = _sessionManager.ReportError();
             }
 
-            // When a transaction is present, copy its DSC to the event.
-            var transaction = actualScope.Transaction as TransactionTracer;
-            evt.DynamicSamplingContext = transaction?.DynamicSamplingContext;
+            TransactionTracer? transaction = null;
+            if(_options.IsTracingEnabled)
+            {
+                // Inject trace information from a linked span
+                if (GetLinkedSpan(evt, actualScope) is { } linkedSpan)
+                {
+                    evt.Contexts.Trace.SpanId = linkedSpan.SpanId;
+                    evt.Contexts.Trace.TraceId = linkedSpan.TraceId;
+                    evt.Contexts.Trace.ParentSpanId = linkedSpan.ParentSpanId;
+                }
+
+                // When a transaction is present, copy its DSC to the event.
+                transaction = actualScope.Transaction as TransactionTracer;
+                evt.DynamicSamplingContext = transaction?.DynamicSamplingContext;
+            }
+            else
+            {
+                actualScope.PropagationContext.DynamicSamplingContext ??= DynamicSamplingContext.CreateFromPropagationContext(actualScope.PropagationContext, _options);
+                evt.DynamicSamplingContext = actualScope.PropagationContext.DynamicSamplingContext;
+            }
 
             // Now capture the event with the Sentry client on the current scope.
             var sentryClient = currentScope.Value;

src/Sentry/Scope.cs

@@ -191,7 +191,7 @@ public ITransaction? Transaction
         set => _transaction = value;
     }
 
-    internal SentryPropagationContext? PropagationContext { get; set; }
+    internal SentryPropagationContext PropagationContext { get; set; }
 
     internal SessionUpdate? SessionUpdate { get; set; }
 
@@ -235,8 +235,14 @@ public ITransaction? Transaction
     /// Creates a scope with the specified options.
     /// </summary>
     public Scope(SentryOptions? options)
+        : this(options, null)
+    {
+    }
+
+    internal Scope(SentryOptions? options, SentryPropagationContext? propagationContext)
     {
         Options = options ?? new SentryOptions();
+        PropagationContext = propagationContext ?? new SentryPropagationContext();
     }
 
     // For testing. Should explicitly require SentryOptions.
@@ -443,6 +449,10 @@ public void Apply(IEventLike other)
         {
             other.Sdk.AddPackage(package);
         }
+
+        other.Contexts.Trace.SpanId = PropagationContext.SpanId;
+        other.Contexts.Trace.TraceId = PropagationContext.TraceId;
+        other.Contexts.Trace.ParentSpanId = PropagationContext.ParentSpanId;
     }
 
     /// <summary>
@@ -478,7 +488,7 @@ public void Apply(Scope other)
     /// </summary>
     public Scope Clone()
     {
-        var clone = new Scope(Options)
+        var clone = new Scope(Options, PropagationContext)
         {
             OnEvaluating = OnEvaluating
         };

src/Sentry/SentryHttpMessageHandler.cs

@@ -156,14 +156,12 @@ private void AddSentryTraceHeader(HttpRequestMessage request)
 
     private void AddBaggageHeader(HttpRequestMessage request)
     {
-        var transaction = _hub.GetSpan();
-        if (transaction is not TransactionTracer {DynamicSamplingContext: {IsEmpty: false} dsc})
+        var baggage = _hub.GetBaggage();
+        if (baggage is null)
         {
             return;
         }
 
-        var baggage = dsc.ToBaggageHeader();
-
         if (request.Headers.TryGetValues(BaggageHeader.HttpHeaderName, out var baggageHeaders))
         {
             var headers = baggageHeaders.ToList();

src/Sentry/SentryPropagationContext.cs

@@ -5,23 +5,23 @@ internal class SentryPropagationContext
     public SentryId TraceId { get; }
     public SpanId SpanId { get; }
     public SpanId? ParentSpanId { get; }
-    public DynamicSamplingContext? DynamicSamplingContext { get; }
+    public DynamicSamplingContext? DynamicSamplingContext { get; set; }
 
     private SentryPropagationContext(
         SentryTraceHeader traceHeader,
         SpanId? parentSpanId,
         DynamicSamplingContext? dynamicSamplingContext)
     {
         TraceId = traceHeader.TraceId;
-        SpanId = traceHeader.SpanId;
-        ParentSpanId = parentSpanId;
+        SpanId = SpanId.Create();
+        ParentSpanId = parentSpanId ?? traceHeader.SpanId;
         DynamicSamplingContext = dynamicSamplingContext;
     }
 
-    private SentryPropagationContext()
+    public SentryPropagationContext()
     {
-        TraceId = new SentryId();
-        SpanId = new SpanId();
+        TraceId = SentryId.Create();
+        SpanId = SpanId.Create();
     }
 
     public static SentryPropagationContext CreateFromHeaders(string? sentryTraceHeader, string? baggageHeadersString)