call close in one place

Signed-off-by: Alex Boten <[email protected]>

Author: codeboten

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

@@ -165,14 +165,12 @@ def export(self, batch: Sequence[LogData]) -> LogExportResult:
                 return LogExportResult.FAILURE
 
             resp = self._export(serialized_data)
+            if resp.raw is not None:
+                resp.close()
             # pylint: disable=no-else-return
             if resp.ok:
-                if resp.raw is not None:
-                    resp.close()
                 return LogExportResult.SUCCESS
             elif self._retryable(resp):
-                if resp.raw is not None:
-                    resp.close()
                 _logger.warning(
                     "Transient error %s encountered while exporting logs batch, retrying in %ss.",
                     resp.reason,
@@ -181,8 +179,6 @@ def export(self, batch: Sequence[LogData]) -> LogExportResult:
                 sleep(delay)
                 continue
             else:
-                if resp.raw is not None:
-                    resp.close()
                 _logger.error(
                     "Failed to export logs batch code: %s, reason: %s",
                     resp.status_code,

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

@@ -205,14 +205,12 @@ def export(
                 return MetricExportResult.FAILURE
 
             resp = self._export(serialized_data.SerializeToString())
+            if resp.raw is not None:
+                resp.close()
             # pylint: disable=no-else-return
             if resp.ok:
-                if resp.raw is not None:
-                    resp.close()
                 return MetricExportResult.SUCCESS
             elif self._retryable(resp):
-                if resp.raw is not None:
-                    resp.close()
                 _logger.warning(
                     "Transient error %s encountered while exporting metric batch, retrying in %ss.",
                     resp.reason,
@@ -221,8 +219,6 @@ def export(
                 sleep(delay)
                 continue
             else:
-                if resp.raw is not None:
-                    resp.close()
                 _logger.error(
                     "Failed to export batch code: %s, reason: %s",
                     resp.status_code,

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

@@ -157,14 +157,12 @@ def _export_serialized_spans(self, serialized_data):
                 return SpanExportResult.FAILURE
 
             resp = self._export(serialized_data)
+            if resp.raw is not None:
+                resp.close()
             # pylint: disable=no-else-return
             if resp.ok:
-                if resp.raw is not None:
-                    resp.close()
                 return SpanExportResult.SUCCESS
             elif self._retryable(resp):
-                if resp.raw is not None:
-                    resp.close()
                 _logger.warning(
                     "Transient error %s encountered while exporting span batch, retrying in %ss.",
                     resp.reason,
@@ -173,8 +171,6 @@ def _export_serialized_spans(self, serialized_data):
                 sleep(delay)
                 continue
             else:
-                if resp.raw is not None:
-                    resp.close()
                 _logger.error(
                     "Failed to export batch code: %s, reason: %s",
                     resp.status_code,