Skip to content

Commit a659966

Browse files
author
Alex Boten
authored
fixing documentation and return value (#2399)
1 parent 1b7e161 commit a659966

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

docs/examples/metrics/example.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
OTLPMetricExporter,
44
)
55
from opentelemetry.sdk._metrics import MeterProvider
6+
from opentelemetry.sdk._metrics.export import PeriodicExportingMetricReader
67

7-
provider = MeterProvider()
88
exporter = OTLPMetricExporter(insecure=True)
9-
# TODO: fill in details for metric reader
9+
reader = PeriodicExportingMetricReader(exporter)
10+
provider = MeterProvider(metric_readers=[reader])
1011
set_meter_provider(provider)
1112

1213
meter = get_meter_provider().get_meter("getting-started")
1314
counter = meter.create_counter("first_counter")
15+
counter.add(1)
1416
# TODO: fill in details for additional metrics

docs/getting_started/metrics_example.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@
1717

1818
from opentelemetry._metrics import get_meter_provider, set_meter_provider
1919
from opentelemetry.sdk._metrics import MeterProvider
20-
from opentelemetry.sdk._metrics.export import ConsoleMetricExporter
20+
from opentelemetry.sdk._metrics.export import (
21+
ConsoleMetricExporter,
22+
PeriodicExportingMetricReader,
23+
)
2124

22-
provider = MeterProvider()
2325
exporter = ConsoleMetricExporter()
24-
# TODO: fill in details for metric reader
26+
reader = PeriodicExportingMetricReader(exporter)
27+
provider = MeterProvider(metric_readers=[reader])
2528
set_meter_provider(provider)
2629

2730
meter = get_meter_provider().get_meter("getting-started")
2831
counter = meter.create_counter("first_counter")
32+
counter.add(1)
2933
# TODO: fill in details for additional metrics

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ def _ticker(self) -> None:
154154
self.collect()
155155

156156
def _receive_metrics(self, metrics: Iterable[Metric]) -> None:
157+
if metrics is None:
158+
return
157159
token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
158160
try:
159161
self._exporter.export(metrics)
@@ -172,4 +174,5 @@ def _shutdown():
172174

173175
self._shutdown_event.set()
174176
self._daemon_thread.join()
175-
return self._exporter.shutdown()
177+
self._exporter.shutdown()
178+
return True

0 commit comments

Comments
 (0)