diff --git a/semantic-conventions/CHANGELOG.md b/semantic-conventions/CHANGELOG.md index 9428e7d5..bc502fac 100644 --- a/semantic-conventions/CHANGELOG.md +++ b/semantic-conventions/CHANGELOG.md @@ -4,6 +4,10 @@ Please update the changelog as part of any significant pull request. ## Unreleased +- Inherit referenced attribute properties from `extend` + hierarchy before falling back to original attribute definition. + ([#204](https://github.com/open-telemetry/build-tools/pull/204)) + ## v0.21.0 - Render template-type attributes from yaml files @@ -27,7 +31,7 @@ Please update the changelog as part of any significant pull request. - Allow multiple semconv in --only flag ([#157](https://github.com/open-telemetry/build-tools/pull/157)) - + ## v0.17.0 - Rename Optional attribute requirement level to Opt-In @@ -44,7 +48,7 @@ Please update the changelog as part of any significant pull request. ## v0.15.0 -- Add a semantic convention type for Metrics ("metric" and "metric_group") +- Add a semantic convention type for Metrics ("metric" and "metric_group") ([#79](https://github.com/open-telemetry/build-tools/pull/79)) - Add a semantic convention type for generic attribute group ("attribute_group") ([#124](https://github.com/open-telemetry/build-tools/pull/124)). diff --git a/semantic-conventions/src/tests/data/markdown/ref_extends/expected.md b/semantic-conventions/src/tests/data/markdown/ref_extends/expected.md index 5d9cf891..ebb17dd4 100644 --- a/semantic-conventions/src/tests/data/markdown/ref_extends/expected.md +++ b/semantic-conventions/src/tests/data/markdown/ref_extends/expected.md @@ -3,7 +3,9 @@ | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| [`server.address`](input_server.md) | string | Server component of Host header. | `foo` | Required | +| [`server.address`](input_server.md) | string | Server component of Host header. (overridden brief) [1] | `foo.io` | Required | + +**[1]:** Note on the overridden attribute definition. Following attributes MUST be provided **at span creation time** (when provided at all), so they can be considered for sampling decisions: @@ -21,5 +23,7 @@ Following attributes MUST be provided **at span creation time** (when provided a | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| [`server.address`](input_server.md) | string | Server component of Host header. | `foo` | Required | +| [`server.address`](input_server.md) | string | Server component of Host header. (overridden brief) [1] | `foo.io` | Required | + +**[1]:** Note on the overridden attribute definition. diff --git a/semantic-conventions/src/tests/data/markdown/ref_extends/http.yaml b/semantic-conventions/src/tests/data/markdown/ref_extends/http.yaml index 438e2b72..89cd5a5e 100644 --- a/semantic-conventions/src/tests/data/markdown/ref_extends/http.yaml +++ b/semantic-conventions/src/tests/data/markdown/ref_extends/http.yaml @@ -5,7 +5,9 @@ groups: attributes: - ref: server.address requirement_level: required - brief: Server component of Host header. + brief: 'Server component of Host header. (overridden brief)' + note: 'Note on the overridden attribute definition.' + examples: ['foo.io'] - id: http.client.spans type: span diff --git a/semantic-conventions/src/tests/data/markdown/ref_extends/server.yaml b/semantic-conventions/src/tests/data/markdown/ref_extends/server.yaml index 757e6ae1..0b25c86f 100644 --- a/semantic-conventions/src/tests/data/markdown/ref_extends/server.yaml +++ b/semantic-conventions/src/tests/data/markdown/ref_extends/server.yaml @@ -6,5 +6,6 @@ groups: attributes: - id: address type: string - brief: 'Domain name.' + brief: 'Domain name. (original brief)' examples: 'foo' + note: 'Note on the original attribute definition.'