Skip to content

Commit 8b74c76

Browse files
committed
Code cleanup, removed the InMemoryMetricExporter, updated tests
1 parent 2ecde0f commit 8b74c76

File tree

5 files changed

+6
-89
lines changed

5 files changed

+6
-89
lines changed

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/export/__init__.py

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from sys import stdout
2222
from threading import Event, Lock, RLock, Thread
2323
from time import time_ns
24-
from typing import IO, Callable, Dict, Iterable, Optional, Sequence
24+
from typing import IO, Callable, Dict, Iterable, Optional
2525

2626
from typing_extensions import final
2727

@@ -58,7 +58,7 @@
5858
_ObservableUpDownCounter,
5959
_UpDownCounter,
6060
)
61-
from opentelemetry.sdk.metrics._internal.point import MetricsData, Metric
61+
from opentelemetry.sdk.metrics._internal.point import MetricsData
6262
from opentelemetry.util._once import Once
6363

6464
_logger = getLogger(__name__)
@@ -173,29 +173,6 @@ def force_flush(self, timeout_millis: float = 10_000) -> bool:
173173
return True
174174

175175

176-
class InMemoryMetricExporter(MetricExporter):
177-
def __init__(self):
178-
super().__init__()
179-
self.metrics = {}
180-
self._counter = 0
181-
182-
def export(
183-
self,
184-
metrics: Sequence[Metric],
185-
timeout_millis: float = 10_000,
186-
**kwargs,
187-
) -> MetricExportResult:
188-
self.metrics[self._counter] = metrics
189-
self._counter += 1
190-
return MetricExportResult.SUCCESS
191-
192-
def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None:
193-
pass
194-
195-
def force_flush(self, timeout_millis: float = 10_000) -> bool:
196-
return True
197-
198-
199176
class MetricReader(ABC):
200177
# pylint: disable=too-many-branches,broad-exception-raised
201178
"""
@@ -588,3 +565,4 @@ def force_flush(self, timeout_millis: float = 10_000) -> bool:
588565
super().force_flush(timeout_millis=timeout_millis)
589566
self._exporter.force_flush(timeout_millis=timeout_millis)
590567
return True
568+

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
AggregationTemporality,
1818
ConsoleMetricExporter,
1919
InMemoryMetricReader,
20-
InMemoryMetricExporter,
2120
MetricExporter,
2221
MetricExportResult,
2322
MetricReader,
@@ -46,7 +45,6 @@
4645
"AggregationTemporality",
4746
"Buckets",
4847
"ConsoleMetricExporter",
49-
"InMemoryMetricExporter",
5048
"InMemoryMetricReader",
5149
"MetricExporter",
5250
"MetricExportResult",

opentelemetry-sdk/tests/metrics/test_in_memory_metric_exporter.py

Lines changed: 0 additions & 56 deletions
This file was deleted.

opentelemetry-sdk/tests/metrics/test_metric_cardinality_limit.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
from opentelemetry.sdk.metrics import MeterProvider
66

77
from opentelemetry.sdk.metrics.export import (
8-
InMemoryMetricExporter,
9-
PeriodicExportingMetricReader,
8+
InMemoryMetricReader,
109
)
1110

1211
class TestMetricCardinalityLimit(TestCase):
1312

1413
def setUp(self):
15-
self.exporter = InMemoryMetricExporter()
16-
self.reader = PeriodicExportingMetricReader(exporter=self.exporter, export_interval_millis=500)
14+
self.reader = InMemoryMetricReader()
1715
self.meter_provider = MeterProvider(metric_readers=[self.reader])
1816
self.meter = self.meter_provider.get_meter("test_meter")
1917

@@ -30,7 +28,7 @@ def test_metric_cardinality_limit(self):
3028
self.reader.force_flush()
3129

3230
# Retrieve the metrics from the in-memory exporter
33-
metric_data = self.exporter.metrics
31+
metric_data = self.reader.get_metrics_data()
3432

3533
# Check if the length of the metric data doesn't exceed 2000
3634
self.assertTrue(len(metric_data) <= 2000)

opentelemetry-sdk/tests/metrics/test_metrics.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
)
3737
from opentelemetry.sdk.metrics._internal import SynchronousMeasurementConsumer
3838
from opentelemetry.sdk.metrics.export import (
39-
InMemoryMetricExporter,
4039
Metric,
4140
MetricExportResult,
4241
MetricReader,

0 commit comments

Comments
 (0)