Skip to content
Closed
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
1 change: 1 addition & 0 deletions .changelog/5693.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`opentelemetry-sdk`: add validation for export_timeout_millis <= 0 in BatchSpanProcessor, BatchLogRecordProcessor, and PeriodicExportingMetricReader
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def __init__(
if export_timeout_millis is None:
export_timeout_millis = BatchLogRecordProcessor._default_export_timeout_millis()

BatchLogRecordProcessor._validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size)
BatchLogRecordProcessor._validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size, export_timeout_millis)
# Initializes BatchProcessor
self._batch_processor = BatchProcessor(
exporter,
Expand Down Expand Up @@ -378,7 +378,7 @@ def _default_export_timeout_millis():
return _DEFAULT_EXPORT_TIMEOUT_MILLIS

@staticmethod
def _validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size):
def _validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size, export_timeout_millis):
if max_queue_size <= 0:
raise ValueError("max_queue_size must be a positive integer.")

Expand All @@ -388,5 +388,8 @@ def _validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_
if max_export_batch_size <= 0:
raise ValueError("max_export_batch_size must be a positive integer.")

if export_timeout_millis <= 0:
raise ValueError("export_timeout_millis must be positive.")

if max_export_batch_size > max_queue_size:
raise ValueError("max_export_batch_size must be less than or equal to max_queue_size.")
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,17 @@ def __init__(
self._shutdown_event = Event()
self._shutdown_once = Once()
self._daemon_thread = None
if self._export_interval_millis > 0 and self._export_interval_millis < math.inf:
if self._export_interval_millis <= 0:
raise ValueError(
f"interval value {self._export_interval_millis} is invalid \
and needs to be larger than zero."
)
if self._export_timeout_millis <= 0:
raise ValueError(
f"timeout value {self._export_timeout_millis} is invalid \
and needs to be larger than zero."
)
if self._export_interval_millis < math.inf:
self._daemon_thread = Thread(
name="OtelPeriodicExportingMetricReader",
target=self._ticker,
Expand All @@ -475,11 +485,6 @@ def _after_in_child() -> None:
at_fork()

os.register_at_fork(after_in_child=_after_in_child)
elif self._export_interval_millis <= 0:
raise ValueError(
f"interval value {self._export_interval_millis} is invalid \
and needs to be larger than zero."
)

def _at_fork_reinit(self):
self._daemon_thread = Thread(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def __init__(
if export_timeout_millis is None:
export_timeout_millis = BatchSpanProcessor._default_export_timeout_millis()

BatchSpanProcessor._validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size)
BatchSpanProcessor._validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size, export_timeout_millis)

self._batch_processor = BatchProcessor(
span_exporter,
Expand Down Expand Up @@ -274,7 +274,7 @@ def _default_export_timeout_millis():
return _DEFAULT_EXPORT_TIMEOUT_MILLIS

@staticmethod
def _validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size):
def _validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_size, export_timeout_millis):
if max_queue_size <= 0:
raise ValueError("max_queue_size must be a positive integer.")

Expand All @@ -284,6 +284,9 @@ def _validate_arguments(max_queue_size, schedule_delay_millis, max_export_batch_
if max_export_batch_size <= 0:
raise ValueError("max_export_batch_size must be a positive integer.")

if export_timeout_millis <= 0:
raise ValueError("export_timeout_millis must be positive.")

if max_export_batch_size > max_queue_size:
raise ValueError("max_export_batch_size must be less than or equal to max_queue_size.")

Expand Down