diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml index 53654fd231..90d0f4b16d 100644 --- a/opentelemetry-otlp/Cargo.toml +++ b/opentelemetry-otlp/Cargo.toml @@ -51,12 +51,12 @@ http = "0.2" serde = { version = "1.0", features = ["derive"], optional = true } [dev-dependencies] -chrono = "0.4" tokio-stream = { version = "0.1", features = ["net"] } # need tokio runtime to run smoke tests. opentelemetry = { features = ["trace", "rt-tokio"], path = "../opentelemetry" } protobuf-codegen = { version = "2.16"} protoc-grpcio = { version = "3.0"} +time = { version = "0.3", features = ["macros"] } [features] trace = ["opentelemetry/trace"] diff --git a/opentelemetry-otlp/src/proto/grpcio/common.rs b/opentelemetry-otlp/src/proto/grpcio/common.rs index 04d3add108..fb01258ece 100644 --- a/opentelemetry-otlp/src/proto/grpcio/common.rs +++ b/opentelemetry-otlp/src/proto/grpcio/common.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/metrics.rs b/opentelemetry-otlp/src/proto/grpcio/metrics.rs index 6434e21147..094874cc87 100644 --- a/opentelemetry-otlp/src/proto/grpcio/metrics.rs +++ b/opentelemetry-otlp/src/proto/grpcio/metrics.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs b/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs index 751fc2a269..7b001330b7 100644 --- a/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs +++ b/opentelemetry-otlp/src/proto/grpcio/metrics_service.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/resource.rs b/opentelemetry-otlp/src/proto/grpcio/resource.rs index a751f478e1..2f31eda788 100644 --- a/opentelemetry-otlp/src/proto/grpcio/resource.rs +++ b/opentelemetry-otlp/src/proto/grpcio/resource.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/trace.rs b/opentelemetry-otlp/src/proto/grpcio/trace.rs index 2debf8cefb..22ab62c111 100644 --- a/opentelemetry-otlp/src/proto/grpcio/trace.rs +++ b/opentelemetry-otlp/src/proto/grpcio/trace.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/trace_config.rs b/opentelemetry-otlp/src/proto/grpcio/trace_config.rs index 2d4030aab6..8e95236ec8 100644 --- a/opentelemetry-otlp/src/proto/grpcio/trace_config.rs +++ b/opentelemetry-otlp/src/proto/grpcio/trace_config.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/proto/grpcio/trace_service.rs b/opentelemetry-otlp/src/proto/grpcio/trace_service.rs index 7b957b9488..ff91f4eafd 100644 --- a/opentelemetry-otlp/src/proto/grpcio/trace_service.rs +++ b/opentelemetry-otlp/src/proto/grpcio/trace_service.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-otlp/src/transform/metrics.rs b/opentelemetry-otlp/src/transform/metrics.rs index 66c440e357..839cd5bc25 100644 --- a/opentelemetry-otlp/src/transform/metrics.rs +++ b/opentelemetry-otlp/src/transform/metrics.rs @@ -314,7 +314,6 @@ mod tests { use crate::transform::common::tonic::Attributes; use crate::transform::metrics::tonic::merge; use crate::transform::{record_to_metric, sink, ResourceWrapper}; - use chrono::prelude::*; use opentelemetry::attributes::AttributeSet; use opentelemetry::metrics::{ Descriptor, InstrumentKind, MetricsError, Number, NumberKind, @@ -326,6 +325,7 @@ mod tests { use opentelemetry::sdk::{InstrumentationLibrary, Resource}; use std::cmp::Ordering; use std::sync::Arc; + use time::macros::datetime; impl From<(&str, &str)> for KeyValue { fn from(kv: (&str, &str)) -> Self { @@ -500,8 +500,8 @@ mod tests { opentelemetry::KeyValue::new("process", "rust"), opentelemetry::KeyValue::new("runtime", "sync"), ]); - let start_time = Utc.ymd(2020, 12, 25).and_hms(10, 10, 0); // unit nano 1608891000000000000 - let end_time = Utc.ymd(2020, 12, 25).and_hms(10, 10, 30); // unix nano 1608891030000000000 + let start_time = datetime!(2020-12-25 10:10:0 UTC); // unit nano 1608891000000000000 + let end_time = datetime!(2020-12-25 10:10:30 UTC); // unix nano 1608891030000000000 // Sum { diff --git a/opentelemetry-zpages/Cargo.toml b/opentelemetry-zpages/Cargo.toml index a27966f725..1f1c7bbe2c 100644 --- a/opentelemetry-zpages/Cargo.toml +++ b/opentelemetry-zpages/Cargo.toml @@ -36,7 +36,6 @@ with-serde = ["protobuf/with-serde"] [dev-dependencies] tokio = { version = "1.0", features = ["full"] } -chrono = "0.4" opentelemetry = { path = "../opentelemetry", default-features = false, features = ["trace", "testing"] } [build-dependencies] diff --git a/opentelemetry-zpages/src/proto/common.rs b/opentelemetry-zpages/src/proto/common.rs index 7c80a2e0f6..55d99e1968 100644 --- a/opentelemetry-zpages/src/proto/common.rs +++ b/opentelemetry-zpages/src/proto/common.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-zpages/src/proto/resource.rs b/opentelemetry-zpages/src/proto/resource.rs index a751f478e1..2f31eda788 100644 --- a/opentelemetry-zpages/src/proto/resource.rs +++ b/opentelemetry-zpages/src/proto/resource.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-zpages/src/proto/trace.rs b/opentelemetry-zpages/src/proto/trace.rs index 2debf8cefb..22ab62c111 100644 --- a/opentelemetry-zpages/src/proto/trace.rs +++ b/opentelemetry-zpages/src/proto/trace.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-zpages/src/proto/tracez.rs b/opentelemetry-zpages/src/proto/tracez.rs index 79200af631..e299527bb8 100644 --- a/opentelemetry-zpages/src/proto/tracez.rs +++ b/opentelemetry-zpages/src/proto/tracez.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.25.1. Do not edit +// This file is generated by rust-protobuf 2.25.2. Do not edit // @generated // https://github.com/rust-lang/rust-clippy/issues/702 @@ -21,7 +21,7 @@ /// Generated files are compatible only with the same version /// of protobuf runtime. -// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_25_2; #[derive(PartialEq,Clone,Default)] #[cfg_attr(feature = "with-serde", derive(::serde::Serialize, ::serde::Deserialize))] diff --git a/opentelemetry-zpages/src/trace/aggregator.rs b/opentelemetry-zpages/src/trace/aggregator.rs index 1620f3cc88..9f20b76620 100644 --- a/opentelemetry-zpages/src/trace/aggregator.rs +++ b/opentelemetry-zpages/src/trace/aggregator.rs @@ -206,7 +206,6 @@ mod tests { use crate::trace::aggregator::{SpanAggregator, LATENCY_BUCKET_COUNT}; use crate::trace::span_queue::SpanQueue; use crate::trace::TracezMessage; - use chrono::{DateTime, NaiveDateTime, Utc}; use opentelemetry::sdk::export::trace::SpanData; use opentelemetry::testing::trace::new_test_export_span_data; use std::borrow::Cow; @@ -264,18 +263,17 @@ mod tests { pub(crate) fn get_input(&self) -> (Vec, Vec) { let mut start_spans = Vec::new(); let mut end_spans = Vec::new(); - let start_time = DateTime::::from_utc(NaiveDateTime::from_timestamp(61, 0), Utc); + let start_time = SystemTime::now(); for input in &self.input { let mut span_data = span_data(input.0, input.1, input.2, input.3); match input.4 { Action::Start => { - span_data.start_time = start_time.into(); + span_data.start_time = start_time; start_spans.push(span_data); } Action::End(duration) => { - span_data.start_time = start_time.into(); - span_data.end_time = - SystemTime::from(start_time).checked_add(duration).unwrap(); + span_data.start_time = start_time; + span_data.end_time = start_time.checked_add(duration).unwrap(); end_spans.push(span_data); } } diff --git a/opentelemetry-zpages/src/trace/span_queue.rs b/opentelemetry-zpages/src/trace/span_queue.rs index 974c102523..5618c7e49c 100644 --- a/opentelemetry-zpages/src/trace/span_queue.rs +++ b/opentelemetry-zpages/src/trace/span_queue.rs @@ -106,9 +106,9 @@ impl SpanQueue { #[cfg(test)] mod tests { use super::*; - use chrono::{DateTime, NaiveDateTime, Utc}; use opentelemetry::testing::trace::new_test_export_span_data; use opentelemetry::trace::{SpanId, TraceFlags, TraceId, TraceState}; + use std::time::SystemTime; enum Action { PushBack(u128, u64), @@ -136,12 +136,12 @@ mod tests { TraceState::default(), ) }; + let time = SystemTime::now(); let get_span_data = |trace_id: u128, span_id: u64| { let mut span_data = new_test_export_span_data(); span_data.span_context = get_span_context(trace_id, span_id); - let time = DateTime::::from_utc(NaiveDateTime::from_timestamp(61, 0), Utc); - span_data.start_time = time.into(); - span_data.end_time = time.into(); + span_data.start_time = time; + span_data.end_time = time; span_data }; let plans = vec![