fix tests

Alex Boten · Alex Boten · commit e695b0ef587f · 2022-03-03T13:30:31.000-08:00
diff --git a/exporter/opentelemetry-exporter-prometheus/setup.cfg b/exporter/opentelemetry-exporter-prometheus/setup.cfg
@@ -51,5 +51,5 @@ where = src
 test =
 
 [options.entry_points]
-opentelemetry_exporter =
-    prometheus = opentelemetry.exporter.prometheus:PrometheusMetricExporter
+opentelemetry_metric_reader =
+    prometheus = opentelemetry.exporter.prometheus:PrometheusMetricReader
diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py
@@ -30,9 +30,8 @@
     from prometheus_client import start_http_server
 
     from opentelemetry._metrics import get_meter_provider, set_meter_provider
-    from opentelemetry.exporter.prometheus import PrometheusMetricExporter
+    from opentelemetry.exporter.prometheus import PrometheusMetricReader
     from opentelemetry.sdk._metrics import MeterProvider
-    from opentelemetry.sdk._metrics.export import PullingMetricReader
 
     # Start Prometheus client
     start_http_server(port=8000, addr="localhost")
diff --git a/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py b/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py
@@ -19,7 +19,7 @@
 from prometheus_client.core import CounterMetricFamily, GaugeMetricFamily
 
 from opentelemetry.exporter.prometheus import (
-    PrometheusMetricExporter,
+    PrometheusMetricReader,
     _CustomCollector,
 )
 from opentelemetry.sdk._metrics.export import MetricExportResult
@@ -32,7 +32,7 @@
 )
 
 
-class TestPrometheusMetricExporter(unittest.TestCase):
+class TestPrometheusMetricReader(unittest.TestCase):
     def setUp(self):
         self._mock_registry_register = mock.Mock()
         self._registry_register_patch = mock.patch(
@@ -44,27 +44,18 @@ def setUp(self):
     def test_constructor(self):
         """Test the constructor."""
         with self._registry_register_patch:
-            exporter = PrometheusMetricExporter("testprefix")
+            exporter = PrometheusMetricReader("testprefix")
             self.assertEqual(exporter._collector._prefix, "testprefix")
             self.assertTrue(self._mock_registry_register.called)
 
     def test_shutdown(self):
         with mock.patch(
             "prometheus_client.core.REGISTRY.unregister"
         ) as registry_unregister_patch:
-            exporter = PrometheusMetricExporter()
+            exporter = PrometheusMetricReader()
             exporter.shutdown()
             self.assertTrue(registry_unregister_patch.called)
 
-    def test_export(self):
-        with self._registry_register_patch:
-            record = _generate_sum("sum_int", 33)
-            exporter = PrometheusMetricExporter()
-            result = exporter.export([record])
-            # pylint: disable=protected-access
-            self.assertEqual(len(exporter._collector._metrics_to_export), 1)
-            self.assertIs(result, MetricExportResult.SUCCESS)
-
     def test_histogram_to_prometheus(self):
         record = _generate_metric(
             "test@name",
