refactor(http): introduce variables to unify logging

Author: pafi-code

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

@@ -192,15 +192,22 @@ def export(
                 resp = self._export(serialized_data, deadline_sec - time())
                 if resp.ok:
                     return LogExportResult.SUCCESS
-                if not _is_retryable(resp):
-                    _logger.error(
-                        "Failed to export logs batch code: %s, reason: %s",
-                        resp.status_code,
-                        resp.text,
-                    )
-                    return LogExportResult.FAILURE
             except requests.exceptions.RequestException as error:
-                _logger.error("Failed to export logs batch reason: %s", error)
+                reason = str(error)
+                retryable = True
+                status_code = None
+            else:
+                reason = resp.reason
+                retryable = _is_retryable(resp)
+                status_code = resp.status_code
+
+            if not retryable:
+                _logger.error(
+                    "Failed to export logs batch code: %s, reason: %s",
+                    status_code,
+                    reason,
+                )
+                return LogExportResult.FAILURE
 
             if (
                 retry_num + 1 == _MAX_RETRYS
@@ -213,7 +220,8 @@ def export(
                 )
                 return LogRecordExportResult.FAILURE
             _logger.warning(
-                "Transient error encountered while exporting logs batch, retrying in %.2fs.",
+                "Transient error %s encountered while exporting logs batch, retrying in %.2fs.",
+                reason,
                 backoff_seconds,
             )
             shutdown = self._shutdown_is_occuring.wait(backoff_seconds)

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

@@ -237,18 +237,22 @@ def export(
                 resp = self._export(serialized_data, deadline_sec - time())
                 if resp.ok:
                     return MetricExportResult.SUCCESS
-                if not _is_retryable(resp):
-                    _logger.error(
-                        "Failed to export metrics batch code: %s, reason: %s",
-                        resp.status_code,
-                        resp.text,
-                    )
-                    return MetricExportResult.FAILURE
             except requests.exceptions.RequestException as error:
+                reason = str(error)
+                retryable = True
+                status_code = None
+            else:
+                reason = resp.reason
+                retryable = _is_retryable(resp)
+                status_code = resp.status_code
+
+            if not retryable:
                 _logger.error(
-                    "Failed to export metrics batch reason: %s", error
+                    "Failed to export metrics batch code: %s, reason: %s",
+                    status_code,
+                    reason,
                 )
-
+                return MetricExportResult.FAILURE
             if (
                 retry_num + 1 == _MAX_RETRYS
                 or backoff_seconds > (deadline_sec - time())
@@ -260,7 +264,8 @@ def export(
                 )
                 return MetricExportResult.FAILURE
             _logger.warning(
-                "Transient error encountered while exporting metrics batch, retrying in %.2fs.",
+                "Transient error %s encountered while exporting metrics batch, retrying in %.2fs.",
+                reason,
                 backoff_seconds,
             )
             shutdown = self._shutdown_in_progress.wait(backoff_seconds)

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

@@ -185,15 +185,22 @@ def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
                 resp = self._export(serialized_data, deadline_sec - time())
                 if resp.ok:
                     return SpanExportResult.SUCCESS
-                if not _is_retryable(resp):
-                    _logger.error(
-                        "Failed to export span batch code: %s, reason: %s",
-                        resp.status_code,
-                        resp.text,
-                    )
-                    return SpanExportResult.FAILURE
             except requests.exceptions.RequestException as error:
-                _logger.error("Failed to export span batch reason: %s", error)
+                reason = str(error)
+                retryable = True
+                status_code = None
+            else:
+                reason = resp.reason
+                retryable = _is_retryable(resp)
+                status_code = resp.status_code
+
+            if not retryable:
+                _logger.error(
+                    "Failed to export span batch code: %s, reason: %s",
+                    status_code,
+                    reason,
+                )
+                return SpanExportResult.FAILURE
 
             if (
                 retry_num + 1 == _MAX_RETRYS
@@ -206,7 +213,8 @@ def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
                 )
                 return SpanExportResult.FAILURE
             _logger.warning(
-                "Transient error encountered while exporting span batch, retrying in %.2fs.",
+                "Transient error %s encountered while exporting span batch, retrying in %.2fs.",
+                reason,
                 backoff_seconds,
             )
             shutdown = self._shutdown_in_progress.wait(backoff_seconds)