diff --git a/opentelemetry-prometheus/examples/hyper.rs b/opentelemetry-prometheus/examples/hyper.rs index a2bd593ba9..ab3a083307 100644 --- a/opentelemetry-prometheus/examples/hyper.rs +++ b/opentelemetry-prometheus/examples/hyper.rs @@ -15,7 +15,7 @@ use opentelemetry_sdk::metrics::SdkMeterProvider; use prometheus::{Encoder, Registry, TextEncoder}; use std::net::SocketAddr; use std::sync::Arc; -use std::time::SystemTime; +use opentelemetry::time::now; use tokio::net::TcpListener; static HANDLER_ALL: Lazy<[KeyValue; 1]> = Lazy::new(|| [KeyValue::new("handler", "all")]); @@ -25,7 +25,7 @@ async fn serve_req( state: Arc, ) -> Result>, hyper::Error> { println!("Receiving request at path {}", req.uri()); - let request_start = SystemTime::now(); + let request_start = now(); state.http_counter.add(1, HANDLER_ALL.as_ref()); diff --git a/opentelemetry-sdk/benches/batch_span_processor.rs b/opentelemetry-sdk/benches/batch_span_processor.rs index 7cd9ff5c1c..49f332824a 100644 --- a/opentelemetry-sdk/benches/batch_span_processor.rs +++ b/opentelemetry-sdk/benches/batch_span_processor.rs @@ -8,7 +8,7 @@ use opentelemetry_sdk::trace::{ BatchConfigBuilder, BatchSpanProcessor, SpanEvents, SpanLinks, SpanProcessor, }; use std::sync::Arc; -use std::time::SystemTime; +use opentelemetry::time::now; use tokio::runtime::Runtime; fn get_span_data() -> Vec { @@ -24,8 +24,8 @@ fn get_span_data() -> Vec { parent_span_id: SpanId::from_u64(12), span_kind: SpanKind::Client, name: Default::default(), - start_time: SystemTime::now(), - end_time: SystemTime::now(), + start_time: now(), + end_time: now(), attributes: Vec::new(), dropped_attributes_count: 0, events: SpanEvents::default(), diff --git a/opentelemetry-sdk/benches/log.rs b/opentelemetry-sdk/benches/log.rs index 99083fbdae..3631d7cd79 100644 --- a/opentelemetry-sdk/benches/log.rs +++ b/opentelemetry-sdk/benches/log.rs @@ -16,7 +16,7 @@ RAM: 64.0 GB */ use std::collections::HashMap; -use std::time::SystemTime; +use opentelemetry::time::now; use criterion::{criterion_group, criterion_main, Criterion}; @@ -111,7 +111,7 @@ fn logging_comparable_to_appender(c: &mut Criterion) { c.bench_function("Logging_Comparable_To_Appender", |b| { b.iter(|| { let mut log_record = logger.create_log_record(); - let now = SystemTime::now(); + let now = now(); log_record.set_observed_timestamp(now); log_record.set_target("my-target".to_string()); log_record.set_event_name("CheckoutFailed"); @@ -253,7 +253,7 @@ fn criterion_benchmark(c: &mut Criterion) { logger.emit(log_record); }); - let now = SystemTime::now(); + let now = now(); log_benchmark_group(c, "full-log", |logger| { let mut log_record = logger.create_log_record(); log_record.set_body("full log".into()); diff --git a/opentelemetry-sdk/benches/log_exporter.rs b/opentelemetry-sdk/benches/log_exporter.rs index 523725fc7e..a9f36789c6 100644 --- a/opentelemetry-sdk/benches/log_exporter.rs +++ b/opentelemetry-sdk/benches/log_exporter.rs @@ -11,7 +11,7 @@ */ use std::sync::Mutex; -use std::time::SystemTime; +use opentelemetry::time::now; use async_trait::async_trait; use criterion::{criterion_group, criterion_main, Criterion}; @@ -126,7 +126,7 @@ fn exporter_with_future(c: &mut Criterion) { c.bench_function("LogExporterWithFuture", |b| { b.iter(|| { let mut log_record = logger.create_log_record(); - let now = SystemTime::now(); + let now = now(); log_record.set_observed_timestamp(now); log_record.set_target("my-target".to_string()); log_record.set_event_name("CheckoutFailed"); @@ -152,7 +152,7 @@ fn exporter_without_future(c: &mut Criterion) { c.bench_function("LogExporterWithoutFuture", |b| { b.iter(|| { let mut log_record = logger.create_log_record(); - let now = SystemTime::now(); + let now = now(); log_record.set_observed_timestamp(now); log_record.set_target("my-target".to_string()); log_record.set_event_name("CheckoutFailed"); diff --git a/opentelemetry-sdk/benches/log_processor.rs b/opentelemetry-sdk/benches/log_processor.rs index 87cd242d0d..ee16b57fa6 100644 --- a/opentelemetry-sdk/benches/log_processor.rs +++ b/opentelemetry-sdk/benches/log_processor.rs @@ -14,8 +14,8 @@ use std::{ sync::{Arc, Mutex}, thread::sleep, - time::SystemTime, }; +use opentelemetry::time::now; use criterion::{criterion_group, criterion_main, Criterion}; use opentelemetry::{ @@ -29,7 +29,7 @@ use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, Logger, Logger fn create_log_record(logger: &Logger) -> LogRecord { let mut log_record = logger.create_log_record(); - let now = SystemTime::now(); + let now = now(); log_record.set_observed_timestamp(now); log_record.set_target("my-target".to_string()); log_record.set_event_name("CheckoutFailed"); diff --git a/opentelemetry/src/lib.rs b/opentelemetry/src/lib.rs index ad906171b2..fc038151ab 100644 --- a/opentelemetry/src/lib.rs +++ b/opentelemetry/src/lib.rs @@ -279,7 +279,7 @@ pub mod logs; #[doc(hidden)] #[cfg(any(feature = "metrics", feature = "trace", feature = "logs"))] pub mod time { - use std::time::SystemTime; + use opentelemetry::time::now; #[doc(hidden)] #[cfg(any( @@ -287,7 +287,7 @@ pub mod time { all(target_arch = "wasm32", target_os = "wasi") ))] pub fn now() -> SystemTime { - SystemTime::now() + now() } #[doc(hidden)]