Skip to content

Commit

Permalink
Merge branch 'main' into semconv-1.30.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xrmx authored Jan 27, 2025
2 parents 232a364 + 7ff2f51 commit cf9cb31
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#4371](https://github.com/open-telemetry/opentelemetry-python/pull/4371))
- Fix span context manager typing by using ParamSpec from typing_extensions
([#4389](https://github.com/open-telemetry/opentelemetry-python/pull/4389))
- [BREAKING] semantic-conventions: Remove `opentelemetry.semconv.attributes.network_attributes.NETWORK_INTERFACE_NAME`
introduced by mistake in the wrong module.
([#4391](https://github.com/open-telemetry/opentelemetry-python/pull/4391))
- semantic-conventions: Bump to 1.30.0
([#4337](https://github.com/open-telemetry/opentelemetry-python/pull/4397))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def create_hw_power(
Operational status: `1` (true) or `0` (false) for each of the possible states
Instrument: updowncounter
Unit: 1
Note: `hw.status` is currently specified as an *UpDownCounter* but would ideally be represented using a [*StateSet* as defined in OpenMetrics](https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset). This semantic convention will be updated once *StateSet* is specified in OpenTelemetry. This planned change is not expected to have any consequence on the way users query their timeseries backend to retrieve the values of `hw.status` over time.
Note: `hw.status` is currently specified as an *UpDownCounter* but would ideally be represented using a [*StateSet* as defined in OpenMetrics](https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#stateset). This semantic convention will be updated once *StateSet* is specified in OpenTelemetry. This planned change is not expected to have any consequence on the way users query their timeseries backend to retrieve the values of `hw.status` over time.
"""


Expand Down
4 changes: 2 additions & 2 deletions scripts/semconv/templates/registry/weaver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ templates:
filter: >
semconv_grouped_attributes({
"exclude_root_namespace": $excluded_namespaces,
"exclude_stability": if $filter == "any" then [] else ["experimental"] end,
"exclude_stability": if $filter == "any" then [] else ["experimental", "", null] end,
})
| map({
root_namespace: .root_namespace,
Expand All @@ -28,7 +28,7 @@ templates:
filter: >
semconv_grouped_metrics({
"exclude_root_namespace": $excluded_namespaces,
"exclude_stability": if $filter == "any" then [] else ["experimental"] end,
"exclude_stability": if $filter == "any" then [] else ["experimental", "", null] end,
})
| map({
root_namespace: .root_namespace,
Expand Down

0 comments on commit cf9cb31

Please sign in to comment.