Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#4637](https://github.com/open-telemetry/opentelemetry-python/pull/4637))
- Logging API accepts optional `context`; deprecates `trace_id`, `span_id`, `trace_flags`.
([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597))
- Rename LogRecordProcessor.emit to on_emit
([#4648](https://github.com/open-telemetry/opentelemetry-python/pull/4648))
- Logging API hide std_to_otel function to convert python logging severity to otel severity
([#4649](https://github.com/open-telemetry/opentelemetry-python/pull/4649))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ class LogRecordProcessor(abc.ABC):
"""

@abc.abstractmethod
def emit(self, log_data: LogData):
def on_emit(self, log_data: LogData):
"""Emits the `LogData`"""

@abc.abstractmethod
Expand Down Expand Up @@ -401,9 +401,9 @@ def add_log_record_processor(
with self._lock:
self._log_record_processors += (log_record_processor,)

def emit(self, log_data: LogData) -> None:
def on_emit(self, log_data: LogData) -> None:
for lp in self._log_record_processors:
lp.emit(log_data)
lp.on_emit(log_data)

def shutdown(self) -> None:
"""Shutdown the log processors one by one"""
Expand Down Expand Up @@ -475,8 +475,8 @@ def _submit_and_wait(
for future in futures:
future.result()

def emit(self, log_data: LogData):
self._submit_and_wait(lambda lp: lp.emit, log_data)
def on_emit(self, log_data: LogData):
self._submit_and_wait(lambda lp: lp.on_emit, log_data)

def shutdown(self):
self._submit_and_wait(lambda lp: lp.shutdown)
Expand Down Expand Up @@ -683,7 +683,7 @@ def emit(self, record: LogRecord):
and instrumentation info.
"""
log_data = LogData(record, self._instrumentation_scope)
self._multi_log_record_processor.emit(log_data)
self._multi_log_record_processor.on_emit(log_data)


class LoggerProvider(APILoggerProvider):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def __init__(self, exporter: LogExporter):
self._exporter = exporter
self._shutdown = False

def emit(self, log_data: LogData):
def on_emit(self, log_data: LogData):
if self._shutdown:
_logger.warning("Processor is already shutdown, ignoring call")
return
Expand Down Expand Up @@ -186,7 +186,7 @@ def __init__(
"Log",
)

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

def shutdown(self):
Expand Down
8 changes: 4 additions & 4 deletions opentelemetry-sdk/tests/logs/test_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ def test_emit_call_log_record(self):
logger.addHandler(LoggingHandler(logger_provider=provider))

logger.error("error")
self.assertEqual(log_record_processor.emit.call_count, 1)
self.assertEqual(log_record_processor.on_emit.call_count, 1)
log_record_processor.shutdown()

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

def bulk_emit(num_emit):
for _ in range(num_emit):
batch_processor.emit(EMPTY_LOG)
batch_processor.on_emit(EMPTY_LOG)

total_expected_logs = 0
with ThreadPoolExecutor(max_workers=69) as executor:
Expand Down Expand Up @@ -404,10 +404,10 @@ def test_logging_lib_not_invoked_in_batch_log_record_emit(self): # pylint: disa
# If `emit` calls logging.log then this test will throw a maximum recursion depth exceeded exception and fail.
try:
with self.assertNoLogs(sdk_logger, logging.NOTSET):
processor.emit(EMPTY_LOG)
processor.on_emit(EMPTY_LOG)
processor.shutdown()
with self.assertNoLogs(sdk_logger, logging.NOTSET):
processor.emit(EMPTY_LOG)
processor.on_emit(EMPTY_LOG)
finally:
sdk_logger.removeHandler(handler)

Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/tests/logs/test_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ class FakeProcessor(LogRecordProcessor):
def __init__(self):
self.log_data_emitted = []

def emit(self, log_data: LogData):
def on_emit(self, log_data: LogData):
self.log_data_emitted.append(log_data)

def shutdown(self):
Expand Down
6 changes: 3 additions & 3 deletions opentelemetry-sdk/tests/logs/test_multi_log_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def __init__(self, exporter, logs_list):
self._log_list = logs_list
self._closed = False

def emit(self, log_data):
def on_emit(self, log_data):
if self._closed:
return
self._log_list.append(
Expand Down Expand Up @@ -118,9 +118,9 @@ def test_on_emit(self):
for mock in mocks:
multi_log_record_processor.add_log_record_processor(mock)
record = self.make_record()
multi_log_record_processor.emit(record)
multi_log_record_processor.on_emit(record)
for mock in mocks:
mock.emit.assert_called_with(record)
mock.on_emit.assert_called_with(record)
multi_log_record_processor.shutdown()

def test_on_shutdown(self):
Expand Down