Revert change to start respecting timeout passed into metric exporter

Author: DylanRussell

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

@@ -205,16 +205,14 @@ def _export(self, serialized_data: bytes, timeout_sec: float):
     def export(
         self,
         metrics_data: MetricsData,
-        timeout_millis: Optional[float] = None,
+        timeout_millis: Optional[float] = 10000,
         **kwargs,
     ) -> MetricExportResult:
         if self._shutdown:
             _logger.warning("Exporter already shutdown, ignoring batch")
             return MetricExportResult.FAILURE
         serialized_data = encode_metrics(metrics_data).SerializeToString()
-        deadline_sec = time() + (
-            timeout_millis / 1e3 if timeout_millis else self._timeout
-        )
+        deadline_sec = time() + self._timeout
         for retry_num in range(_MAX_RETRYS):
             resp = self._export(serialized_data, deadline_sec - time())
             if resp.ok:

exporter/opentelemetry-exporter-otlp-proto-http/tests/metrics/test_otlp_metrics_exporter.py

@@ -505,17 +505,16 @@ def test_preferred_aggregation_override(self):
 
     @patch.object(Session, "post")
     def test_retry_timeout(self, mock_post):
-        exporter = OTLPMetricExporter(timeout=3.5)
+        exporter = OTLPMetricExporter(timeout=1.5)
 
         resp = Response()
         resp.status_code = 503
         resp.reason = "UNAVAILABLE"
         mock_post.return_value = resp
         with self.assertLogs(level=WARNING) as warning:
             before = time.time()
-            # Set timeout to 1.5 seconds, takes precedence over the 3.5 second class timeout.
             self.assertEqual(
-                exporter.export(self.metrics["sum_int"], 1500),
+                exporter.export(self.metrics["sum_int"]),
                 MetricExportResult.FAILURE,
             )
             after = time.time()
@@ -528,23 +527,6 @@ def test_retry_timeout(self, mock_post):
                 "Transient error UNAVAILABLE encountered while exporting metrics batch, retrying in",
                 warning.records[0].message,
             )
-        mock_post.reset_mock()
-        before = time.time()
-        # This time the class level 3.5s timeout should be used.
-        self.assertEqual(
-            exporter.export(self.metrics["sum_int"]),
-            MetricExportResult.FAILURE,
-        )
-        after = time.time()
-
-        # First call at time 0, second at time 1, third at time 3.
-        self.assertEqual(mock_post.call_count, 3)
-        # There's a +/-20% jitter on each backoff.
-        self.assertTrue(2.35 < after - before < 3.65)
-        self.assertIn(
-            "Transient error UNAVAILABLE encountered while exporting metrics batch, retrying in",
-            warning.records[0].message,
-        )
 
     @patch.object(Session, "post")
     def test_timeout_set_correctly(self, mock_post):
@@ -557,5 +539,5 @@ def export_side_effect(*args, **kwargs):
             return resp
 
         mock_post.side_effect = export_side_effect
-        exporter = OTLPMetricExporter()
-        exporter.export(self.metrics["sum_int"], 400)
+        exporter = OTLPMetricExporter(timeout=0.4)
+        exporter.export(self.metrics["sum_int"])