Merge pull request #297 from solarwinds/NH-70998-interval-millis

NH-70998 PeriodicExportingMetricReader with export_interval infinity

solarwinds_apm/configurator.py

@@ -8,6 +8,7 @@
 
 import importlib
 import logging
+import math
 import os
 import sys
 import time
@@ -386,7 +387,11 @@ def _configure_metrics_exporter(
                 "Creating PeriodicExportingMetricReader using %s",
                 exporter_name,
             )
-            reader = PeriodicExportingMetricReader(exporter)
+            # Inf interval to not invoke periodic collection
+            reader = PeriodicExportingMetricReader(
+                exporter,
+                export_interval_millis=math.inf,
+            )
             metric_readers.append(reader)
 
         # Use configured Resource attributes then merge with

tests/unit/test_configurator/test_configurator_metrics_exporter.py

@@ -4,6 +4,7 @@
 #
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
+import math
 import os
 import pytest
 
@@ -144,11 +145,15 @@ def test_configure_metrics_exporter_valid(
             del os.environ["OTEL_METRICS_EXPORTER"]
 
         # Mock entry points
-        mock_exporter_class = mocker.MagicMock()
+        mock_exporter = mocker.Mock()
+        mock_exporter_class = mocker.Mock()
+        mock_exporter_class.configure_mock(return_value=mock_exporter)
+        mock_load = mocker.Mock()
+        mock_load.configure_mock(return_value=mock_exporter_class)
         mock_exporter_entry_point = mocker.Mock()
         mock_exporter_entry_point.configure_mock(
             **{
-                "load": mock_exporter_class
+                "load": mock_load,
             }
         )
         mock_points = iter([mock_exporter_entry_point])
@@ -193,6 +198,14 @@ def test_configure_metrics_exporter_valid(
             ]
         )
         mock_pemreader.assert_called_once()
+        mock_pemreader.assert_has_calls(
+            [
+                mocker.call(
+                    mock_exporter,
+                    export_interval_millis=math.inf,
+                )
+            ]
+        )
         trace_mocks.get_tracer_provider.assert_called_once()
         trace_mocks.get_tracer_provider().get_tracer.assert_called_once()
         mock_meterprovider.assert_called_once()
@@ -296,11 +309,15 @@ def test_configure_metrics_exporter_valid_invalid_mixed(
             del os.environ["OTEL_METRICS_EXPORTER"]
 
         # Mock entry points
-        mock_exporter_class = mocker.MagicMock()
+        mock_exporter = mocker.Mock()
+        mock_exporter_class = mocker.Mock()
+        mock_exporter_class.configure_mock(return_value=mock_exporter)
+        mock_load = mocker.Mock()
+        mock_load.configure_mock(return_value=mock_exporter_class)
         mock_exporter_entry_point = mocker.Mock()
         mock_exporter_entry_point.configure_mock(
             **{
-                "load": mock_exporter_class
+                "load": mock_load,
             }
         )
         mock_exporter_class_invalid = mocker.Mock()
@@ -375,6 +392,14 @@ def test_configure_metrics_exporter_valid_invalid_mixed(
         )
         # Called for the valid one
         mock_pemreader.assert_called_once()
+        mock_pemreader.assert_has_calls(
+            [
+                mocker.call(
+                    mock_exporter,
+                    export_interval_millis=math.inf,
+                )
+            ]
+        )
         # Rest not called at all
         trace_mocks.get_tracer_provider.assert_not_called()
         trace_mocks.get_tracer_provider().get_tracer.assert_not_called()