From d994745d8c9c41843930a25b82076f6f6ff84349 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Thu, 7 Sep 2023 21:33:10 +0000 Subject: [PATCH 1/3] Add "/" to valid characters for instrument names --- CHANGELOG.md | 2 ++ specification/metrics/api.md | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a8a8defb27..6a386c88971 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ release. ([#3670](https://github.com/open-telemetry/opentelemetry-specification/pull/3670)) - Rename "advice" to "advisory parameters". ([#3662](https://github.com/open-telemetry/opentelemetry-specification/pull/3662)) +- Add "/" to valid characters for instrument names + ([#3684](https://github.com/open-telemetry/opentelemetry-specification/pull/3684)) ### Logs diff --git a/specification/metrics/api.md b/specification/metrics/api.md index 86f81ea0584..0cfab13d690 100644 --- a/specification/metrics/api.md +++ b/specification/metrics/api.md @@ -206,7 +206,7 @@ The instrument name syntax is defined below using the [Augmented Backus-Naur Form](https://tools.ietf.org/html/rfc5234): ```abnf -instrument-name = ALPHA 0*254 ("_" / "." / "-" / ALPHA / DIGIT) +instrument-name = ALPHA 0*254 ("_" / "." / "-" / "/" / ALPHA / DIGIT) ALPHA = %x41-5A / %x61-7A; A-Z / a-z DIGIT = %x30-39 ; 0-9 @@ -215,8 +215,8 @@ DIGIT = %x30-39 ; 0-9 * They are not null or empty strings. * They are case-insensitive, ASCII strings. * The first character must be an alphabetic character. -* Subsequent characters must belong to the alphanumeric characters, '_', '.', - and '-'. +* Subsequent characters must belong to the alphanumeric characters, '_', '.', '-', + and '/'. * They can have a maximum length of 255 characters. #### Instrument unit From 85b878a0f51d0033c56d1927547ec0943b0144e6 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Mon, 11 Sep 2023 16:24:39 +0000 Subject: [PATCH 2/3] Reset compatibility matrix row for 'Instrument names conform to the specified syntax' --- spec-compliance-matrix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md index 73108333f1e..c8866fde76d 100644 --- a/spec-compliance-matrix.md +++ b/spec-compliance-matrix.md @@ -118,7 +118,7 @@ formats is required. Implementing more than one format is optional. | A valid instrument MUST be created and warning SHOULD be emitted when multiple instruments are registered under the same `Meter` using the same `name`. | | | + | + | + | | | | | | | | | Duplicate instrument registration name conflicts are resolved by using the first-seen for the stream name. | | | + | | | | | | | | | | | It is possible to register two instruments with same `name` under different `Meter`s. | | + | + | + | + | | | | + | + | + | | -| Instrument names conform to the specified syntax. | | - | + | | + | | | | + | + | + | | +| Instrument names conform to the specified syntax. | | | | | | | | | | | | | | Instrument units conform to the specified syntax. | | - | + | | + | | | | + | + | + | | | Instrument descriptions conform to the specified syntax. | | - | + | | - | | | | | - | + | | | Instrument supports the advisory ExplicitBucketBoundaries parameter. | | | + | | | | | | | | | | From fc8ab8ae82a8199f82282aed0f33f788f351065c Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Mon, 11 Sep 2023 16:41:36 +0000 Subject: [PATCH 3/3] Fix formatting of matrix --- spec-compliance-matrix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec-compliance-matrix.md b/spec-compliance-matrix.md index c8866fde76d..1840b606a94 100644 --- a/spec-compliance-matrix.md +++ b/spec-compliance-matrix.md @@ -118,7 +118,7 @@ formats is required. Implementing more than one format is optional. | A valid instrument MUST be created and warning SHOULD be emitted when multiple instruments are registered under the same `Meter` using the same `name`. | | | + | + | + | | | | | | | | | Duplicate instrument registration name conflicts are resolved by using the first-seen for the stream name. | | | + | | | | | | | | | | | It is possible to register two instruments with same `name` under different `Meter`s. | | + | + | + | + | | | | + | + | + | | -| Instrument names conform to the specified syntax. | | | | | | | | | | | | | +| Instrument names conform to the specified syntax. | | | | | | | | | | | + | | | Instrument units conform to the specified syntax. | | - | + | | + | | | | + | + | + | | | Instrument descriptions conform to the specified syntax. | | - | + | | - | | | | | - | + | | | Instrument supports the advisory ExplicitBucketBoundaries parameter. | | | + | | | | | | | | | |