Skip to content

Commit 07700dd

Browse files
authored
[logs] Rename LogRecordProcessor.emit to on_emit (#4648)
1 parent 2a0282c commit 07700dd

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
([#4637](https://github.com/open-telemetry/opentelemetry-python/pull/4637))
2727
- Logging API accepts optional `context`; deprecates `trace_id`, `span_id`, `trace_flags`.
2828
([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597))
29+
- Rename LogRecordProcessor.emit to on_emit
30+
([#4648](https://github.com/open-telemetry/opentelemetry-python/pull/4648))
2931
- Logging API hide std_to_otel function to convert python logging severity to otel severity
3032
([#4649](https://github.com/open-telemetry/opentelemetry-python/pull/4649))
3133

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ class LogRecordProcessor(abc.ABC):
357357
"""
358358

359359
@abc.abstractmethod
360-
def emit(self, log_data: LogData):
360+
def on_emit(self, log_data: LogData):
361361
"""Emits the `LogData`"""
362362

363363
@abc.abstractmethod
@@ -401,9 +401,9 @@ def add_log_record_processor(
401401
with self._lock:
402402
self._log_record_processors += (log_record_processor,)
403403

404-
def emit(self, log_data: LogData) -> None:
404+
def on_emit(self, log_data: LogData) -> None:
405405
for lp in self._log_record_processors:
406-
lp.emit(log_data)
406+
lp.on_emit(log_data)
407407

408408
def shutdown(self) -> None:
409409
"""Shutdown the log processors one by one"""
@@ -475,8 +475,8 @@ def _submit_and_wait(
475475
for future in futures:
476476
future.result()
477477

478-
def emit(self, log_data: LogData):
479-
self._submit_and_wait(lambda lp: lp.emit, log_data)
478+
def on_emit(self, log_data: LogData):
479+
self._submit_and_wait(lambda lp: lp.on_emit, log_data)
480480

481481
def shutdown(self):
482482
self._submit_and_wait(lambda lp: lp.shutdown)
@@ -683,7 +683,7 @@ def emit(self, record: LogRecord):
683683
and instrumentation info.
684684
"""
685685
log_data = LogData(record, self._instrumentation_scope)
686-
self._multi_log_record_processor.emit(log_data)
686+
self._multi_log_record_processor.on_emit(log_data)
687687

688688

689689
class LoggerProvider(APILoggerProvider):

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def __init__(self, exporter: LogExporter):
112112
self._exporter = exporter
113113
self._shutdown = False
114114

115-
def emit(self, log_data: LogData):
115+
def on_emit(self, log_data: LogData):
116116
if self._shutdown:
117117
_logger.warning("Processor is already shutdown, ignoring call")
118118
return
@@ -186,7 +186,7 @@ def __init__(
186186
"Log",
187187
)
188188

189-
def emit(self, log_data: LogData) -> None:
189+
def on_emit(self, log_data: LogData) -> None:
190190
return self._batch_processor.emit(log_data)
191191

192192
def shutdown(self):

opentelemetry-sdk/tests/logs/test_export.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ def test_emit_call_log_record(self):
348348
logger.addHandler(LoggingHandler(logger_provider=provider))
349349

350350
logger.error("error")
351-
self.assertEqual(log_record_processor.emit.call_count, 1)
351+
self.assertEqual(log_record_processor.on_emit.call_count, 1)
352352
log_record_processor.shutdown()
353353

354354
def test_with_multiple_threads(self): # pylint: disable=no-self-use
@@ -363,7 +363,7 @@ def test_with_multiple_threads(self): # pylint: disable=no-self-use
363363

364364
def bulk_emit(num_emit):
365365
for _ in range(num_emit):
366-
batch_processor.emit(EMPTY_LOG)
366+
batch_processor.on_emit(EMPTY_LOG)
367367

368368
total_expected_logs = 0
369369
with ThreadPoolExecutor(max_workers=69) as executor:
@@ -404,10 +404,10 @@ def test_logging_lib_not_invoked_in_batch_log_record_emit(self): # pylint: disa
404404
# If `emit` calls logging.log then this test will throw a maximum recursion depth exceeded exception and fail.
405405
try:
406406
with self.assertNoLogs(sdk_logger, logging.NOTSET):
407-
processor.emit(EMPTY_LOG)
407+
processor.on_emit(EMPTY_LOG)
408408
processor.shutdown()
409409
with self.assertNoLogs(sdk_logger, logging.NOTSET):
410-
processor.emit(EMPTY_LOG)
410+
processor.on_emit(EMPTY_LOG)
411411
finally:
412412
sdk_logger.removeHandler(handler)
413413

opentelemetry-sdk/tests/logs/test_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ class FakeProcessor(LogRecordProcessor):
384384
def __init__(self):
385385
self.log_data_emitted = []
386386

387-
def emit(self, log_data: LogData):
387+
def on_emit(self, log_data: LogData):
388388
self.log_data_emitted.append(log_data)
389389

390390
def shutdown(self):

opentelemetry-sdk/tests/logs/test_multi_log_processor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, exporter, logs_list):
3838
self._log_list = logs_list
3939
self._closed = False
4040

41-
def emit(self, log_data):
41+
def on_emit(self, log_data):
4242
if self._closed:
4343
return
4444
self._log_list.append(
@@ -118,9 +118,9 @@ def test_on_emit(self):
118118
for mock in mocks:
119119
multi_log_record_processor.add_log_record_processor(mock)
120120
record = self.make_record()
121-
multi_log_record_processor.emit(record)
121+
multi_log_record_processor.on_emit(record)
122122
for mock in mocks:
123-
mock.emit.assert_called_with(record)
123+
mock.on_emit.assert_called_with(record)
124124
multi_log_record_processor.shutdown()
125125

126126
def test_on_shutdown(self):

0 commit comments

Comments
 (0)