Skip to content

Commit c5649c2

Browse files
committed
Add check for duplicate instrument names
Fixes open-telemetry#2142
1 parent 64a25a0 commit c5649c2

4 files changed

Lines changed: 106 additions & 9 deletions

File tree

‎opentelemetry-api/src/opentelemetry/_metrics/__init__.py‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,21 @@ def version(self):
132132
def schema_url(self):
133133
return self._schema_url
134134

135-
# FIXME check that the instrument name has not been used already
135+
def _check_instrument_name(self, name):
136+
if name in self._instrument_names:
137+
raise Exception(f"Instrument name {name} has been used already")
138+
139+
self._instrument_names.add(name)
136140

137141
@abstractmethod
138142
def create_counter(self, name, unit="", description="") -> Counter:
139-
pass
143+
self._check_instrument_name(name)
140144

141145
@abstractmethod
142146
def create_up_down_counter(
143147
self, name, unit="", description=""
144148
) -> UpDownCounter:
145-
pass
149+
self._check_instrument_name(name)
146150

147151
@abstractmethod
148152
def create_observable_counter(
@@ -226,22 +230,23 @@ def cpu_time_callback(states_to_include: set[str]) -> Iterable[Iterable[Measurem
226230
example, ``By`` for bytes. UCUM units are recommended.
227231
description: A description for this instrument and what it measures.
228232
"""
233+
self._check_instrument_name(name)
229234

230235
@abstractmethod
231236
def create_histogram(self, name, unit="", description="") -> Histogram:
232-
pass
237+
self._check_instrument_name(name)
233238

234239
@abstractmethod
235240
def create_observable_gauge(
236241
self, name, callback, unit="", description=""
237242
) -> ObservableGauge:
238-
pass
243+
self._check_instrument_name(name)
239244

240245
@abstractmethod
241246
def create_observable_up_down_counter(
242247
self, name, callback, unit="", description=""
243248
) -> ObservableUpDownCounter:
244-
pass
249+
self._check_instrument_name(name)
245250

246251

247252
class _ProxyMeter(Meter):

‎opentelemetry-api/tests/metrics/test_meter.py‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,17 @@
1414
# type: ignore
1515

1616
from unittest import TestCase
17+
from unittest.mock import Mock
1718

1819
from opentelemetry._metrics import Meter
20+
from opentelemetry._metrics.instrument import (
21+
Counter,
22+
Histogram,
23+
ObservableCounter,
24+
ObservableGauge,
25+
ObservableUpDownCounter,
26+
UpDownCounter,
27+
)
1928

2029
# FIXME Test that the meter methods can be called concurrently safely.
2130

@@ -53,6 +62,75 @@ def create_observable_up_down_counter(
5362

5463

5564
class TestMeter(TestCase):
65+
def test_repeated_instrument_names(self):
66+
class TestMeter(Meter):
67+
def create_counter(self, name, unit="", description="") -> Counter:
68+
super().create_counter(
69+
name, unit=unit, description=description
70+
)
71+
72+
def create_up_down_counter(
73+
self, name, unit="", description=""
74+
) -> UpDownCounter:
75+
super().create_up_down_counter(
76+
name, unit=unit, description=description
77+
)
78+
79+
def create_observable_counter(
80+
self, name, callback, unit="", description=""
81+
) -> ObservableCounter:
82+
super().create_observable_up_down_counter(
83+
name, callback, unit=unit, description=description
84+
)
85+
86+
def create_histogram(
87+
self, name, unit="", description=""
88+
) -> Histogram:
89+
super().create_histogram(
90+
name, unit=unit, description=description
91+
)
92+
93+
def create_observable_gauge(
94+
self, name, callback, unit="", description=""
95+
) -> ObservableGauge:
96+
super().create_observable_gauge(
97+
name, callback, unit=unit, description=description
98+
)
99+
100+
def create_observable_up_down_counter(
101+
self, name, callback, unit="", description=""
102+
) -> ObservableUpDownCounter:
103+
super().create_observable_up_down_counter(
104+
name, callback, unit=unit, description=description
105+
)
106+
107+
try:
108+
test_meter = TestMeter("name")
109+
110+
test_meter.create_counter("counter")
111+
test_meter.create_up_down_counter("up_down_counter")
112+
test_meter.create_observable_counter("observable_counter", Mock())
113+
test_meter.create_histogram("histogram")
114+
test_meter.create_observable_gauge("observable_gauge", Mock())
115+
test_meter.create_observable_up_down_counter(
116+
"observable_up_down_counter", Mock()
117+
)
118+
except Exception as error:
119+
self.fail(f"Unexpected exception raised {error}")
120+
121+
for instrument_name in [
122+
"counter",
123+
"up_down_counter",
124+
"observable_counter",
125+
"histogram",
126+
"observable_gauge",
127+
"observable_up_down_counter",
128+
]:
129+
with self.assertRaises(Exception):
130+
getattr(test_meter, f"create_{instrument_name}")(
131+
instrument_name
132+
)
133+
56134
def test_create_counter(self):
57135
"""
58136
Test that the meter provides a function to create a new Counter

‎opentelemetry-sdk/src/opentelemetry/sdk/_metrics/__init__.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ def __init__(
6565
self._measurement_consumer = measurement_consumer
6666

6767
def create_counter(self, name, unit=None, description=None) -> APICounter:
68+
super().create_counter(name, unit=unit, description=description)
6869
return Counter(
6970
name,
7071
self._instrumentation_info,
@@ -76,6 +77,9 @@ def create_counter(self, name, unit=None, description=None) -> APICounter:
7677
def create_up_down_counter(
7778
self, name, unit=None, description=None
7879
) -> APIUpDownCounter:
80+
super().create_up_down_counter(
81+
name, unit=unit, description=description
82+
)
7983
return UpDownCounter(
8084
name,
8185
self._instrumentation_info,
@@ -87,6 +91,9 @@ def create_up_down_counter(
8791
def create_observable_counter(
8892
self, name, callback, unit=None, description=None
8993
) -> APIObservableCounter:
94+
super().create_observable_counter(
95+
name, callback, unit=unit, description=description
96+
)
9097

9198
instrument = ObservableCounter(
9299
name,
@@ -104,6 +111,7 @@ def create_observable_counter(
104111
def create_histogram(
105112
self, name, unit=None, description=None
106113
) -> APIHistogram:
114+
super().create_histogram(name, unit=unit, description=description)
107115
return Histogram(
108116
name,
109117
self._instrumentation_info,
@@ -115,6 +123,9 @@ def create_histogram(
115123
def create_observable_gauge(
116124
self, name, callback, unit=None, description=None
117125
) -> APIObservableGauge:
126+
super().create_observable_gauge(
127+
name, callback, unit=unit, description=description
128+
)
118129

119130
instrument = ObservableGauge(
120131
name,
@@ -132,6 +143,9 @@ def create_observable_gauge(
132143
def create_observable_up_down_counter(
133144
self, name, callback, unit=None, description=None
134145
) -> APIObservableUpDownCounter:
146+
super().create_observable_up_down_counter(
147+
name, callback, unit=unit, description=description
148+
)
135149

136150
instrument = ObservableUpDownCounter(
137151
name,

‎opentelemetry-sdk/tests/metrics/test_metrics.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,17 +217,17 @@ def test_register_asynchronous_instrument(
217217

218218
meter_provider._measurement_consumer.register_asynchronous_instrument.assert_called_with(
219219
meter_provider.get_meter("name").create_observable_counter(
220-
"name", Mock()
220+
"name0", Mock()
221221
)
222222
)
223223
meter_provider._measurement_consumer.register_asynchronous_instrument.assert_called_with(
224224
meter_provider.get_meter("name").create_observable_up_down_counter(
225-
"name", Mock()
225+
"name1", Mock()
226226
)
227227
)
228228
meter_provider._measurement_consumer.register_asynchronous_instrument.assert_called_with(
229229
meter_provider.get_meter("name").create_observable_gauge(
230-
"name", Mock()
230+
"name2", Mock()
231231
)
232232
)
233233

0 commit comments

Comments
 (0)