From 18d771788812aca87ff71e86adaab2093907aeba Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Fri, 27 Aug 2021 07:22:20 +0530 Subject: [PATCH 1/3] Prefer global limit over model-specific default --- specification/common/common.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/common/common.md b/specification/common/common.md index 6cb26c12f99..60faef26114 100644 --- a/specification/common/common.md +++ b/specification/common/common.md @@ -78,8 +78,9 @@ in the list below. An SDK MAY implement model-specific limits, for example `SpanAttributeCountLimit`. If both a general and a model-specific limit are implemented, then the SDK MUST first attempt to use the model-specific limit, if -it isn't set and doesn't have a default, then the SDK MUST attempt to use the -general limit. +it isn't set, then the SDK MUST attempt to use the general limit. If neither are +defined, then the SDK must try to use the model-specific limit default value, +followed by the global limit default value. **Configurable parameters:** From d2ded124c28001c44f518fefd5b95861dad59445 Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Fri, 10 Sep 2021 01:32:53 +0530 Subject: [PATCH 2/3] Update specification/common/common.md Co-authored-by: Nikita Salnikov-Tarnovski --- specification/common/common.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/common/common.md b/specification/common/common.md index 60faef26114..c3f434aa895 100644 --- a/specification/common/common.md +++ b/specification/common/common.md @@ -79,7 +79,7 @@ An SDK MAY implement model-specific limits, for example `SpanAttributeCountLimit`. If both a general and a model-specific limit are implemented, then the SDK MUST first attempt to use the model-specific limit, if it isn't set, then the SDK MUST attempt to use the general limit. If neither are -defined, then the SDK must try to use the model-specific limit default value, +defined, then the SDK MUST try to use the model-specific limit default value, followed by the global limit default value. From 011141e0f7bbff5555a69b0540ef9a68ec704c5d Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Fri, 27 Aug 2021 07:22:20 +0530 Subject: [PATCH 3/3] Prefer global limit over model-specific default --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2655b38eaab..13fdb8d43ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ release. ### Traces +- Prefer global user defined limits over model-sepcific default values. + ([#1893](https://github.com/open-telemetry/opentelemetry-specification/pull/1893)) - Add InstrumentationLibrary to Sampler.ShouldSample. ([#1850](https://github.com/open-telemetry/opentelemetry-specification/pull/1850))