Add support for samplers to modify Tracestate

.vscode/settings.json

@@ -8,6 +8,7 @@
     "contoso",
     "cref",
     "grafana",
+    "inheritdoc",
     "janotti",
     "kanzhelev",
     "liudmila",
@@ -36,6 +37,7 @@
     "struct",
     "tbody",
     "thead",
+    "Tracestate",
     "tracestate",
     "triager",
     "umesan",

src/OpenTelemetry/.publicApi/net462/PublicAPI.Unshipped.txt

@@ -19,6 +19,9 @@ OpenTelemetry.Logs.OpenTelemetryLoggerOptionsExtensions
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.AddProcessor(OpenTelemetry.BaseProcessor<OpenTelemetry.Logs.LogRecord!>! processor) -> OpenTelemetry.Logs.OpenTelemetryLoggerProvider!
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.ForceFlush(int timeoutMilliseconds = -1) -> bool
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.OpenTelemetryLoggerProvider() -> void
+~OpenTelemetry.Trace.SamplingResult.TraceStateString.get -> string
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, string traceStateString) -> void
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes, string traceStateString) -> void
 *REMOVED*static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, System.Action<OpenTelemetry.Logs.OpenTelemetryLoggerOptions!>? configure = null) -> Microsoft.Extensions.Logging.ILoggingBuilder!
 OpenTelemetry.Trace.ExportActivityProcessorOptions
 OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.get -> OpenTelemetry.Trace.BatchExportActivityProcessorOptions!

src/OpenTelemetry/.publicApi/net6.0/PublicAPI.Unshipped.txt

@@ -19,6 +19,9 @@ OpenTelemetry.Logs.OpenTelemetryLoggerOptionsExtensions
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.AddProcessor(OpenTelemetry.BaseProcessor<OpenTelemetry.Logs.LogRecord!>! processor) -> OpenTelemetry.Logs.OpenTelemetryLoggerProvider!
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.ForceFlush(int timeoutMilliseconds = -1) -> bool
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.OpenTelemetryLoggerProvider() -> void
+~OpenTelemetry.Trace.SamplingResult.TraceStateString.get -> string
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, string traceStateString) -> void
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes, string traceStateString) -> void
 *REMOVED*static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, System.Action<OpenTelemetry.Logs.OpenTelemetryLoggerOptions!>? configure = null) -> Microsoft.Extensions.Logging.ILoggingBuilder!
 OpenTelemetry.Trace.ExportActivityProcessorOptions
 OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.get -> OpenTelemetry.Trace.BatchExportActivityProcessorOptions!

src/OpenTelemetry/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt

@@ -19,6 +19,9 @@ OpenTelemetry.Logs.OpenTelemetryLoggerProvider.AddProcessor(OpenTelemetry.BasePr
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.ForceFlush(int timeoutMilliseconds = -1) -> bool
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.OpenTelemetryLoggerProvider() -> void
 OpenTelemetry.Logs.OpenTelemetryLoggerOptions.ConfigureResource(System.Action<OpenTelemetry.Resources.ResourceBuilder!>! configure) -> OpenTelemetry.Logs.OpenTelemetryLoggerOptions!
+~OpenTelemetry.Trace.SamplingResult.TraceStateString.get -> string
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, string traceStateString) -> void
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes, string traceStateString) -> void
 *REMOVED*static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, System.Action<OpenTelemetry.Logs.OpenTelemetryLoggerOptions!>? configure = null) -> Microsoft.Extensions.Logging.ILoggingBuilder!
 OpenTelemetry.Trace.ExportActivityProcessorOptions
 OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.get -> OpenTelemetry.Trace.BatchExportActivityProcessorOptions!

src/OpenTelemetry/.publicApi/netstandard2.1/PublicAPI.Unshipped.txt

@@ -19,6 +19,9 @@ OpenTelemetry.Logs.OpenTelemetryLoggerOptionsExtensions
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.AddProcessor(OpenTelemetry.BaseProcessor<OpenTelemetry.Logs.LogRecord!>! processor) -> OpenTelemetry.Logs.OpenTelemetryLoggerProvider!
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.ForceFlush(int timeoutMilliseconds = -1) -> bool
 OpenTelemetry.Logs.OpenTelemetryLoggerProvider.OpenTelemetryLoggerProvider() -> void
