Skip to content

Commit 9b904ac

Browse files
committed
Make changes
1 parent 2ef08f8 commit 9b904ac

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@ def __init__(self, exporter: LogExporter):
120120

121121
def on_emit(self, log_data: LogData):
122122
# Prevent entering recursive loop.
123-
if any(item[2] == "on_emit" for item in traceback.extract_stack()):
123+
if sum(
124+
item.name == "on_emit"
125+
and item.filename.endswith("export/__init__.py")
126+
for item in traceback.extract_stack()
127+
) > 1:
124128
return
125129
if self._shutdown:
126130
_logger.warning("Processor is already shutdown, ignoring call")

opentelemetry-sdk/tests/logs/test_export.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ def export(self, batch: Sequence[LogData]):
7676
logger_provider.add_log_record_processor(
7777
SimpleLogRecordProcessor(exporter)
7878
)
79-
logger = logging.getLogger("default_level")
80-
logger.addHandler(LoggingHandler(logger_provider=logger_provider))
79+
root_logger = logging.getLogger()
80+
root_logger.addHandler(LoggingHandler(level=logging.NOTSET,logger_provider=logger_provider))
8181
# This would cause a max recursion depth exceeded error..
82-
logger.warning("Something is wrong")
82+
root_logger.warning("Something is wrong")
8383

8484
def test_simple_log_record_processor_default_level(self):
8585
exporter = InMemoryLogExporter()

0 commit comments

Comments
 (0)