diff --git a/.changelog/5438.changed b/.changelog/5438.changed new file mode 100644 index 0000000000..42e90082e5 --- /dev/null +++ b/.changelog/5438.changed @@ -0,0 +1 @@ +`opentelemetry-sdk`: unify logging force_flush timeout defaults to 30000ms diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py index a56cfc622a..d6ff7717ef 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py @@ -116,7 +116,7 @@ def shutdown(self): """ @abc.abstractmethod - def force_flush(self, timeout_millis: int = 10_000) -> bool: + def force_flush(self, timeout_millis: int = 30000) -> bool: """Hint to ensure that the export of any ``ReadableLogRecord`` objects the exporter has received prior to the call to ``force_flush`` SHOULD be completed as soon as possible, preferably before returning from this method. @@ -161,7 +161,7 @@ def export(self, batch: Sequence[ReadableLogRecord]): def shutdown(self): pass - def force_flush(self, timeout_millis: int = 10_000) -> bool: + def force_flush(self, timeout_millis: int = 30000) -> bool: return True @@ -321,7 +321,7 @@ def on_emit(self, log_record: ReadWriteLogRecord) -> None: def shutdown(self): return self._batch_processor.shutdown() - def force_flush(self, timeout_millis: int | None = None) -> bool: + def force_flush(self, timeout_millis: int = 30000) -> bool: return self._batch_processor.force_flush(timeout_millis) @staticmethod diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/in_memory_log_exporter.py b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/in_memory_log_exporter.py index 97013f432d..d11a174c15 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/in_memory_log_exporter.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/in_memory_log_exporter.py @@ -44,7 +44,7 @@ def export(self, batch: collections.abc.Sequence[ReadableLogRecord]) -> LogRecor def shutdown(self) -> None: self._stopped = True - def force_flush(self, timeout_millis: int = 10_000) -> bool: + def force_flush(self, timeout_millis: int = 30000) -> bool: return True