up

lmolkova · Jul 26, 2024 · 8475de1 · 8475de1
1 parent 3993617
commit 8475de1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/...try-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/process_metrics.py b/...try-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/process_metrics.py
@@ -24,17 +24,18 @@
 
 from opentelemetry.metrics import (
     CallbackOptions,
+    Counter,
     Meter,
     ObservableGauge,
     Observation,
+    UpDownCounter,
 )
 
 # pylint: disable=invalid-name
 CallbackT = Union[
     Callable[[CallbackOptions], Iterable[Observation]],
     Generator[Iterable[Observation], CallbackOptions, None],
 ]
-from opentelemetry.metrics import Counter, UpDownCounter
 
 PROCESS_CONTEXT_SWITCHES: Final = "process.context_switches"
 """

diff --git a/...etry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/system_metrics.py b/...etry-semantic-conventions/src/opentelemetry/semconv/_incubating/metrics/system_metrics.py
@@ -24,17 +24,18 @@
 
 from opentelemetry.metrics import (
     CallbackOptions,
+    Counter,
     Meter,
     ObservableGauge,
     Observation,
+    UpDownCounter,
 )
 
 # pylint: disable=invalid-name
 CallbackT = Union[
     Callable[[CallbackOptions], Iterable[Observation]],
     Generator[Iterable[Observation], CallbackOptions, None],
 ]
-from opentelemetry.metrics import Counter, UpDownCounter
 
 SYSTEM_CPU_FREQUENCY: Final = "system.cpu.frequency"
 """

diff --git a/scripts/semconv/templates/registry/semantic_metrics.j2 b/scripts/semconv/templates/registry/semantic_metrics.j2
@@ -42,6 +42,13 @@
   {% if ctx.filter == "any" %}
 from opentelemetry.metrics import Meter
 
+    {%- set instruments = ["counter", "histogram", "updowncounter"]-%}
+    {%- for i in instruments -%}
+        {%- if ctx.metrics | selectattr("instrument", "equalto", i) | list | count > 0 %}
+from opentelemetry.metrics import {{i | map_text("py_instrument_to_type")}}
+        {%- endif -%}
+    {%- endfor-%}
+
     {%- if ctx.metrics | selectattr("instrument", "equalto", "gauge") | list | count > 0 %}
 from typing import Callable, Generator, Iterable, Optional, Sequence, Union
 from opentelemetry.metrics import CallbackOptions, ObservableGauge, Observation
@@ -53,12 +60,6 @@ CallbackT = Union[
 ]
     {%- endif %}
 
-    {%- set instruments = ["counter", "histogram", "updowncounter"]-%}
-    {%- for i in instruments -%}
-        {%- if ctx.metrics | selectattr("instrument", "equalto", i) | list | count > 0 %}
-from opentelemetry.metrics import {{i | map_text("py_instrument_to_type")}}
-        {%- endif -%}
-    {%- endfor-%}
   {%- endif -%}
 {%- endmacro-%}