Address review: bind retry_on_413 env var to instance variable, remove redundant deadline check

- Cache _OTEL_PYTHON_EXPERIMENTAL_OTLP_RETRY_ON_413 as self._retry_entity_too_large
  in constructor instead of reading environ on every retry iteration
- Remove redundant deadline/shutdown guard inside bisectable block; the
  retry-exit check (backoff > remaining time) already covers this case
- Update deadline-expired tests to match new control flow

Author: Krishnachaitanyakc

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

@@ -141,6 +141,12 @@ def __init__(
                 {"Content-Encoding": self._compression.value}
             )
         self._shutdown = False
+        self._retry_entity_too_large = (
+            environ.get(_OTEL_PYTHON_EXPERIMENTAL_OTLP_RETRY_ON_413, "")
+            .strip()
+            .lower()
+            == "true"
+        )
 
     def _export(
         self, serialized_data: bytes, timeout_sec: Optional[float] = None
@@ -217,12 +223,7 @@ def _export_batch(
                     _is_payload_too_large(resp)
                     and len(batch) > 1
                     and remaining_bisects > 0
-                    and environ.get(
-                        _OTEL_PYTHON_EXPERIMENTAL_OTLP_RETRY_ON_413, ""
-                    )
-                    .strip()
-                    .lower()
-                    == "true"
+                    and self._retry_entity_too_large
                 )
 
             if not retryable and not bisectable:
@@ -245,15 +246,6 @@ def _export_batch(
                 return LogRecordExportResult.FAILURE
 
             if bisectable:
-                if time() >= deadline_sec or self._shutdown:
-                    _logger.error(
-                        "Payload too large but %s, dropping %d log records",
-                        "shutdown in progress"
-                        if self._shutdown
-                        else "deadline expired",
-                        len(batch),
-                    )
-                    return LogRecordExportResult.FAILURE
                 mid = len(batch) // 2
                 _logger.warning(
                     "Payload too large (%d log records), splitting into two batches",

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

@@ -136,6 +136,12 @@ def __init__(
                 {"Content-Encoding": self._compression.value}
             )
         self._shutdown = False
+        self._retry_entity_too_large = (
+            environ.get(_OTEL_PYTHON_EXPERIMENTAL_OTLP_RETRY_ON_413, "")
+            .strip()
+            .lower()
+            == "true"
+        )
 
     def _export(
         self, serialized_data: bytes, timeout_sec: Optional[float] = None
@@ -210,12 +216,7 @@ def _export_batch(
                     _is_payload_too_large(resp)
                     and len(spans) > 1
                     and remaining_bisects > 0
-                    and environ.get(
-                        _OTEL_PYTHON_EXPERIMENTAL_OTLP_RETRY_ON_413, ""
-                    )
-                    .strip()
-                    .lower()
-                    == "true"
+                    and self._retry_entity_too_large
                 )
 
             if not retryable and not bisectable:
@@ -238,15 +239,6 @@ def _export_batch(
                 return SpanExportResult.FAILURE
 
             if bisectable:
-                if time() >= deadline_sec or self._shutdown:
-                    _logger.error(
-                        "Payload too large but %s, dropping %d spans",
-                        "shutdown in progress"
-                        if self._shutdown
-                        else "deadline expired",
-                        len(spans),
-                    )
-                    return SpanExportResult.FAILURE
                 mid = len(spans) // 2
                 _logger.warning(
                     "Payload too large (%d spans), splitting into two batches",

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

@@ -702,8 +702,8 @@ def test_413_partial_failure(self, mock_post):
     def test_413_deadline_expired_returns_failure(self, mock_post, mock_time):
         """When a 413 is received but the deadline has expired, return FAILURE without splitting."""
         # time() calls: export() deadline_sec setup, _export timeout calc,
-        # retry-exit check (deadline_sec - time()), bisect deadline check
-        mock_time.side_effect = [100.0, 100.0, 100.0, 110.1]
+        # retry-exit check (deadline_sec - time())
+        mock_time.side_effect = [100.0, 100.0, 110.1]
         exporter = OTLPLogExporter(timeout=10)
 
         resp_413 = Response()
@@ -720,10 +720,7 @@ def test_413_deadline_expired_returns_failure(self, mock_post, mock_time):
         self.assertEqual(result, LogRecordExportResult.FAILURE)
         self.assertEqual(mock_post.call_count, 1)
         self.assertTrue(
-            any(
-                "deadline expired" in record.message
-                for record in warning.records
-            )
+            any("timeout" in record.message for record in warning.records)
         )
 
     @patch.dict(

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

@@ -561,8 +561,8 @@ def test_413_partial_failure(self, mock_post):
     def test_413_deadline_expired_returns_failure(self, mock_post, mock_time):
         """When a 413 is received but the deadline has expired, return FAILURE without splitting."""
         # time() calls: export() deadline_sec setup, _export timeout calc,
-        # retry-exit check (deadline_sec - time()), bisect deadline check
-        mock_time.side_effect = [100.0, 100.0, 100.0, 110.1]
+        # retry-exit check (deadline_sec - time())
+        mock_time.side_effect = [100.0, 100.0, 110.1]
         exporter = OTLPSpanExporter(timeout=10)
 
         resp_413 = Response()
@@ -598,10 +598,7 @@ def test_413_deadline_expired_returns_failure(self, mock_post, mock_time):
         self.assertEqual(result, SpanExportResult.FAILURE)
         self.assertEqual(mock_post.call_count, 1)
         self.assertTrue(
-            any(
-                "deadline expired" in record.message
-                for record in warning.records
-            )
+            any("timeout" in record.message for record in warning.records)
         )
 
     @patch.dict(