Skip to content

Commit cf9cb31

Browse files
authored
Merge branch 'main' into semconv-1.30.0
2 parents 232a364 + 7ff2f51 commit cf9cb31

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
([#4371](https://github.com/open-telemetry/opentelemetry-python/pull/4371))
1818
- Fix span context manager typing by using ParamSpec from typing_extensions
1919
([#4389](https://github.com/open-telemetry/opentelemetry-python/pull/4389))
20+
- [BREAKING] semantic-conventions: Remove `opentelemetry.semconv.attributes.network_attributes.NETWORK_INTERFACE_NAME`
21+
introduced by mistake in the wrong module.
22+
([#4391](https://github.com/open-telemetry/opentelemetry-python/pull/4391))
2023
- semantic-conventions: Bump to 1.30.0
2124
([#4337](https://github.com/open-telemetry/opentelemetry-python/pull/4397))
2225

opentelemetry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/hw_metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def create_hw_power(
9898
Operational status: `1` (true) or `0` (false) for each of the possible states
9999
Instrument: updowncounter
100100
Unit: 1
101-
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.
101+
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.
102102
"""
103103

104104

scripts/semconv/templates/registry/weaver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ templates:
1313
filter: >
1414
semconv_grouped_attributes({
1515
"exclude_root_namespace": $excluded_namespaces,
16-
"exclude_stability": if $filter == "any" then [] else ["experimental"] end,
16+
"exclude_stability": if $filter == "any" then [] else ["experimental", "", null] end,
1717
})
1818
| map({
1919
root_namespace: .root_namespace,
@@ -28,7 +28,7 @@ templates:
2828
filter: >
2929
semconv_grouped_metrics({
3030
"exclude_root_namespace": $excluded_namespaces,
31-
"exclude_stability": if $filter == "any" then [] else ["experimental"] end,
31+
"exclude_stability": if $filter == "any" then [] else ["experimental", "", null] end,
3232
})
3333
| map({
3434
root_namespace: .root_namespace,

0 commit comments

Comments
 (0)