update to retry the post once

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

@@ -21,6 +21,7 @@
 from typing import Dict, Optional, Sequence
 
 import requests
+from requests.exceptions import ConnectionError
 
 from opentelemetry.exporter.otlp.proto.common._internal import (
     _create_exp_backoff_generator,
@@ -133,13 +134,27 @@ def _export(self, serialized_data: bytes):
         elif self._compression == Compression.Deflate:
             data = zlib.compress(serialized_data)
 
-        return self._session.post(
-            url=self._endpoint,
-            data=data,
-            verify=self._certificate_file,
-            timeout=self._timeout,
-            cert=self._client_cert,
-        )
+        # By default, keep-alive is enabled in Session's request
+        # headers. Backends may choose to close the connection
+        # while a post happens which causes an unhandled
+        # exception. This try/except will retry the post on such exceptions
+        try:
+            resp = self._session.post(
+                url=self._endpoint,
+                data=data,
+                verify=self._certificate_file,
+                timeout=self._timeout,
+                cert=self._client_cert,
+            )
+        except ConnectionError:
+            resp = self._session.post(
+                url=self._endpoint,
+                data=data,
+                verify=self._certificate_file,
+                timeout=self._timeout,
+                cert=self._client_cert,
+            )
+        return resp
 
     @staticmethod
     def _retryable(resp: requests.Response) -> bool:
@@ -165,8 +180,6 @@ 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:
                 return LogExportResult.SUCCESS

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

@@ -28,6 +28,7 @@
 )
 
 import requests
+from requests.exceptions import ConnectionError
 from deprecated import deprecated
 
 from opentelemetry.exporter.otlp.proto.common._internal import (
@@ -175,13 +176,27 @@ def _export(self, serialized_data: bytes):
         elif self._compression == Compression.Deflate:
             data = zlib.compress(serialized_data)
 
-        return self._session.post(
-            url=self._endpoint,
-            data=data,
-            verify=self._certificate_file,
-            timeout=self._timeout,
-            cert=self._client_cert,
-        )
+        try:
+            resp = self._session.post(
+                url=self._endpoint,
+                data=data,
+                verify=self._certificate_file,
+                timeout=self._timeout,
+                cert=self._client_cert,
+            )
+        except ConnectionError:
+            # By default, keep-alive is set in Session's request
+            # headers. Backends may choose to close the connection
+            # while a post happens which causes an unhandled
+            # exception. This try/except will retry the post on such exceptions
+            resp = self._session.post(
+                url=self._endpoint,
+                data=data,
+                verify=self._certificate_file,
+                timeout=self._timeout,
+                cert=self._client_cert,
+            )
+        return resp
 
     @staticmethod
     def _retryable(resp: requests.Response) -> bool:
@@ -205,8 +220,6 @@ 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:
                 return MetricExportResult.SUCCESS

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

@@ -21,6 +21,7 @@
 from typing import Dict, Optional
 
 import requests
+from requests.exceptions import ConnectionError
 
 from opentelemetry.exporter.otlp.proto.common._internal import (
     _create_exp_backoff_generator,
@@ -129,14 +130,28 @@ def _export(self, serialized_data: bytes):
             data = gzip_data.getvalue()
         elif self._compression == Compression.Deflate:
             data = zlib.compress(serialized_data)
-
-        return self._session.post(
-            url=self._endpoint,
-            data=data,
-            verify=self._certificate_file,
-            timeout=self._timeout,
-            cert=self._client_cert,
-        )
+        
+        # By default, keep-alive is enabled in Session's request
+        # headers. Backends may choose to close the connection
+        # while a post happens which causes an unhandled
+        # exception. This try/except will retry the post on such exceptions
+        try:
+            resp = self._session.post(
+                url=self._endpoint,
+                data=data,
+                verify=self._certificate_file,
+                timeout=self._timeout,
+                cert=self._client_cert,
+            )
+        except ConnectionError:
+            resp = self._session.post(
+                url=self._endpoint,
+                data=data,
+                verify=self._certificate_file,
+                timeout=self._timeout,
+                cert=self._client_cert,
+            )
+        return resp
 
     @staticmethod
     def _retryable(resp: requests.Response) -> bool:
@@ -157,8 +172,6 @@ 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:
                 return SpanExportResult.SUCCESS