Skip to content

chore: Remove unwanted from implementation for TraceId and SpanId #3103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2025
Merged

chore: Remove unwanted from implementation for TraceId and SpanId #3103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
709cf1d
chore: Remove unwanted from implementation for TraceId SpanIs
cijothomas Aug 2, 2025
b89c13d
fmt
cijothomas Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions opentelemetry-appender-tracing/src/layer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
41 changes: 19 additions & 22 deletions opentelemetry-jaeger-propagator/src/propagator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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(),
Expand Down Expand Up @@ -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(),
Expand All @@ -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(),
Expand All @@ -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(),
Expand Down Expand Up @@ -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(()));
Expand Down Expand Up @@ -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(),
Expand Down
6 changes: 3 additions & 3 deletions opentelemetry-proto/src/transform/trace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,16 @@ 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(),
);

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(),
Expand Down
6 changes: 3 additions & 3 deletions opentelemetry-sdk/benches/batch_span_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ fn get_span_data() -> Vec<SpanData> {
(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(),
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-sdk/src/logs/logger_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
12 changes: 6 additions & 6 deletions opentelemetry-sdk/src/logs/record.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
};

Expand All @@ -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()),
};

Expand All @@ -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()),
}),
};
Expand Down
22 changes: 11 additions & 11 deletions opentelemetry-sdk/src/propagation/trace_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
]
}

Expand Down Expand Up @@ -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()),
]
}
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry-sdk/src/testing/trace/span_exporters.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
12 changes: 6 additions & 6 deletions opentelemetry-sdk/src/trace/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down
18 changes: 9 additions & 9 deletions opentelemetry-sdk/src/trace/sampler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -366,7 +366,7 @@ mod tests {

let result = sampler.should_sample(
Some(&cx),
TraceId::from_u128(1),
TraceId::from(1),
"should sample",
&SpanKind::Internal,
&[],
Expand All @@ -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,
&[],
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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,
&[],
Expand Down
14 changes: 7 additions & 7 deletions opentelemetry-sdk/src/trace/span.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down
Loading
Loading