+~OpenTelemetry.Trace.SamplingResult.TraceStateString.get -> string
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, string traceStateString) -> void
+~OpenTelemetry.Trace.SamplingResult.SamplingResult(OpenTelemetry.Trace.SamplingDecision decision, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, object>> attributes, string traceStateString) -> void
 *REMOVED*static Microsoft.Extensions.Logging.OpenTelemetryLoggingExtensions.AddOpenTelemetry(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, System.Action<OpenTelemetry.Logs.OpenTelemetryLoggerOptions!>? configure = null) -> Microsoft.Extensions.Logging.ILoggingBuilder!
 OpenTelemetry.Trace.ExportActivityProcessorOptions
 OpenTelemetry.Trace.ExportActivityProcessorOptions.BatchExportProcessorOptions.get -> OpenTelemetry.Trace.BatchExportActivityProcessorOptions!

src/OpenTelemetry/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Allows samplers the ability to modify tracestate if desired.
+  ([#3610](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3610))
+
 ## 1.4.0-alpha.2
 
 Released 2022-Aug-18

src/OpenTelemetry/Trace/SamplingResult.cs

@@ -20,7 +20,7 @@
 namespace OpenTelemetry.Trace
 {
     /// <summary>
-    /// Sampling decision.
+    /// Sampling result.
     /// </summary>
     public readonly struct SamplingResult : System.IEquatable<SamplingResult>
     {
@@ -32,6 +32,7 @@ public SamplingResult(SamplingDecision decision)
         {
             this.Decision = decision;
             this.Attributes = Enumerable.Empty<KeyValuePair<string, object>>();
+            this.TraceStateString = null;
         }
 
         /// <summary>
@@ -42,6 +43,7 @@ public SamplingResult(bool isSampled)
         {
             this.Decision = isSampled ? SamplingDecision.RecordAndSample : SamplingDecision.Drop;
             this.Attributes = Enumerable.Empty<KeyValuePair<string, object>>();
+            this.TraceStateString = null;
         }
 
         /// <summary>
@@ -58,6 +60,38 @@ public SamplingResult(SamplingDecision decision, IEnumerable<KeyValuePair<string
             // Current implementation has no means to ensure the collection will not be modified by the caller.
             // If this behavior will be abused we must switch to cloning of the collection.
             this.Attributes = attributes;
+            this.TraceStateString = null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SamplingResult"/> struct.
+        /// </summary>
+        /// <param name="decision">indicates whether an activity object is recorded and sampled.</param>
+        /// <param name="traceStateString">traceStateString associated with the created Activity.</param>
+        public SamplingResult(SamplingDecision decision, string traceStateString)
+        {
+            this.Decision = decision;
+            this.Attributes = Enumerable.Empty<KeyValuePair<string, object>>();
+            this.TraceStateString = traceStateString;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SamplingResult"/> struct.
+        /// </summary>
+        /// <param name="decision">indicates whether an activity object is recorded and sampled.</param>
+        /// <param name="attributes">attributes associated with the sampling decision. Attributes list passed to
+        /// this method must be immutable. Mutations of the collection and/or attribute values may lead to unexpected behavior.</param>
+        /// <param name="traceStateString">traceStateString associated with the created Activity.</param>
+        public SamplingResult(SamplingDecision decision, IEnumerable<KeyValuePair<string, object>> attributes, string traceStateString)
+        {
+            this.Decision = decision;
+
+            // Note: Decision object takes ownership of the collection.
+            // Current implementation has no means to ensure the collection will not be modified by the caller.
+            // If this behavior will be abused we must switch to cloning of the collection.
+            this.Attributes = attributes;
+
+            this.TraceStateString = traceStateString;
         }
 
         /// <summary>
@@ -70,6 +104,11 @@ public SamplingResult(SamplingDecision decision, IEnumerable<KeyValuePair<string
         /// </summary>
         public IEnumerable<KeyValuePair<string, object>> Attributes { get; }
 
+        /// <summary>
+        /// Gets the tracestate.
+        /// </summary>
+        public string TraceStateString { get; }
+
         /// <summary>
         /// Compare two <see cref="SamplingResult"/> for equality.
         /// </summary>
@@ -93,7 +132,7 @@ public override bool Equals(object obj)
             }
 
             var that = (SamplingResult)obj;
-            return this.Decision == that.Decision && this.Attributes == that.Attributes;
+            return this.Decision == that.Decision && this.Attributes == that.Attributes && this.TraceStateString == that.TraceStateString;
         }
 
         /// <inheritdoc/>
@@ -102,13 +141,14 @@ public override int GetHashCode()
             var result = 1;
             result = (31 * result) + this.Decision.GetHashCode();
             result = (31 * result) + this.Attributes.GetHashCode();
+            result = this.TraceStateString == null ? result : (result * 31) + this.TraceStateString.GetHashCode();
             return result;
         }
 
         /// <inheritdoc/>
         public bool Equals(SamplingResult other)
         {
-            return this.Decision == other.Decision && this.Attributes.SequenceEqual(other.Attributes);
+            return this.Decision == other.Decision && this.Attributes.SequenceEqual(other.Attributes) && this.TraceStateString == other.TraceStateString;
         }
     }
 }

src/OpenTelemetry/Trace/TracerProviderSdk.cs

@@ -219,7 +219,7 @@ internal TracerProviderSdk(
             {
                 // This delegate informs ActivitySource about sampling decision when the parent context is an ActivityContext.
                 listener.Sample = (ref ActivityCreationOptions<ActivityContext> options) =>
-                    !Sdk.SuppressInstrumentation ? ComputeActivitySamplingResult(options, this.sampler) : ActivitySamplingResult.None;
+                    !Sdk.SuppressInstrumentation ? ComputeActivitySamplingResult(ref options, this.sampler) : ActivitySamplingResult.None;
                 this.getRequestedDataAction = this.RunGetRequestedDataOtherSampler;
             }
 
@@ -380,7 +380,7 @@ protected override void Dispose(bool disposing)
         }
 
         private static ActivitySamplingResult ComputeActivitySamplingResult(
-            in ActivityCreationOptions<ActivityContext> options,
+            ref ActivityCreationOptions<ActivityContext> options,
             Sampler sampler)
         {
             var samplingParameters = new SamplingParameters(
@@ -391,9 +391,9 @@ private static ActivitySamplingResult ComputeActivitySamplingResult(
                 options.Tags,
                 options.Links);
 
-            var shouldSample = sampler.ShouldSample(samplingParameters);
+            var samplingResult = sampler.ShouldSample(samplingParameters);
 
-            var activitySamplingResult = shouldSample.Decision switch
+            var activitySamplingResult = samplingResult.Decision switch
             {
                 SamplingDecision.RecordAndSample => ActivitySamplingResult.AllDataAndRecorded,
                 SamplingDecision.RecordOnly => ActivitySamplingResult.AllData,
@@ -402,11 +402,28 @@ private static ActivitySamplingResult ComputeActivitySamplingResult(
 
             if (activitySamplingResult != ActivitySamplingResult.PropagationData)
             {
-                foreach (var att in shouldSample.Attributes)
+                foreach (var att in samplingResult.Attributes)
                 {
                     options.SamplingTags.Add(att.Key, att.Value);
                 }
 
+                // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/sdk.md#sampler
+                // Spec requires clearing Tracestate if empty Tracestate is returned.
+                // Since .NET did not have this capability, it'll break
+                // existing samplers if we did that. So the following is
+                // adopted to remain spec-compliant and backward compat.
+                // The behavior is:
+                // if sampler returns null, its treated as if it has no intend
+                // to change Tracestate. Existing SamplingResult ctors will put null as default TraceStateString,
+                // so all existing samplers will get this behavior.
+                // if sampler returns non-null, then it'll be used as the
+                // new value for Tracestate
+                // A sampler can return string.Empty if it intends to clear the state.
+                if (samplingResult.TraceStateString != null)
+                {
+                    options = options with { TraceState = samplingResult.TraceStateString };
+                }
+
                 return activitySamplingResult;
             }
 
@@ -493,6 +510,11 @@ private void RunGetRequestedDataOtherSampler(Activity activity)
                 {
                     activity.SetTag(att.Key, att.Value);
                 }
+
+                if (samplingResult.TraceStateString != null)
+                {
+                    activity.TraceStateString = samplingResult.TraceStateString;
+                }
             }
         }
     }