fix flaky test

Author: Arnatious

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/metric_exporter/__init__.py

@@ -152,18 +152,18 @@ def _translate_data(
 
     def export(
         self,
-        data: MetricsData,
+        metrics_data: MetricsData,
         timeout_millis: float = 10_000,
         **kwargs,
     ) -> MetricExportResult:
         if self._max_export_batch_size is None:
             return self._exporter.export_with_retry(
-                timeout_millis * 1e-3, data
+                timeout_millis * 1e-3, metrics_data
             )
 
         export_result = MetricExportResult.SUCCESS
         deadline_s = time() + timeout_millis * 1e-3
-        for split_metrics_data in self._split_metrics_data(data):
+        for split_metrics_data in self._split_metrics_data(metrics_data):
             time_remaining_s = deadline_s - time()
             split_export_result = self._exporter.export_with_retry(
                 time_remaining_s, split_metrics_data

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_metrics_exporter.py

@@ -20,7 +20,7 @@
 from os.path import dirname
 from typing import List
 from unittest import TestCase
-from unittest.mock import ANY, patch
+from unittest.mock import patch
 
 from google.protobuf.duration_pb2 import Duration
 from google.rpc.error_details_pb2 import RetryInfo
@@ -769,6 +769,7 @@ def test_split_metrics_timeout(self, mock_export):
                 metrics_data=metrics_data,
             )
         )
+        self.assertEqual(len(split_metrics_data), 2)
         exporter = OTLPMetricExporter(max_export_batch_size=2)
 
         timeout_s = 0.5
@@ -780,7 +781,11 @@ def test_split_metrics_timeout(self, mock_export):
                 exporter.export(metrics_data, timeout_s * 1e3),
                 MetricExportResult.FAILURE,
             )
-        mock_export.assert_called_once_with(ANY, split_metrics_data[0])
+        # There could be multiple calls to export because of the jitter in backoff
+        self.assertNotIn(
+            split_metrics_data[1],
+            [call_args[1] for call_args in mock_export.call_args_list],
+        )
         self.assertEqual(
             warning.records[-1].message,
             "Export deadline passed, ignoring data",