Skip to content

Commit ee08463

Browse files
committed
OTEL_BSP_SCHEDULE_DELAY_DEFAULT
1 parent 03eb1a8 commit ee08463

File tree

3 files changed

+8
-20
lines changed

3 files changed

+8
-20
lines changed

opentelemetry-sdk/src/logs/log_processor_with_async_runtime.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,7 @@ mod tests {
373373

374374
let config = temp_env::with_vars_unset(env_vars, BatchConfig::default);
375375

376-
assert_eq!(
377-
config.scheduled_delay,
378-
OTEL_BLRP_SCHEDULE_DELAY_DEFAULT
379-
);
376+
assert_eq!(config.scheduled_delay, OTEL_BLRP_SCHEDULE_DELAY_DEFAULT);
380377
assert_eq!(
381378
config.max_export_timeout,
382379
Duration::from_millis(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT)
@@ -416,10 +413,7 @@ mod tests {
416413

417414
assert_eq!(config.max_queue_size, 256);
418415
assert_eq!(config.max_export_batch_size, 256);
419-
assert_eq!(
420-
config.scheduled_delay,
421-
OTEL_BLRP_SCHEDULE_DELAY_DEFAULT
422-
);
416+
assert_eq!(config.scheduled_delay, OTEL_BLRP_SCHEDULE_DELAY_DEFAULT);
423417
assert_eq!(
424418
config.max_export_timeout,
425419
Duration::from_millis(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT)

opentelemetry-sdk/src/trace/span_processor.rs

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use std::time::Instant;
5353
/// Delay interval between two consecutive exports.
5454
pub(crate) const OTEL_BSP_SCHEDULE_DELAY: &str = "OTEL_BSP_SCHEDULE_DELAY";
5555
/// Default delay interval between two consecutive exports.
56-
pub(crate) const OTEL_BSP_SCHEDULE_DELAY_DEFAULT: u64 = 5_000;
56+
pub(crate) const OTEL_BSP_SCHEDULE_DELAY_DEFAULT: Duration = Duration::from_millis(5_000);
5757
/// Maximum queue size
5858
pub(crate) const OTEL_BSP_MAX_QUEUE_SIZE: &str = "OTEL_BSP_MAX_QUEUE_SIZE";
5959
/// Default maximum queue size
@@ -708,7 +708,7 @@ impl Default for BatchConfigBuilder {
708708
fn default() -> Self {
709709
BatchConfigBuilder {
710710
max_queue_size: OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT,
711-
scheduled_delay: Duration::from_millis(OTEL_BSP_SCHEDULE_DELAY_DEFAULT),
711+
scheduled_delay: OTEL_BSP_SCHEDULE_DELAY_DEFAULT,
712712
max_export_batch_size: OTEL_BSP_MAX_EXPORT_BATCH_SIZE_DEFAULT,
713713
max_export_timeout: OTEL_BSP_EXPORT_TIMEOUT_DEFAULT,
714714
max_concurrent_exports: OTEL_BSP_MAX_CONCURRENT_EXPORTS_DEFAULT,
@@ -898,7 +898,7 @@ mod tests {
898898
assert_eq!(OTEL_BSP_MAX_QUEUE_SIZE, "OTEL_BSP_MAX_QUEUE_SIZE");
899899
assert_eq!(OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT, 2048);
900900
assert_eq!(OTEL_BSP_SCHEDULE_DELAY, "OTEL_BSP_SCHEDULE_DELAY");
901-
assert_eq!(OTEL_BSP_SCHEDULE_DELAY_DEFAULT, 5000);
901+
assert_eq!(OTEL_BSP_SCHEDULE_DELAY_DEFAULT.as_millis(), 5000);
902902
assert_eq!(
903903
OTEL_BSP_MAX_EXPORT_BATCH_SIZE,
904904
"OTEL_BSP_MAX_EXPORT_BATCH_SIZE"
@@ -924,10 +924,7 @@ mod tests {
924924
config.max_concurrent_exports,
925925
OTEL_BSP_MAX_CONCURRENT_EXPORTS_DEFAULT
926926
);
927-
assert_eq!(
928-
config.scheduled_delay,
929-
Duration::from_millis(OTEL_BSP_SCHEDULE_DELAY_DEFAULT)
930-
);
927+
assert_eq!(config.scheduled_delay, OTEL_BSP_SCHEDULE_DELAY_DEFAULT);
931928
assert_eq!(config.max_export_timeout, OTEL_BSP_EXPORT_TIMEOUT_DEFAULT);
932929
assert_eq!(config.max_queue_size, OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT);
933930
assert_eq!(
@@ -964,10 +961,7 @@ mod tests {
964961

965962
assert_eq!(config.max_queue_size, 256);
966963
assert_eq!(config.max_export_batch_size, 256);
967-
assert_eq!(
968-
config.scheduled_delay,
969-
Duration::from_millis(OTEL_BSP_SCHEDULE_DELAY_DEFAULT)
970-
);
964+
assert_eq!(config.scheduled_delay, OTEL_BSP_SCHEDULE_DELAY_DEFAULT);
971965
assert_eq!(config.max_export_timeout, OTEL_BSP_EXPORT_TIMEOUT_DEFAULT);
972966
}
973967

opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ mod tests {
480480
assert_eq!(builder.config.max_export_batch_size, 500);
481481
assert_eq!(
482482
builder.config.scheduled_delay,
483-
Duration::from_millis(OTEL_BSP_SCHEDULE_DELAY_DEFAULT)
483+
OTEL_BSP_SCHEDULE_DELAY_DEFAULT
484484
);
485485
assert_eq!(
486486
builder.config.max_queue_size,

0 commit comments

Comments
 (0)