Skip to content

Commit 0b5d735

Browse files
committed
Remove args
1 parent ca8e396 commit 0b5d735

File tree

5 files changed

+18
-28
lines changed

5 files changed

+18
-28
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], *args, **kwargs
172+
self, metrics: Sequence[Metric], **kwargs
173173
) -> MetricExportResult:
174174
return self._export(metrics)
175175

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

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

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

113-
def _receive_metrics(
114-
self, metrics: Iterable[Metric], *args, **kwargs
115-
) -> None:
113+
def _receive_metrics(self, metrics: Iterable[Metric], **kwargs) -> None:
116114
if metrics is None:
117115
return
118116
self._collector.add_metrics_data(metrics)
119117

120-
def shutdown(self, *args, **kwargs) -> bool:
118+
def shutdown(self, **kwargs) -> bool:
121119
REGISTRY.unregister(self._collector)
122120
return True
123121

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

+8-10
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class MetricExporter(ABC):
5353

5454
@abstractmethod
5555
def export(
56-
self, metrics: Sequence[Metric], *args, **kwargs
56+
self, metrics: Sequence[Metric], **kwargs
5757
) -> "MetricExportResult":
5858
"""Exports a batch of telemetry data.
5959
@@ -65,7 +65,7 @@ def export(
6565
"""
6666

6767
@abstractmethod
68-
def shutdown(self, *args, **kwargs) -> None:
68+
def shutdown(self, **kwargs) -> None:
6969
"""Shuts down the exporter.
7070
7171
Called when the SDK is shut down.
@@ -90,14 +90,14 @@ def __init__(
9090
self.formatter = formatter
9191

9292
def export(
93-
self, metrics: Sequence[Metric], *args, **kwargs
93+
self, metrics: Sequence[Metric], **kwargs
9494
) -> MetricExportResult:
9595
for metric in metrics:
9696
self.out.write(self.formatter(metric))
9797
self.out.flush()
9898
return MetricExportResult.SUCCESS
9999

100-
def shutdown(self, *args, **kwargs) -> None:
100+
def shutdown(self, **kwargs) -> None:
101101
pass
102102

103103

@@ -127,11 +127,11 @@ def get_metrics(self) -> List[Metric]:
127127
self._metrics = []
128128
return metrics
129129

130-
def _receive_metrics(self, metrics: Iterable[Metric], *args, **kwargs):
130+
def _receive_metrics(self, metrics: Iterable[Metric], **kwargs):
131131
with self._lock:
132132
self._metrics = list(metrics)
133133

134-
def shutdown(self, *args, **kwargs):
134+
def shutdown(self, **kwargs):
135135
pass
136136

137137

@@ -197,9 +197,7 @@ def _ticker(self) -> None:
197197
# one last collection below before shutting down completely
198198
self.collect()
199199

200-
def _receive_metrics(
201-
self, metrics: Iterable[Metric], *args, **kwargs
202-
) -> None:
200+
def _receive_metrics(self, metrics: Iterable[Metric], **kwargs) -> None:
203201
if metrics is None:
204202
return
205203
token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
@@ -209,7 +207,7 @@ def _receive_metrics(
209207
_logger.exception("Exception while exporting metrics %s", str(e))
210208
detach(token)
211209

212-
def shutdown(self, *args, **kwargs):
210+
def shutdown(self, **kwargs):
213211
def _shutdown():
214212
self._shutdown = True
215213

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

+4-10
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@
3131

3232
class MeasurementConsumer(ABC):
3333
@abstractmethod
34-
def consume_measurement(
35-
self, measurement: Measurement, *args, **kwargs
36-
) -> None:
34+
def consume_measurement(self, measurement: Measurement, **kwargs) -> None:
3735
pass
3836

3937
@abstractmethod
4038
def register_asynchronous_instrument(
41-
self, instrument: "_Asynchronous", *args, **kwargs
39+
self, instrument: "_Asynchronous", **kwargs
4240
):
4341
pass
4442

@@ -47,7 +45,6 @@ def collect(
4745
self,
4846
metric_reader: MetricReader,
4947
instrument_type_temporality: Dict[type, AggregationTemporality],
50-
*args,
5148
**kwargs
5249
) -> Iterable[Metric]:
5350
pass
@@ -66,14 +63,12 @@ def __init__(self, sdk_config: SdkConfiguration) -> None:
6663
}
6764
self._async_instruments: List["_Asynchronous"] = []
6865

69-
def consume_measurement(
70-
self, measurement: Measurement, *args, **kwargs
71-
) -> None:
66+
def consume_measurement(self, measurement: Measurement, **kwargs) -> None:
7267
for reader_storage in self._reader_storages.values():
7368
reader_storage.consume_measurement(measurement)
7469

7570
def register_asynchronous_instrument(
76-
self, instrument: "_Asynchronous", *args, **kwargs
71+
self, instrument: "_Asynchronous", **kwargs
7772
) -> None:
7873
with self._lock:
7974
self._async_instruments.append(instrument)
@@ -82,7 +77,6 @@ def collect(
8277
self,
8378
metric_reader: MetricReader,
8479
instrument_type_temporality: Dict[type, AggregationTemporality],
85-
*args,
8680
**kwargs
8781
) -> Iterable[Metric]:
8882
with self._lock:

opentelemetry-sdk/src/opentelemetry/sdk/_metrics/metric_reader.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ def _set_collect_callback(
162162
self._collect = func
163163

164164
@abstractmethod
165-
def _receive_metrics(self, metrics: Iterable[Metric], *args, **kwargs):
165+
def _receive_metrics(self, metrics: Iterable[Metric], **kwargs):
166166
"""Called by `MetricReader.collect` when it receives a batch of metrics"""
167167

168168
@abstractmethod
169-
def shutdown(self, *args, **kwargs):
169+
def shutdown(self, **kwargs):
170170
"""Shuts down the MetricReader. This method provides a way
171171
for the MetricReader to do any cleanup required. A metric reader can
172172
only be shutdown once, any subsequent calls are ignored and return

0 commit comments

Comments
 (0)