Follow up for open-telemetry#988. (open-telemetry#1036)

carlosalberto · Sep 30, 2020 · 53c23c9 · 53c23c9
1 parent 8365f8a
commit 53c23c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,7 +32,7 @@ New:
     ([#784](https://github.com/open-telemetry/opentelemetry-specification/pull/784),
     [#946](https://github.com/open-telemetry/opentelemetry-specification/pull/946))
 - Allow samplers to modify tracestate
-  ([#856](https://github.com/open-telemetry/opentelemetry-specification/pull/988/))
+  ([#988](https://github.com/open-telemetry/opentelemetry-specification/pull/988/))
 - Update the header name for otel baggage, and version date
   ([#981](https://github.com/open-telemetry/opentelemetry-specification/pull/981))
 - Define PropagationOnly Span to simplify active Span logic in Context

diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md
@@ -60,6 +60,8 @@ status of the feature is not known.
 |[Span exceptions](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/api.md#record-exception)|
 |RecordException                               | - | +  | + | +    | +  | -    |   | +  | - | +  |
 |RecordException with extra parameters         | - | +  | + | [-](https://github.com/open-telemetry/opentelemetry-python/issues/1102)    | -  | -    |   | +  | - | +  |
+|[Sampling](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/sdk.md#sampling)|
+|Allow samplers to modify tracestate           |  |    |   |      |    |      |   |    |   |    |
 
 ## Baggage
 

diff --git a/specification/trace/sdk.md b/specification/trace/sdk.md
@@ -101,8 +101,8 @@ It produces an output called `SamplingResult` which contains:
 object must be immutable (multiple calls may return different immutable objects).
 * A `Tracestate` that will be associated with the `Span` through the new
   `SpanContext`.
-  Note: If the sampler returns an empty `Tracestate` here, the `Tracestate` will be cleared,
-  so samplers should normally return the passed-in `Tracestate` if they do not intend
+  If the sampler returns an empty `Tracestate` here, the `Tracestate` will be cleared,
+  so samplers SHOULD normally return the passed-in `Tracestate` if they do not intend
   to change it.
 
 #### GetDescription