Make more changes

Author: DylanRussell

CHANGELOG.md

@@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4782](https://github.com/open-telemetry/opentelemetry-python/pull/4782))
 - semantic-conventions: Bump to 1.38.0
   ([#4791](https://github.com/open-telemetry/opentelemetry-python/pull/4791))
+- Prevent possible endless recursion from happening in `SimpleLogRecordProcessor.on_emit`,
+  ([#4799](https://github.com/open-telemetry/opentelemetry-python/pull/4799)).
 
 ## Version 1.38.0/0.59b0 (2025-10-16)
 

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py

@@ -17,7 +17,7 @@
 import enum
 import logging
 import sys
-from contextvars import ContextVar
+import traceback
 from os import environ, linesep
 from typing import IO, Callable, Optional, Sequence
 
@@ -119,18 +119,23 @@ class SimpleLogRecordProcessor(LogRecordProcessor):
     """
 
     def __init__(self, exporter: LogExporter):
-        self._emit_executing = ContextVar("var", default=False)
         self._exporter = exporter
         self._shutdown = False
 
     def on_emit(self, log_data: LogData):
         # Prevent entering a recursive loop.
-        if self._emit_executing.get():
+        if (
+            sum(
+                item.name == "on_emit"
+                and item.filename.endswith("export/__init__.py")
+                for item in traceback.extract_stack()
+            )
+            > 3
+        ):
             _propagate_false_logger.warning(
                 "SimpleLogRecordProcessor.on_emit has entered a recursive loop. Dropping log and exiting the loop."
             )
             return
-        emit_token = self._emit_executing.set(True)
         suppress_token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
         try:
             if self._shutdown:
@@ -142,7 +147,6 @@ def on_emit(self, log_data: LogData):
             except Exception:  # pylint: disable=broad-exception-caught
                 _logger.exception("Exception while exporting logs.")
         finally:
-            self._emit_executing.reset(emit_token)
             detach(suppress_token)
 
     def shutdown(self):

opentelemetry-sdk/src/opentelemetry/sdk/_shared_internal/__init__.py

@@ -201,16 +201,12 @@ def _export(self, batch_strategy: BatchExportStrategy) -> None:
 
     def emit(self, data: Telemetry) -> None:
         if self._shutdown:
-            _logger.info(
-                "Shutdown called, ignoring %s.", self._exporting
-            )
+            _logger.info("Shutdown called, ignoring %s.", self._exporting)
             return
         if self._pid != os.getpid():
             self._bsp_reset_once.do_once(self._at_fork_reinit)
         if len(self._queue) == self._max_queue_size:
-            _logger.warning(
-                "Queue full, dropping %s.", self._exporting
-            )
+            _logger.warning("Queue full, dropping %s.", self._exporting)
         # This will drop a log from the right side if the queue is at _max_queue_size.
         self._queue.appendleft(data)
         if len(self._queue) >= self._max_export_batch_size:

opentelemetry-sdk/tests/logs/test_export.py

@@ -15,7 +15,7 @@
 # pylint: disable=protected-access
 import logging
 import os
-import random
+import sys
 import time
 import unittest
 from concurrent.futures import ThreadPoolExecutor
@@ -64,7 +64,7 @@
 
 class TestSimpleLogRecordProcessor(unittest.TestCase):
     @mark.skipif(
-        version_info=(3, 13),
+        sys.version_info == (3, 13),
         reason="This will fail on 3.13 due to https://github.com/python/cpython/pull/131812 which prevents recursive log messages but was later rolled back.",
     )
     def test_simple_log_record_processor_doesnt_enter_recursive_loop(self):
@@ -73,9 +73,8 @@ def shutdown(self):
                 pass
 
             def export(self, batch: Sequence[LogData]):
-                raise ValueError(
-                    "Exception raised ! {}".format(random.randint(1, 10000))
-                )
+                logger = logging.getLogger("any logger..")
+                logger.warning("Something happened.")
 
         exporter = Exporter()
         logger_provider = LoggerProvider()
@@ -84,7 +83,8 @@ def export(self, batch: Sequence[LogData]):
         )
         root_logger = logging.getLogger()
         # Add the OTLP handler to the root logger like is done in auto instrumentation.
-        # This means logs generated from within SimpleLogRecordProcessor.on_emit are sent back to SimpleLogRecordProcessor.on_emit
+        # This causes logs generated from within SimpleLogRecordProcessor.on_emit (such as the above log in export)
+        # to be sent back to SimpleLogRecordProcessor.on_emit
         handler = LoggingHandler(
             level=logging.DEBUG, logger_provider=logger_provider
         )