Use RetryingExporter in HTTP trace exporter

This unifies the implementation of the OTLP exporters and the HTTP
trace exporter.

Author: LarsMichelsen

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

@@ -18,12 +18,12 @@
 from io import BytesIO
 from os import environ
 from typing import Dict, Optional
-from time import sleep
 
 import requests
 
-from opentelemetry.exporter.otlp.proto.common._internal import (
-    _create_exp_backoff_generator,
+from opentelemetry.exporter.otlp.proto.common.exporter import (
+    RetryableExportError,
+    RetryingExporter,
 )
 from opentelemetry.exporter.otlp.proto.common.trace_encoder import (
     encode_spans,
@@ -121,6 +121,7 @@ def __init__(
                 {"Content-Encoding": self._compression.value}
             )
         self._shutdown = False
+        self._exporter = RetryingExporter(self._export, SpanExportResult)
 
     def _export(self, serialized_data: bytes):
         data = serialized_data
@@ -132,14 +133,31 @@ def _export(self, serialized_data: bytes):
         elif self._compression == Compression.Deflate:
             data = zlib.compress(serialized_data)
 
-        return self._session.post(
+        resp = self._session.post(
             url=self._endpoint,
             data=data,
             verify=self._certificate_file,
             timeout=self._timeout,
             cert=self._client_cert,
         )
 
+        if resp.ok:
+            return SpanExportResult.SUCCESS
+
+        if self._retryable(resp):
+            _logger.warning(
+                "Transient error %s encountered while exporting span batch",
+                resp.reason,
+            )
+            raise RetryableExportError(None)
+
+        _logger.error(
+            "Failed to export batch code: %s, reason: %s",
+            resp.status_code,
+            resp.text,
+        )
+        return SpanExportResult.FAILURE
+
     @staticmethod
     def _retryable(resp: requests.Response) -> bool:
         if resp.status_code == 408:
@@ -151,34 +169,6 @@ def _retryable(resp: requests.Response) -> bool:
     def _serialize_spans(self, spans):
         return encode_spans(spans).SerializePartialToString()
 
-    def _export_serialized_spans(self, serialized_data):
-        for delay in _create_exp_backoff_generator(
-            max_value=self._MAX_RETRY_TIMEOUT
-        ):
-            if delay == self._MAX_RETRY_TIMEOUT:
-                return SpanExportResult.FAILURE
-
-            resp = self._export(serialized_data)
-            # pylint: disable=no-else-return
-            if resp.ok:
-                return SpanExportResult.SUCCESS
-            elif self._retryable(resp):
-                _logger.warning(
-                    "Transient error %s encountered while exporting span batch, retrying in %ss.",
-                    resp.reason,
-                    delay,
-                )
-                sleep(delay)
-                continue
-            else:
-                _logger.error(
-                    "Failed to export batch code: %s, reason: %s",
-                    resp.status_code,
-                    resp.text,
-                )
-                return SpanExportResult.FAILURE
-        return SpanExportResult.FAILURE
-
     def export(self, spans) -> SpanExportResult:
         # After the call to Shutdown subsequent calls to Export are
         # not allowed and should return a Failure result.
@@ -187,8 +177,7 @@ def export(self, spans) -> SpanExportResult:
             return SpanExportResult.FAILURE
 
         serialized_data = self._serialize_spans(spans)
-
-        return self._export_serialized_spans(serialized_data)
+        return self._exporter.export_with_retry(serialized_data)
 
     def shutdown(self):
         if self._shutdown:

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_span_exporter.py

@@ -234,7 +234,7 @@ def test_headers_parse_from_env(self):
 
     # pylint: disable=no-self-use
     @responses.activate
-    @patch("opentelemetry.exporter.otlp.proto.http.trace_exporter.sleep")
+    @patch("opentelemetry.exporter.otlp.proto.common.exporter.sleep")
     def test_exponential_backoff(self, mock_sleep):
         # return a retryable error
         responses.add(
@@ -263,12 +263,14 @@ def test_exponential_backoff(self, mock_sleep):
             [call(1), call(2), call(4), call(8), call(16), call(32)]
         )
 
-    @patch.object(OTLPSpanExporter, "_export", return_value=Mock(ok=True))
-    def test_2xx_status_code(self, mock_otlp_metric_exporter):
+    def test_2xx_status_code(self):
         """
         Test that any HTTP 2XX code returns a successful result
         """
 
         self.assertEqual(
-            OTLPSpanExporter().export(MagicMock()), SpanExportResult.SUCCESS
+            OTLPSpanExporter(
+                session=Mock(**{"post.return_value": Mock(ok=True)})
+            ).export(MagicMock()),
+            SpanExportResult.SUCCESS,
         )