Skip to content

Commit e45c7c3

Browse files
committed
Add args again
This reverts commit 7eb6134.
1 parent 7eb6134 commit e45c7c3

File tree

3 files changed

+10
-12
lines changed
  • exporter
    • opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_metric_exporter
    • opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus
  • opentelemetry-sdk/src/opentelemetry/sdk/_metrics/_internal

3 files changed

+10
-12
lines changed

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_metric_exporter/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ def _translate_data(
169169
)
170170

171171
def export(
172-
self, metrics: Sequence[Metric], **kwargs
172+
self, metrics: Sequence[Metric], *args, **kwargs
173173
) -> MetricExportResult:
174174
return self._export(metrics)
175175

176-
def shutdown(self, **kwargs):
176+
def shutdown(self, *args, **kwargs):
177177
pass

exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,14 @@ def __init__(self, prefix: str = "") -> None:
110110
REGISTRY.register(self._collector)
111111
self._collector._callback = self.collect
112112

113-
def _receive_metrics(self, metrics: Iterable[Metric], **kwargs) -> None:
113+
def _receive_metrics(
114+
self, metrics: Iterable[Metric], *args, **kwargs
115+
) -> None:
114116
if metrics is None:
115117
return
116118
self._collector.add_metrics_data(metrics)
117119

118-
def shutdown(self, **kwargs) -> bool:
120+
def shutdown(self, *args, **kwargs) -> bool:
119121
REGISTRY.unregister(self._collector)
120122
return True
121123

opentelemetry-sdk/src/opentelemetry/sdk/_metrics/_internal/measurement_consumer.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,18 @@
3232

3333
class MeasurementConsumer(ABC):
3434
@abstractmethod
35-
def consume_measurement(self, measurement: Measurement, **kwargs) -> None:
35+
def consume_measurement(self, measurement: Measurement) -> None:
3636
pass
3737

3838
@abstractmethod
39-
def register_asynchronous_instrument(
40-
self, instrument: "_Asynchronous", **kwargs
41-
):
39+
def register_asynchronous_instrument(self, instrument: "_Asynchronous"):
4240
pass
4341

4442
@abstractmethod
4543
def collect(
4644
self,
4745
metric_reader: MetricReader,
4846
instrument_type_temporality: Dict[type, AggregationTemporality],
49-
**kwargs
5047
) -> Iterable[Metric]:
5148
pass
5249

@@ -64,12 +61,12 @@ def __init__(self, sdk_config: SdkConfiguration) -> None:
6461
}
6562
self._async_instruments: List["_Asynchronous"] = []
6663

67-
def consume_measurement(self, measurement: Measurement, **kwargs) -> None:
64+
def consume_measurement(self, measurement: Measurement) -> None:
6865
for reader_storage in self._reader_storages.values():
6966
reader_storage.consume_measurement(measurement)
7067

7168
def register_asynchronous_instrument(
72-
self, instrument: "_Asynchronous", **kwargs
69+
self, instrument: "_Asynchronous"
7370
) -> None:
7471
with self._lock:
7572
self._async_instruments.append(instrument)
@@ -78,7 +75,6 @@ def collect(
7875
self,
7976
metric_reader: MetricReader,
8077
instrument_type_temporality: Dict[type, AggregationTemporality],
81-
**kwargs
8278
) -> Iterable[Metric]:
8379
with self._lock:
8480
metric_reader_storage = self._reader_storages[metric_reader]

0 commit comments

Comments
 (0)