Merge branch 'main' into histogram-advisory

Author: xrmx

CHANGELOG.md

@@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4389](https://github.com/open-telemetry/opentelemetry-python/pull/4389))
 - Add support for `explicit_bucket_boundaries` advisory for Histograms
   ([#4361](https://github.com/open-telemetry/opentelemetry-python/pull/4361))
+- [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))
 
 ## Version 1.29.0/0.50b0 (2024-12-11)
 

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

@@ -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.
 """
 
 

opentelemetry-semantic-conventions/src/opentelemetry/semconv/attributes/network_attributes.py

@@ -15,11 +15,6 @@
 from enum import Enum
 from typing import Final
 
-NETWORK_INTERFACE_NAME: Final = "network.interface.name"
-"""
-The network interface name.
-"""
-
 NETWORK_LOCAL_ADDRESS: Final = "network.local.address"
 """
 Local address of the network connection - IP address or Unix domain socket name.

scripts/semconv/templates/registry/weaver.yaml

@@ -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,
@@ -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,