Skip to content

Commit c072629

Browse files
cijothomascijothomas
authored
Use Duration for const for delays (#2688)
1 parent 19dba69 commit c072629

File tree

7 files changed

+34
-70
lines changed

7 files changed

+34
-70
lines changed

‎opentelemetry-otlp/src/exporter/http/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl HttpExporterBuilder {
120120
.or(env::var(OTEL_EXPORTER_OTLP_TIMEOUT).ok())
121121
{
122122
Some(val) => match val.parse() {
123-
Ok(seconds) => Duration::from_millis(seconds),
123+
Ok(milli_seconds) => Duration::from_millis(milli_seconds),
124124
Err(_) => self.exporter_config.timeout,
125125
},
126126
None => self.exporter_config.timeout,

‎opentelemetry-otlp/src/exporter/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const OTEL_EXPORTER_OTLP_PROTOCOL_HTTP_JSON: &str = "http/json";
5252
/// Max waiting time for the backend to process each signal batch, defaults to 10 seconds.
5353
pub const OTEL_EXPORTER_OTLP_TIMEOUT: &str = "OTEL_EXPORTER_OTLP_TIMEOUT";
5454
/// Default max waiting time for the backend to process each signal batch.
55-
pub const OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT: u64 = 10000;
55+
pub const OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT: Duration = Duration::from_millis(10000);
5656

5757
// Endpoints per protocol https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md
5858
#[cfg(feature = "grpc-tonic")]
@@ -87,7 +87,7 @@ impl Default for ExportConfig {
8787
// don't use default_endpoint(protocol) here otherwise we
8888
// won't know if user provided a value
8989
protocol,
90-
timeout: Duration::from_millis(OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT),
90+
timeout: OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT,
9191
}
9292
}
9393
}

‎opentelemetry-otlp/src/exporter/tonic/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ impl TonicExporterBuilder {
200200
.or(env::var(OTEL_EXPORTER_OTLP_TIMEOUT).ok())
201201
{
202202
Some(val) => match val.parse() {
203-
Ok(seconds) => Duration::from_millis(seconds),
203+
Ok(milli_seconds) => Duration::from_millis(milli_seconds),
204204
Err(_) => config.timeout,
205205
},
206206
None => config.timeout,

‎opentelemetry-sdk/src/logs/batch_log_processor.rs‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ use std::{
3939
/// Delay interval between two consecutive exports.
4040
pub(crate) const OTEL_BLRP_SCHEDULE_DELAY: &str = "OTEL_BLRP_SCHEDULE_DELAY";
4141
/// Default delay interval between two consecutive exports.
42-
pub(crate) const OTEL_BLRP_SCHEDULE_DELAY_DEFAULT: u64 = 1_000;
42+
pub(crate) const OTEL_BLRP_SCHEDULE_DELAY_DEFAULT: Duration = Duration::from_millis(1_000);
4343
/// Maximum allowed time to export data.
4444
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
4545
pub(crate) const OTEL_BLRP_EXPORT_TIMEOUT: &str = "OTEL_BLRP_EXPORT_TIMEOUT";
4646
/// Default maximum allowed time to export data.
4747
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
48-
pub(crate) const OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT: u64 = 30_000;
48+
pub(crate) const OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT: Duration = Duration::from_millis(30_000);
4949
/// Maximum queue size.
5050
pub(crate) const OTEL_BLRP_MAX_QUEUE_SIZE: &str = "OTEL_BLRP_MAX_QUEUE_SIZE";
5151
/// Default maximum queue size.
@@ -616,10 +616,10 @@ impl Default for BatchConfigBuilder {
616616
fn default() -> Self {
617617
BatchConfigBuilder {
618618
max_queue_size: OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT,
619-
scheduled_delay: Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT),
619+
scheduled_delay: OTEL_BLRP_SCHEDULE_DELAY_DEFAULT,
620620
max_export_batch_size: OTEL_BLRP_MAX_EXPORT_BATCH_SIZE_DEFAULT,
621621
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
622-
max_export_timeout: Duration::from_millis(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT),
622+
max_export_timeout: OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT,
623623
}
624624
.init_from_env_vars()
625625
}
@@ -736,11 +736,11 @@ mod tests {
736736
#[test]
737737
fn test_default_const_values() {
738738
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY, "OTEL_BLRP_SCHEDULE_DELAY");
739-
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT, 1_000);
739+
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT.as_millis(), 1_000);
740740
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
741741
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT, "OTEL_BLRP_EXPORT_TIMEOUT");
742742
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
743-
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT, 30_000);
743+
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT.as_millis(), 30_000);
744744
assert_eq!(OTEL_BLRP_MAX_QUEUE_SIZE, "OTEL_BLRP_MAX_QUEUE_SIZE");
745745
assert_eq!(OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT, 2_048);
746746
assert_eq!(
@@ -763,15 +763,9 @@ mod tests {
763763

764764
let config = temp_env::with_vars_unset(env_vars, BatchConfig::default);
765765

766-
assert_eq!(
767-
config.scheduled_delay,
768-
Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT)
769-
);
766+
assert_eq!(config.scheduled_delay, OTEL_BLRP_SCHEDULE_DELAY_DEFAULT);
770767
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
771-
assert_eq!(
772-
config.max_export_timeout,
773-
Duration::from_millis(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT)
774-
);
768+
assert_eq!(config.max_export_timeout, OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT);
775769
assert_eq!(config.max_queue_size, OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT);
776770
assert_eq!(
777771
config.max_export_batch_size,
@@ -809,15 +803,9 @@ mod tests {
809803

810804
assert_eq!(config.max_queue_size, 256);
811805
assert_eq!(config.max_export_batch_size, 256);
812-
assert_eq!(
813-
config.scheduled_delay,
814-
Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT)
815-
);
806+
assert_eq!(config.scheduled_delay, OTEL_BLRP_SCHEDULE_DELAY_DEFAULT);
816807
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
817-
assert_eq!(
818-
config.max_export_timeout,
819-
Duration::from_millis(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT)
820-
);
808+
assert_eq!(config.max_export_timeout, OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT);
821809
}
822810

823811
#[test]
@@ -852,7 +840,7 @@ mod tests {
852840
assert_eq!(builder.config.max_export_batch_size, 500);
853841
assert_eq!(
854842
builder.config.scheduled_delay,
855-
Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT)
843+
OTEL_BLRP_SCHEDULE_DELAY_DEFAULT
856844
);
857845
assert_eq!(
858846
builder.config.max_queue_size,

‎opentelemetry-sdk/src/logs/log_processor_with_async_runtime.rs‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ mod tests {
345345
#[test]
346346
fn test_default_const_values() {
347347
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY, "OTEL_BLRP_SCHEDULE_DELAY");
348-
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT, 1_000);
348+
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT.as_millis(), 1_000);
349349
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT, "OTEL_BLRP_EXPORT_TIMEOUT");
350-
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT, 30_000);
350+
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT.as_millis(), 30_000);
351351
assert_eq!(OTEL_BLRP_MAX_QUEUE_SIZE, "OTEL_BLRP_MAX_QUEUE_SIZE");
352352
assert_eq!(OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT, 2_048);
353353
assert_eq!(
@@ -369,14 +369,8 @@ mod tests {
369369

370370
let config = temp_env::with_vars_unset(env_vars, BatchConfig::default);
371371

372-
assert_eq!(
373-
config.scheduled_delay,
374-
Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT)
375-
);
376-
assert_eq!(
377-
config.max_export_timeout,
378-
Duration::from_millis(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT)
379-
);
372+
assert_eq!(config.scheduled_delay, OTEL_BLRP_SCHEDULE_DELAY_DEFAULT);
373+
assert_eq!(config.max_export_timeout, OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT);
380374
assert_eq!(config.max_queue_size, OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT);
381375
assert_eq!(
382376
config.max_export_batch_size,
@@ -412,14 +406,8 @@ mod tests {
412406

413407
assert_eq!(config.max_queue_size, 256);
414408
assert_eq!(config.max_export_batch_size, 256);
415-
assert_eq!(
416-
config.scheduled_delay,
417-
Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT)
418-
);
419-
assert_eq!(
420-
config.max_export_timeout,
421-
Duration::from_millis(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT)
422-
);
409+
assert_eq!(config.scheduled_delay, OTEL_BLRP_SCHEDULE_DELAY_DEFAULT);
410+
assert_eq!(config.max_export_timeout, OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT);
423411
}
424412

425413
#[test]
@@ -451,7 +439,7 @@ mod tests {
451439
assert_eq!(builder.config.max_export_batch_size, 500);
452440
assert_eq!(
453441
builder.config.scheduled_delay,
454-
Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT)
442+
OTEL_BLRP_SCHEDULE_DELAY_DEFAULT
455443
);
456444
assert_eq!(
457445
builder.config.max_queue_size,
@@ -742,7 +730,7 @@ mod tests {
742730
assert_eq!(builder.config.max_export_batch_size, 500);
743731
assert_eq!(
744732
builder.config.scheduled_delay,
745-
Duration::from_millis(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT)
733+
OTEL_BLRP_SCHEDULE_DELAY_DEFAULT
746734
);
747735
assert_eq!(
748736
builder.config.max_queue_size,

‎opentelemetry-sdk/src/trace/span_processor.rs‎

Lines changed: 10 additions & 22 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
@@ -65,7 +65,7 @@ pub(crate) const OTEL_BSP_MAX_EXPORT_BATCH_SIZE_DEFAULT: usize = 512;
6565
/// Maximum allowed time to export data.
6666
pub(crate) const OTEL_BSP_EXPORT_TIMEOUT: &str = "OTEL_BSP_EXPORT_TIMEOUT";
6767
/// Default maximum allowed time to export data.
68-
pub(crate) const OTEL_BSP_EXPORT_TIMEOUT_DEFAULT: u64 = 30_000;
68+
pub(crate) const OTEL_BSP_EXPORT_TIMEOUT_DEFAULT: Duration = Duration::from_millis(30_000);
6969
/// Environment variable to configure max concurrent exports for batch span
7070
/// processor.
7171
pub(crate) const OTEL_BSP_MAX_CONCURRENT_EXPORTS: &str = "OTEL_BSP_MAX_CONCURRENT_EXPORTS";
@@ -708,9 +708,9 @@ 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,
713-
max_export_timeout: Duration::from_millis(OTEL_BSP_EXPORT_TIMEOUT_DEFAULT),
713+
max_export_timeout: OTEL_BSP_EXPORT_TIMEOUT_DEFAULT,
714714
max_concurrent_exports: OTEL_BSP_MAX_CONCURRENT_EXPORTS_DEFAULT,
715715
}
716716
.init_from_env_vars()
@@ -898,14 +898,14 @@ 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"
905905
);
906906
assert_eq!(OTEL_BSP_MAX_EXPORT_BATCH_SIZE_DEFAULT, 512);
907907
assert_eq!(OTEL_BSP_EXPORT_TIMEOUT, "OTEL_BSP_EXPORT_TIMEOUT");
908-
assert_eq!(OTEL_BSP_EXPORT_TIMEOUT_DEFAULT, 30000);
908+
assert_eq!(OTEL_BSP_EXPORT_TIMEOUT_DEFAULT.as_millis(), 30000);
909909
}
910910

911911
#[test]
@@ -924,14 +924,8 @@ 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-
);
931-
assert_eq!(
932-
config.max_export_timeout,
933-
Duration::from_millis(OTEL_BSP_EXPORT_TIMEOUT_DEFAULT)
934-
);
927+
assert_eq!(config.scheduled_delay, OTEL_BSP_SCHEDULE_DELAY_DEFAULT);
928+
assert_eq!(config.max_export_timeout, OTEL_BSP_EXPORT_TIMEOUT_DEFAULT);
935929
assert_eq!(config.max_queue_size, OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT);
936930
assert_eq!(
937931
config.max_export_batch_size,
@@ -967,14 +961,8 @@ mod tests {
967961

968962
assert_eq!(config.max_queue_size, 256);
969963
assert_eq!(config.max_export_batch_size, 256);
970-
assert_eq!(
971-
config.scheduled_delay,
972-
Duration::from_millis(OTEL_BSP_SCHEDULE_DELAY_DEFAULT)
973-
);
974-
assert_eq!(
975-
config.max_export_timeout,
976-
Duration::from_millis(OTEL_BSP_EXPORT_TIMEOUT_DEFAULT)
977-
);
964+
assert_eq!(config.scheduled_delay, OTEL_BSP_SCHEDULE_DELAY_DEFAULT);
965+
assert_eq!(config.max_export_timeout, OTEL_BSP_EXPORT_TIMEOUT_DEFAULT);
978966
}
979967

980968
#[test]

‎opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs‎

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

0 commit comments

Comments
 (0)