Skip to content

Commit

Permalink
renaming meter to accumulator in metrics sdk context and fixing usages
Browse files Browse the repository at this point in the history
in tests
  • Loading branch information
Azfaar Qureshi committed Nov 13, 2020
1 parent 4686bef commit 98710f9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion opentelemetry-instrumentation/tests/test_metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def test_init(self):
mixin = MetricMixin()
mixin.init_metrics("test", 1.0)
meter = mixin.meter
self.assertTrue(isinstance(meter, metrics.Meter))
self.assertTrue(isinstance(meter, metrics.Accumulator))
self.assertEqual(meter.instrumentation_info.name, "test")
self.assertEqual(meter.instrumentation_info.version, 1.0)

Expand Down
6 changes: 3 additions & 3 deletions opentelemetry-sdk/src/opentelemetry/sdk/metrics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def __init__(
description: str,
unit: str,
value_type: Type[metrics_api.ValueT],
meter: "Meter",
meter: "Accumulator",
enabled: bool = True,
):
self.name = name
Expand Down Expand Up @@ -339,7 +339,7 @@ def __init__(
self.aggregator = aggregator


class Meter(metrics_api.Meter):
class Accumulator(metrics_api.Meter):
"""See `opentelemetry.metrics.Meter`.
Args:
Expand Down Expand Up @@ -561,7 +561,7 @@ def get_meter(
if not instrumenting_module_name: # Reject empty strings too.
instrumenting_module_name = "ERROR:MISSING MODULE NAME"
logger.error("get_meter called with missing module name.")
return Meter(
return Accumulator(
self,
InstrumentationInfo(
instrumenting_module_name, instrumenting_library_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ class PushController(threading.Thread):
exports them and performs some post-processing.
Args:
meter: The meter used to collect metrics.
accumulator: The meter used to collect metrics.
exporter: The exporter used to export metrics.
interval: The collect/export interval in seconds.
"""

daemon = True

def __init__(
self, meter: Meter, exporter: MetricsExporter, interval: float
self, accumulator: Meter, exporter: MetricsExporter, interval: float
):
super().__init__()
self.meter = meter
self.accumulator = accumulator
self.exporter = exporter
self.interval = interval
self.finished = threading.Event()
Expand All @@ -54,10 +54,10 @@ def shutdown(self):

def tick(self):
# Collect all of the meter's metrics to be exported
self.meter.collect()
self.accumulator.collect()
# Export the collected metrics
token = attach(set_value("suppress_instrumentation", True))
self.exporter.export(self.meter.processor.checkpoint_set())
self.exporter.export(self.accumulator.processor.checkpoint_set())
detach(token)
# Perform post-exporting logic
self.meter.processor.finished_collection()
self.accumulator.processor.finished_collection()
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Processor:
"""Base class for all processor types.
The processor is responsible for storing the aggregators and aggregated
values received from updates from metrics in the meter. The stored values
values received from updates from metrics in the accumulator. The stored values
will be sent to an exporter for exporting.
"""

Expand Down

0 comments on commit 98710f9

Please sign in to comment.