From 6cf28c8cc5535aa68ee967accf26b95b6478c205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 26 Aug 2020 11:06:25 +0200 Subject: [PATCH 1/6] Change Sampler.ShouldSample to get full parent Context. --- specification/trace/sdk.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/trace/sdk.md b/specification/trace/sdk.md index b1afff388f0..813504bd4c4 100644 --- a/specification/trace/sdk.md +++ b/specification/trace/sdk.md @@ -60,10 +60,10 @@ Returns the sampling Decision for a `Span` to be created. **Required arguments:** -* `SpanContext` of a parent `Span`. Typically extracted from the wire. Can be +* `Context` with parent `Span`. Typically extracted from the wire. Can be `null`. * `TraceId` of the `Span` to be created. It can be different from the `TraceId` - in the `SpanContext`. Typically in situations when the `Span` to be created + in the `Context`. Typically in situations when the `Span` to be created starts a new Trace. * Name of the `Span` to be created. * `SpanKind` From 7fffa70d6a34e210f0fc63f0774249d687c67245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 26 Aug 2020 17:02:46 +0200 Subject: [PATCH 2/6] Link to Context. --- specification/trace/sdk.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/trace/sdk.md b/specification/trace/sdk.md index 813504bd4c4..8bfe0e6a6cf 100644 --- a/specification/trace/sdk.md +++ b/specification/trace/sdk.md @@ -60,8 +60,8 @@ Returns the sampling Decision for a `Span` to be created. **Required arguments:** -* `Context` with parent `Span`. Typically extracted from the wire. Can be - `null`. +* [`Context`](../context/context.md) with parent `Span`. + Typically extracted from the wire. Can be `null`. * `TraceId` of the `Span` to be created. It can be different from the `TraceId` in the `Context`. Typically in situations when the `Span` to be created starts a new Trace. From 9b5eb84746a202cffc3a59db92abaecc480e2989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Tue, 6 Oct 2020 14:33:58 +0200 Subject: [PATCH 3/6] SpanContext is never stored in Context anymore --- specification/trace/sdk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/trace/sdk.md b/specification/trace/sdk.md index 47976505908..1296174b853 100644 --- a/specification/trace/sdk.md +++ b/specification/trace/sdk.md @@ -78,7 +78,7 @@ Returns the sampling Decision for a `Span` to be created. **Required arguments:** -* [`Context`](../context/context.md) with parent `Span`. May be without a valid Span(Context) to indicate a root span. +* [`#`](../context/context.md) with parent `Span`. May be without a valid Span to indicate a root span. * `TraceId` of the `Span` to be created. If the parent `SpanContext` contains a valid `TraceId`, they MUST always match. * Name of the `Span` to be created. From 5245d6db3e4f2bf450108cc55a3695ffeebae967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Tue, 6 Oct 2020 14:37:58 +0200 Subject: [PATCH 4/6] Add CHANGELOG. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aab723ca50..4955ba07711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -83,6 +83,8 @@ Updates: ([#984](https://github.com/open-telemetry/opentelemetry-specification/pull/984) - Metrics SDK: Specify TBD default aggregation for ValueRecorder ([#984](https://github.com/open-telemetry/opentelemetry-specification/pull/984) +- Trace SDK: Sampler.ShouldSample gets parent Context instead of SpanContext + ([#881](https://github.com/open-telemetry/opentelemetry-specification/pull/881)) ## v0.6.0 (07-01-2020) From 2ea557eeef8fc432e94ba55b3c5148cfa57a9c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Tue, 6 Oct 2020 14:39:27 +0200 Subject: [PATCH 5/6] Wording. --- specification/trace/sdk.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/trace/sdk.md b/specification/trace/sdk.md index 1296174b853..35b73edbd8f 100644 --- a/specification/trace/sdk.md +++ b/specification/trace/sdk.md @@ -78,7 +78,8 @@ Returns the sampling Decision for a `Span` to be created. **Required arguments:** -* [`#`](../context/context.md) with parent `Span`. May be without a valid Span to indicate a root span. +* [`Context`](../context/context.md) with parent `Span`. + The Span's SpanContext may be invalid to indicate a root span. * `TraceId` of the `Span` to be created. If the parent `SpanContext` contains a valid `TraceId`, they MUST always match. * Name of the `Span` to be created. From f081f865d993446227a3dfb7120edb553c3a5ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Tue, 13 Oct 2020 16:49:52 +0200 Subject: [PATCH 6/6] Add compliance matrix entry. --- spec-compliance-matrix.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md index e5e2be8d8dd..b1de35484e3 100644 --- a/spec-compliance-matrix.md +++ b/spec-compliance-matrix.md @@ -61,7 +61,9 @@ status of the feature is not known. |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 | | | | | | | | | | | +|Allow samplers to modify tracestate | | | | | | | | | | | +|ShouldSample gets full parent Context | | | | | | | | | | | + ## Baggage