Skip to content

Commit 33bb404

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

File tree

3 files changed

+16
-8
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

+16
-8
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

+10-4
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@
3232

3333
class MeasurementConsumer(ABC):
3434
@abstractmethod
35-
def consume_measurement(self, measurement: Measurement, **kwargs) -> None:
35+
def consume_measurement(
36+
self, measurement: Measurement, *args, **kwargs
37+
) -> None:
3638
pass
3739

3840
@abstractmethod
3941
def register_asynchronous_instrument(
40-
self, instrument: "_Asynchronous", **kwargs
42+
self, instrument: "_Asynchronous", *args, **kwargs
4143
):
4244
pass
4345

@@ -46,6 +48,7 @@ def collect(
4648
self,
4749
metric_reader: MetricReader,
4850
instrument_type_temporality: Dict[type, AggregationTemporality],
51+
*args,
4952
**kwargs
5053
) -> Iterable[Metric]:
5154
pass
@@ -64,12 +67,14 @@ def __init__(self, sdk_config: SdkConfiguration) -> None:
6467
}
6568
self._async_instruments: List["_Asynchronous"] = []
6669

67-
def consume_measurement(self, measurement: Measurement, **kwargs) -> None:
70+
def consume_measurement(
71+
self, measurement: Measurement, *args, **kwargs
72+
) -> None:
6873
for reader_storage in self._reader_storages.values():
6974
reader_storage.consume_measurement(measurement)
7075

7176
def register_asynchronous_instrument(
72-
self, instrument: "_Asynchronous", **kwargs
77+
self, instrument: "_Asynchronous", *args, **kwargs
7378
) -> None:
7479
with self._lock:
7580
self._async_instruments.append(instrument)
@@ -78,6 +83,7 @@ def collect(
7883
self,
7984
metric_reader: MetricReader,
8085
instrument_type_temporality: Dict[type, AggregationTemporality],
86+
*args,
8187
**kwargs
8288
) -> Iterable[Metric]:
8389
with self._lock:

0 commit comments

Comments
 (0)