Calculate backoff in 1 place instead of 2

Author: DylanRussell

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

@@ -296,8 +296,10 @@ def _export(
         retry_info = RetryInfo()
         with self._export_lock:
             deadline_sec = time() + self._timeout
-            backoff_seconds = 1 * random.uniform(0.8, 1.2)
             for retry_num in range(1, _MAX_RETRYS + 1):
+                backoff_seconds = 2 ** (retry_num - 1) * random.uniform(
+                    0.8, 1.2
+                )
                 try:
                     self._client.Export(
                         request=self._translate_data(data),
@@ -334,7 +336,6 @@ def _export(
                         backoff_seconds,
                     )
                     sleep(backoff_seconds)
-                    backoff_seconds = 2**retry_num * random.uniform(0.8, 1.2)
         # Not possible to reach here but the linter is complaining.
         return self._result.FAILURE
 

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

@@ -163,8 +163,8 @@ def export(self, batch: Sequence[LogData]) -> LogExportResult:
 
         serialized_data = encode_logs(batch).SerializeToString()
         deadline_sec = time() + self._timeout
-        backoff_seconds = 1 * random.uniform(0.8, 1.2)
         for retry_num in range(1, _MAX_RETRYS + 1):
+            backoff_seconds = 2 ** (retry_num - 1) * random.uniform(0.8, 1.2)
             resp = self._export(serialized_data, deadline_sec - time())
             if resp.ok:
                 return LogExportResult.SUCCESS
@@ -185,7 +185,6 @@ def export(self, batch: Sequence[LogData]) -> LogExportResult:
                 backoff_seconds,
             )
             sleep(backoff_seconds)
-            backoff_seconds = 2**retry_num * random.uniform(0.8, 1.2)
         # Not possible to reach here but the linter is complaining.
         return LogExportResult.FAILURE
 

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

@@ -213,8 +213,8 @@ def export(
         deadline_sec = time() + (
             timeout_millis / 1e3 if timeout_millis else self._timeout
         )
-        backoff_seconds = 1 * random.uniform(0.8, 1.2)
         for retry_num in range(1, _MAX_RETRYS + 1):
+            backoff_seconds = 2 ** (retry_num - 1) * random.uniform(0.8, 1.2)
             resp = self._export(serialized_data, deadline_sec - time())
             if resp.ok:
                 return MetricExportResult.SUCCESS
@@ -235,7 +235,6 @@ def export(
                 backoff_seconds,
             )
             sleep(backoff_seconds)
-            backoff_seconds = 2**retry_num * random.uniform(0.8, 1.2)
         # Not possible to reach here but the linter is complaining.
         return MetricExportResult.FAILURE
 

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

@@ -161,8 +161,8 @@ def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
 
         serialized_data = encode_spans(spans).SerializePartialToString()
         deadline_sec = time() + self._timeout
-        backoff_seconds = 1 * random.uniform(0.8, 1.2)
         for retry_num in range(1, _MAX_RETRYS + 1):
+            backoff_seconds = 2 ** (retry_num - 1) * random.uniform(0.8, 1.2)
             resp = self._export(serialized_data, deadline_sec - time())
             if resp.ok:
                 return SpanExportResult.SUCCESS
@@ -183,7 +183,6 @@ def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
                 backoff_seconds,
             )
             sleep(backoff_seconds)
-            backoff_seconds = 2**retry_num * random.uniform(0.8, 1.2)
         # Not possible to reach here but the linter is complaining.
         return SpanExportResult.FAILURE