diff --git a/opentelemetry-appender-tracing/src/layer.rs b/opentelemetry-appender-tracing/src/layer.rs index fceac59a04..f2402237c1 100644 --- a/opentelemetry-appender-tracing/src/layer.rs +++ b/opentelemetry-appender-tracing/src/layer.rs @@ -674,8 +674,8 @@ mod tests { assert_eq!(trace_ctx1.span_id, inner_span_id); // Set context from remote. - let remote_trace_id = TraceId::from_u128(233); - let remote_span_id = SpanId::from_u64(2333); + let remote_trace_id = TraceId::from(233); + let remote_span_id = SpanId::from(2333); let remote_span_context = SpanContext::new( remote_trace_id, remote_span_id, diff --git a/opentelemetry-jaeger-propagator/src/propagator.rs b/opentelemetry-jaeger-propagator/src/propagator.rs index 7ec8399ecf..87ccfd6f27 100644 --- a/opentelemetry-jaeger-propagator/src/propagator.rs +++ b/opentelemetry-jaeger-propagator/src/propagator.rs @@ -239,8 +239,8 @@ mod tests { SPAN_ID_STR, 1, SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TraceFlags::SAMPLED, true, TraceState::default(), @@ -251,8 +251,8 @@ mod tests { SPAN_ID_STR, 1, SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TraceFlags::SAMPLED, true, TraceState::default(), @@ -263,8 +263,8 @@ mod tests { SHORT_SPAN_ID_STR, 1, SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TraceFlags::SAMPLED, true, TraceState::default(), @@ -275,8 +275,8 @@ mod tests { SPAN_ID_STR, 3, SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TRACE_FLAG_DEBUG | TraceFlags::SAMPLED, true, TraceState::default(), @@ -287,8 +287,8 @@ mod tests { SPAN_ID_STR, 0, SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TraceFlags::default(), true, TraceState::default(), @@ -319,8 +319,8 @@ mod tests { vec![ ( SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TraceFlags::SAMPLED, true, TraceState::default(), @@ -329,8 +329,8 @@ mod tests { ), ( SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TraceFlags::default(), true, TraceState::default(), @@ -339,8 +339,8 @@ mod tests { ), ( SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TRACE_FLAG_DEBUG | TraceFlags::SAMPLED, true, TraceState::default(), @@ -550,10 +550,7 @@ mod tests { #[test] fn test_extract_span_id() { let propgator = Propagator::new(); - assert_eq!( - propgator.extract_span_id("12345"), - Ok(SpanId::from_u64(74565)) - ); + assert_eq!(propgator.extract_span_id("12345"), Ok(SpanId::from(74565))); // Fail to extract span id with an invalid hex-string assert_eq!(propgator.extract_span_id("invalid"), Err(())); @@ -683,8 +680,8 @@ mod tests { assert_eq!( context.span().span_context(), &SpanContext::new( - TraceId::from_u128(TRACE_ID), - SpanId::from_u64(SPAN_ID), + TraceId::from(TRACE_ID), + SpanId::from(SPAN_ID), TraceFlags::SAMPLED, true, TraceState::default(), diff --git a/opentelemetry-proto/src/transform/trace.rs b/opentelemetry-proto/src/transform/trace.rs index 231834a30d..f7f0ab6091 100644 --- a/opentelemetry-proto/src/transform/trace.rs +++ b/opentelemetry-proto/src/transform/trace.rs @@ -209,8 +209,8 @@ mod tests { fn create_test_span_data(instrumentation_name: &'static str) -> SpanData { let span_context = SpanContext::new( - TraceId::from_u128(123), - SpanId::from_u64(456), + TraceId::from(123), + SpanId::from(456), TraceFlags::default(), false, TraceState::default(), @@ -218,7 +218,7 @@ mod tests { SpanData { span_context, - parent_span_id: SpanId::from_u64(0), + parent_span_id: SpanId::from(0), span_kind: SpanKind::Internal, name: Cow::Borrowed("test_span"), start_time: now(), diff --git a/opentelemetry-sdk/benches/batch_span_processor.rs b/opentelemetry-sdk/benches/batch_span_processor.rs index d67077d729..3cf4d9cfde 100644 --- a/opentelemetry-sdk/benches/batch_span_processor.rs +++ b/opentelemetry-sdk/benches/batch_span_processor.rs @@ -15,13 +15,13 @@ fn get_span_data() -> Vec { (0..200) .map(|_| SpanData { span_context: SpanContext::new( - TraceId::from_u128(12), - SpanId::from_u64(12), + TraceId::from(12), + SpanId::from(12), TraceFlags::default(), false, TraceState::default(), ), - parent_span_id: SpanId::from_u64(12), + parent_span_id: SpanId::from(12), span_kind: SpanKind::Client, name: Default::default(), start_time: now(), diff --git a/opentelemetry-sdk/src/logs/logger_provider.rs b/opentelemetry-sdk/src/logs/logger_provider.rs index 6a04c7c4fa..1e9a40738a 100644 --- a/opentelemetry-sdk/src/logs/logger_provider.rs +++ b/opentelemetry-sdk/src/logs/logger_provider.rs @@ -607,8 +607,8 @@ mod tests { tracer.in_span("test-span", |cx| { let ambient_ctxt = cx.span().span_context().clone(); let explicit_ctxt = TraceContext { - trace_id: TraceId::from_u128(13), - span_id: SpanId::from_u64(14), + trace_id: TraceId::from(13), + span_id: SpanId::from(14), trace_flags: None, }; diff --git a/opentelemetry-sdk/src/logs/record.rs b/opentelemetry-sdk/src/logs/record.rs index 4c6918ba40..da6d4ac0b2 100644 --- a/opentelemetry-sdk/src/logs/record.rs +++ b/opentelemetry-sdk/src/logs/record.rs @@ -308,8 +308,8 @@ mod tests { #[test] fn compare_trace_context() { let trace_context = TraceContext { - trace_id: TraceId::from_u128(1), - span_id: SpanId::from_u64(1), + trace_id: TraceId::from(1), + span_id: SpanId::from(1), trace_flags: Some(TraceFlags::default()), }; @@ -318,8 +318,8 @@ mod tests { assert_eq!(trace_context, trace_context_cloned); let trace_context_different = TraceContext { - trace_id: TraceId::from_u128(2), - span_id: SpanId::from_u64(2), + trace_id: TraceId::from(2), + span_id: SpanId::from(2), trace_flags: Some(TraceFlags::default()), }; @@ -338,8 +338,8 @@ mod tests { body: Some(AnyValue::String("Test body".into())), attributes: LogRecordAttributes::new(), trace_context: Some(TraceContext { - trace_id: TraceId::from_u128(1), - span_id: SpanId::from_u64(1), + trace_id: TraceId::from(1), + span_id: SpanId::from(1), trace_flags: Some(TraceFlags::default()), }), }; diff --git a/opentelemetry-sdk/src/propagation/trace_context.rs b/opentelemetry-sdk/src/propagation/trace_context.rs index 9094248b69..c615eeb9b3 100644 --- a/opentelemetry-sdk/src/propagation/trace_context.rs +++ b/opentelemetry-sdk/src/propagation/trace_context.rs @@ -164,14 +164,14 @@ mod tests { #[rustfmt::skip] fn extract_data() -> Vec<(&'static str, &'static str, SpanContext)> { vec![ - ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())), - ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), - ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), - ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), - ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-08", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())), - ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-XYZxsf09", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), - ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01-", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), - ("01-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), + ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())), + ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), + ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), + ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), + ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-08", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())), + ("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-XYZxsf09", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), + ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01-", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), + ("01-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), ] } @@ -200,9 +200,9 @@ mod tests { #[rustfmt::skip] fn inject_data() -> Vec<(&'static str, &'static str, SpanContext)> { vec![ - ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), - ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())), - ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::new(0xff), true, TraceState::from_str("foo=bar").unwrap())), + ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())), + ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())), + ("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", "foo=bar", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::new(0xff), true, TraceState::from_str("foo=bar").unwrap())), ("", "", SpanContext::empty_context()), ] } diff --git a/opentelemetry-sdk/src/testing/trace/span_exporters.rs b/opentelemetry-sdk/src/testing/trace/span_exporters.rs index 338383dba9..019df344d4 100644 --- a/opentelemetry-sdk/src/testing/trace/span_exporters.rs +++ b/opentelemetry-sdk/src/testing/trace/span_exporters.rs @@ -14,8 +14,8 @@ use std::fmt::{Display, Formatter}; pub fn new_test_export_span_data() -> SpanData { SpanData { span_context: SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(1), + TraceId::from(1), + SpanId::from(1), TraceFlags::SAMPLED, false, TraceState::default(), diff --git a/opentelemetry-sdk/src/trace/mod.rs b/opentelemetry-sdk/src/trace/mod.rs index 42b299a606..585f65f27d 100644 --- a/opentelemetry-sdk/src/trace/mod.rs +++ b/opentelemetry-sdk/src/trace/mod.rs @@ -352,8 +352,8 @@ mod tests { let mut links = Vec::new(); for _i in 0..(DEFAULT_MAX_LINKS_PER_SPAN * 2) { links.push(Link::with_context(SpanContext::new( - TraceId::from_u128(12), - SpanId::from_u64(12), + TraceId::from(12), + SpanId::from(12), TraceFlags::default(), false, Default::default(), @@ -422,8 +422,8 @@ mod tests { let trace_state = TraceState::from_key_value(vec![("foo", "bar")]).unwrap(); let parent_context = Context::new().with_span(TestSpan(SpanContext::new( - TraceId::from_u128(10000), - SpanId::from_u64(20), + TraceId::from(10000), + SpanId::from(20), TraceFlags::SAMPLED, true, trace_state.clone(), @@ -475,8 +475,8 @@ mod tests { let trace_state = TraceState::from_key_value(vec![("foo", "bar")]).unwrap(); let parent_context = Context::new().with_span(TestSpan(SpanContext::new( - TraceId::from_u128(10000), - SpanId::from_u64(20), + TraceId::from(10000), + SpanId::from(20), TraceFlags::SAMPLED, true, trace_state.clone(), diff --git a/opentelemetry-sdk/src/trace/sampler.rs b/opentelemetry-sdk/src/trace/sampler.rs index 6136a1548a..cd52943deb 100644 --- a/opentelemetry-sdk/src/trace/sampler.rs +++ b/opentelemetry-sdk/src/trace/sampler.rs @@ -311,8 +311,8 @@ mod tests { TraceFlags::default() }; let span_context = SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(1), + TraceId::from(1), + SpanId::from(1), trace_flags, false, TraceState::default(), @@ -366,7 +366,7 @@ mod tests { let result = sampler.should_sample( Some(&cx), - TraceId::from_u128(1), + TraceId::from(1), "should sample", &SpanKind::Internal, &[], @@ -375,7 +375,7 @@ mod tests { let cloned_result = cloned_sampler.should_sample( Some(&cx), - TraceId::from_u128(1), + TraceId::from(1), "should sample", &SpanKind::Internal, &[], @@ -399,8 +399,8 @@ mod tests { "should use parent result, always off", Sampler::AlwaysOn, Context::current_with_span(TestSpan(SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(1), + TraceId::from(1), + SpanId::from(1), TraceFlags::default(), // not sampling false, TraceState::default(), @@ -411,8 +411,8 @@ mod tests { "should use parent result, always on", Sampler::AlwaysOff, Context::current_with_span(TestSpan(SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(1), + TraceId::from(1), + SpanId::from(1), TraceFlags::SAMPLED, // not sampling false, TraceState::default(), @@ -425,7 +425,7 @@ mod tests { let sampler = Sampler::ParentBased(Box::new(delegate)); let result = sampler.should_sample( Some(&parent_cx), - TraceId::from_u128(1), + TraceId::from(1), name, &SpanKind::Internal, &[], diff --git a/opentelemetry-sdk/src/trace/span.rs b/opentelemetry-sdk/src/trace/span.rs index 9b0ae253ce..a036ddd219 100644 --- a/opentelemetry-sdk/src/trace/span.rs +++ b/opentelemetry-sdk/src/trace/span.rs @@ -285,7 +285,7 @@ mod tests { let provider = crate::trace::SdkTracerProvider::default(); let tracer = provider.tracer("opentelemetry"); let data = SpanData { - parent_span_id: SpanId::from_u64(0), + parent_span_id: SpanId::from(0), span_kind: trace::SpanKind::Internal, name: "opentelemetry".into(), start_time: opentelemetry::time::now(), @@ -611,8 +611,8 @@ mod tests { let tracer = provider.tracer("opentelemetry-test"); let mut link = Link::with_context(SpanContext::new( - TraceId::from_u128(12), - SpanId::from_u64(12), + TraceId::from(12), + SpanId::from(12), TraceFlags::default(), false, Default::default(), @@ -645,8 +645,8 @@ mod tests { let mut links = Vec::new(); for _i in 0..(DEFAULT_MAX_LINKS_PER_SPAN * 2) { links.push(Link::with_context(SpanContext::new( - TraceId::from_u128(12), - SpanId::from_u64(12), + TraceId::from(12), + SpanId::from(12), TraceFlags::default(), false, Default::default(), @@ -659,8 +659,8 @@ mod tests { // add links using span api after building the span span.add_link( SpanContext::new( - TraceId::from_u128(12), - SpanId::from_u64(12), + TraceId::from(12), + SpanId::from(12), TraceFlags::default(), false, Default::default(), diff --git a/opentelemetry-sdk/src/trace/tracer.rs b/opentelemetry-sdk/src/trace/tracer.rs index a87147e0c2..2796eddd9a 100644 --- a/opentelemetry-sdk/src/trace/tracer.rs +++ b/opentelemetry-sdk/src/trace/tracer.rs @@ -347,8 +347,8 @@ mod tests { let trace_state = TraceState::from_key_value(vec![("foo", "bar")]).unwrap(); let parent_context = Context::new().with_span(TestSpan(SpanContext::new( - TraceId::from_u128(128), - SpanId::from_u64(64), + TraceId::from(128), + SpanId::from(64), TraceFlags::SAMPLED, true, trace_state, @@ -389,8 +389,8 @@ mod tests { let context = Context::map_current(|cx| { cx.with_remote_span_context(SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(1), + TraceId::from(1), + SpanId::from(1), TraceFlags::default(), true, Default::default(), diff --git a/opentelemetry-zipkin/src/exporter/model/span.rs b/opentelemetry-zipkin/src/exporter/model/span.rs index a39cf6acc9..b0dd074a8f 100644 --- a/opentelemetry-zipkin/src/exporter/model/span.rs +++ b/opentelemetry-zipkin/src/exporter/model/span.rs @@ -147,13 +147,13 @@ mod tests { for (status, status_tag_val, status_msg_tag_val) in get_set_status_test_data() { let span_data = SpanData { span_context: SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(1), + TraceId::from(1), + SpanId::from(1), TraceFlags::default(), false, Default::default(), ), - parent_span_id: SpanId::from_u64(1), + parent_span_id: SpanId::from(1), span_kind: SpanKind::Client, name: "".into(), start_time: now(), diff --git a/opentelemetry-zipkin/src/propagator/mod.rs b/opentelemetry-zipkin/src/propagator/mod.rs index 2ab708399f..8ece2b4d59 100644 --- a/opentelemetry-zipkin/src/propagator/mod.rs +++ b/opentelemetry-zipkin/src/propagator/mod.rs @@ -317,12 +317,12 @@ mod tests { #[rustfmt::skip] fn single_header_extract_data() -> Vec<(&'static str, SpanContext)> { vec![ - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), // deferred - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-0", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // not sampled - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-1", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // sampled - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-d", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEBUG, true, TraceState::default())), // debug - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-1-00000000000000cd", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // with parent span id - ("a3ce929d0e0e4736-00f067aa0ba902b7-1-00000000000000cd", SpanContext::new(TraceId::from_u128(0x0000_0000_0000_0000_a3ce_929d_0e0e_4736), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // padding 64 bit traceID + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), // deferred + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-0", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // not sampled + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-1", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // sampled + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-d", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEBUG, true, TraceState::default())), // debug + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-1-00000000000000cd", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // with parent span id + ("a3ce929d0e0e4736-00f067aa0ba902b7-1-00000000000000cd", SpanContext::new(TraceId::from(0x0000_0000_0000_0000_a3ce_929d_0e0e_4736), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // padding 64 bit traceID ("0", SpanContext::empty_context()), ("-", SpanContext::empty_context()), ] @@ -333,14 +333,14 @@ mod tests { fn multi_header_extract_data() -> Vec<((Option<&'static str>, Option<&'static str>, Option<&'static str>, Option<&'static str>, Option<&'static str>), SpanContext)> { // (TraceId, SpanId, Sampled, FlagId, ParentSpanId) vec![ - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, None, None), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), // deferred - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), None, None), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // not sampled - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("1"), None, None), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // sampled - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("true"), None, None), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("false"), None, None), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // use true/false to set sample - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, Some("1"), None), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEBUG | TraceFlags::SAMPLED, true, TraceState::default())), // debug - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), Some("1"), Some("00f067aa0ba90200")), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEBUG | TraceFlags::SAMPLED, true, TraceState::default())), // debug flag should override sample flag - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("1"), Some("2"), Some("00f067aa0ba90200")), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // invalid debug flag, should ignore + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, None, None), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), // deferred + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), None, None), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // not sampled + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("1"), None, None), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // sampled + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("true"), None, None), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("false"), None, None), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // use true/false to set sample + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, Some("1"), None), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEBUG | TraceFlags::SAMPLED, true, TraceState::default())), // debug + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), Some("1"), Some("00f067aa0ba90200")), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEBUG | TraceFlags::SAMPLED, true, TraceState::default())), // debug flag should override sample flag + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("1"), Some("2"), Some("00f067aa0ba90200")), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), // invalid debug flag, should ignore ((None, None, Some("0"), None, None), SpanContext::empty_context()), ] } @@ -388,19 +388,19 @@ mod tests { // (TraceId, SpanId, Sampled, FlagId, ParentSpanId), b3 vec![ ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, None, None), "4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-0", - SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // single header take precedence - ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), None, None), "-", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // when single header is invalid, fall back to multiple headers - ((Some("0"), Some("0"), Some("0"), None, None), "4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-0", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())) // invalid multiple header should go unnoticed since single header take precedence. + SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // single header take precedence + ((Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), None, None), "-", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), // when single header is invalid, fall back to multiple headers + ((Some("0"), Some("0"), Some("0"), None, None), "4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-0", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())) // invalid multiple header should go unnoticed since single header take precedence. ] } #[rustfmt::skip] fn single_header_inject_data() -> Vec<(&'static str, SpanContext)> { vec![ - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-1", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-d", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEBUG, true, TraceState::default())), - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), - ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-0", SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-1", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-d", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEBUG, true, TraceState::default())), + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), + ("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-0", SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), ("1", SpanContext::new(TraceId::INVALID, SpanId::INVALID, TraceFlags::SAMPLED, true, TraceState::default())), ("0", SpanContext::new(TraceId::INVALID, SpanId::INVALID, TraceFlags::default(), true, TraceState::default())), ] @@ -411,10 +411,10 @@ mod tests { fn multi_header_inject_data() -> Vec<(Option<&'static str>, Option<&'static str>, Option<&'static str>, Option<&'static str>, SpanContext)> { // TraceId, SpanId, isSampled, isDebug vec![ - (Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("1"), None, SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), - (Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, Some("1"), SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEBUG, true, TraceState::default())), - (Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, None, SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), - (Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), None, SpanContext::new(TraceId::from_u128(TRACE_ID_HEX), SpanId::from_u64(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), + (Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("1"), None, SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::SAMPLED, true, TraceState::default())), + (Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, Some("1"), SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEBUG, true, TraceState::default())), + (Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, None, SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TRACE_FLAG_DEFERRED, true, TraceState::default())), + (Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("0"), None, SpanContext::new(TraceId::from(TRACE_ID_HEX), SpanId::from(SPAN_ID_HEX), TraceFlags::default(), true, TraceState::default())), (None, None, Some("0"), None, SpanContext::empty_context()), (None, None, Some("1"), None, SpanContext::new(TraceId::INVALID, SpanId::INVALID, TraceFlags::SAMPLED, true, TraceState::default())) ] @@ -423,8 +423,8 @@ mod tests { #[rustfmt::skip] #[allow(clippy::type_complexity)] fn single_multi_header_inject_data() -> Vec<(Option<&'static str>, Option<&'static str>, Option<&'static str>, Option<&'static str>, Option<&'static str>, SpanContext)> { - let trace_id: TraceId = TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736); - let span_id: SpanId = SpanId::from_u64(0x00f0_67aa_0ba9_02b7); + let trace_id: TraceId = TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736); + let span_id: SpanId = SpanId::from(0x00f0_67aa_0ba9_02b7); vec![ (Some(TRACE_ID_STR), Some(SPAN_ID_STR), Some("1"), None, Some("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-1"), SpanContext::new(trace_id, span_id, TraceFlags::SAMPLED, true, TraceState::default())), // sampled (Some(TRACE_ID_STR), Some(SPAN_ID_STR), None, Some("1"), Some("4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-d"), SpanContext::new(trace_id, span_id, TRACE_FLAG_DEBUG, true, TraceState::default())), // debug diff --git a/opentelemetry/src/propagation/composite.rs b/opentelemetry/src/propagation/composite.rs index f9dc5e1fbc..46b7e67438 100644 --- a/opentelemetry/src/propagation/composite.rs +++ b/opentelemetry/src/propagation/composite.rs @@ -154,8 +154,8 @@ mod tests { fn extract_with_context(&self, cx: &Context, extractor: &dyn Extractor) -> Context { match (self.header, extractor.get(self.header)) { ("span-id", Some(val)) => cx.with_remote_span_context(SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(u64::from_str_radix(val, 16).unwrap()), + TraceId::from(1), + SpanId::from(u64::from_str_radix(val, 16).unwrap()), TraceFlags::default(), false, TraceState::default(), @@ -173,8 +173,8 @@ mod tests { fn setup() -> Context { let mut cx = Context::default(); cx = cx.with_span(TestSpan(SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(11), + TraceId::from(1), + SpanId::from(11), TraceFlags::default(), true, TraceState::default(), @@ -241,8 +241,8 @@ mod tests { assert_eq!( cx.span().span_context(), &SpanContext::new( - TraceId::from_u128(1), - SpanId::from_u64(11), + TraceId::from(1), + SpanId::from(11), TraceFlags::default(), false, TraceState::default(), diff --git a/opentelemetry/src/testing/trace.rs b/opentelemetry/src/testing/trace.rs index d4b5dcfc31..c09b0fefac 100644 --- a/opentelemetry/src/testing/trace.rs +++ b/opentelemetry/src/testing/trace.rs @@ -1,6 +1,6 @@ use crate::{ trace::{Span, SpanContext, Status}, - KeyValue, SpanId, TraceId, + KeyValue, }; use std::borrow::Cow; @@ -34,17 +34,3 @@ impl Span for TestSpan { fn add_link(&mut self, _span_context: SpanContext, _attributes: Vec) {} fn end_with_timestamp(&mut self, _timestamp: std::time::SystemTime) {} } - -/// Helper to create trace ids for testing -impl TraceId { - pub fn from_u128(num: u128) -> Self { - TraceId::from_bytes(num.to_be_bytes()) - } -} - -/// Helper to create span ids for testing -impl SpanId { - pub fn from_u64(num: u64) -> Self { - SpanId::from_bytes(num.to_be_bytes()) - } -} diff --git a/opentelemetry/src/trace/noop.rs b/opentelemetry/src/trace/noop.rs index ffb4717f3a..87196ae704 100644 --- a/opentelemetry/src/trace/noop.rs +++ b/opentelemetry/src/trace/noop.rs @@ -168,8 +168,8 @@ mod tests { fn valid_span_context() -> trace::SpanContext { trace::SpanContext::new( - trace::TraceId::from_u128(42), - trace::SpanId::from_u64(42), + trace::TraceId::from(42), + trace::SpanId::from(42), trace::TraceFlags::default(), true, TraceState::default(),