Skip to content

Commit fa15073

Browse files
cijothomascijothomas
authored
chore: Remove unwanted from implementation for TraceId and SpanId (#3103)
1 parent eb38eef commit fa15073

File tree

17 files changed

+113
-130
lines changed

17 files changed

+113
-130
lines changed

‎opentelemetry-appender-tracing/src/layer.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,8 @@ mod tests {
674674
assert_eq!(trace_ctx1.span_id, inner_span_id);
675675

676676
// Set context from remote.
677-
let remote_trace_id = TraceId::from_u128(233);
678-
let remote_span_id = SpanId::from_u64(2333);
677+
let remote_trace_id = TraceId::from(233);
678+
let remote_span_id = SpanId::from(2333);
679679
let remote_span_context = SpanContext::new(
680680
remote_trace_id,
681681
remote_span_id,

‎opentelemetry-jaeger-propagator/src/propagator.rs‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ mod tests {
239239
SPAN_ID_STR,
240240
1,
241241
SpanContext::new(
242-
TraceId::from_u128(TRACE_ID),
243-
SpanId::from_u64(SPAN_ID),
242+
TraceId::from(TRACE_ID),
243+
SpanId::from(SPAN_ID),
244244
TraceFlags::SAMPLED,
245245
true,
246246
TraceState::default(),
@@ -251,8 +251,8 @@ mod tests {
251251
SPAN_ID_STR,
252252
1,
253253
SpanContext::new(
254-
TraceId::from_u128(TRACE_ID),
255-
SpanId::from_u64(SPAN_ID),
254+
TraceId::from(TRACE_ID),
255+
SpanId::from(SPAN_ID),
256256
TraceFlags::SAMPLED,
257257
true,
258258
TraceState::default(),
@@ -263,8 +263,8 @@ mod tests {
263263
SHORT_SPAN_ID_STR,
264264
1,
265265
SpanContext::new(
266-
TraceId::from_u128(TRACE_ID),
267-
SpanId::from_u64(SPAN_ID),
266+
TraceId::from(TRACE_ID),
267+
SpanId::from(SPAN_ID),
268268
TraceFlags::SAMPLED,
269269
true,
270270
TraceState::default(),
@@ -275,8 +275,8 @@ mod tests {
275275
SPAN_ID_STR,
276276
3,
277277
SpanContext::new(
278-
TraceId::from_u128(TRACE_ID),
279-
SpanId::from_u64(SPAN_ID),
278+
TraceId::from(TRACE_ID),
279+
SpanId::from(SPAN_ID),
280280
TRACE_FLAG_DEBUG | TraceFlags::SAMPLED,
281281
true,
282282
TraceState::default(),
@@ -287,8 +287,8 @@ mod tests {
287287
SPAN_ID_STR,
288288
0,
289289
SpanContext::new(
290-
TraceId::from_u128(TRACE_ID),
291-
SpanId::from_u64(SPAN_ID),
290+
TraceId::from(TRACE_ID),
291+
SpanId::from(SPAN_ID),
292292
TraceFlags::default(),
293293
true,
294294
TraceState::default(),
@@ -319,8 +319,8 @@ mod tests {
319319
vec![
320320
(
321321
SpanContext::new(
322-
TraceId::from_u128(TRACE_ID),
323-
SpanId::from_u64(SPAN_ID),
322+
TraceId::from(TRACE_ID),
323+
SpanId::from(SPAN_ID),
324324
TraceFlags::SAMPLED,
325325
true,
326326
TraceState::default(),
@@ -329,8 +329,8 @@ mod tests {
329329
),
330330
(
331331
SpanContext::new(
332-
TraceId::from_u128(TRACE_ID),
333-
SpanId::from_u64(SPAN_ID),
332+
TraceId::from(TRACE_ID),
333+
SpanId::from(SPAN_ID),
334334
TraceFlags::default(),
335335
true,
336336
TraceState::default(),
@@ -339,8 +339,8 @@ mod tests {
339339
),
340340
(
341341
SpanContext::new(
342-
TraceId::from_u128(TRACE_ID),
343-
SpanId::from_u64(SPAN_ID),
342+
TraceId::from(TRACE_ID),
343+
SpanId::from(SPAN_ID),
344344
TRACE_FLAG_DEBUG | TraceFlags::SAMPLED,
345345
true,
346346
TraceState::default(),
@@ -550,10 +550,7 @@ mod tests {
550550
#[test]
551551
fn test_extract_span_id() {
552552
let propgator = Propagator::new();
553-
assert_eq!(
554-
propgator.extract_span_id("12345"),
555-
Ok(SpanId::from_u64(74565))
556-
);
553+
assert_eq!(propgator.extract_span_id("12345"), Ok(SpanId::from(74565)));
557554

558555
// Fail to extract span id with an invalid hex-string
559556
assert_eq!(propgator.extract_span_id("invalid"), Err(()));
@@ -683,8 +680,8 @@ mod tests {
683680
assert_eq!(
684681
context.span().span_context(),
685682
&SpanContext::new(
686-
TraceId::from_u128(TRACE_ID),
687-
SpanId::from_u64(SPAN_ID),
683+
TraceId::from(TRACE_ID),
684+
SpanId::from(SPAN_ID),
688685
TraceFlags::SAMPLED,
689686
true,
690687
TraceState::default(),

‎opentelemetry-proto/src/transform/trace.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,16 @@ mod tests {
209209

210210
fn create_test_span_data(instrumentation_name: &'static str) -> SpanData {
211211
let span_context = SpanContext::new(
212-
TraceId::from_u128(123),
213-
SpanId::from_u64(456),
212+
TraceId::from(123),
213+
SpanId::from(456),
214214
TraceFlags::default(),
215215
false,
216216
TraceState::default(),
217217
);
218218

219219
SpanData {
220220
span_context,
221-
parent_span_id: SpanId::from_u64(0),
221+
parent_span_id: SpanId::from(0),
222222
span_kind: SpanKind::Internal,
223223
name: Cow::Borrowed("test_span"),
224224
start_time: now(),

‎opentelemetry-sdk/benches/batch_span_processor.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ fn get_span_data() -> Vec<SpanData> {
1515
(0..200)
1616
.map(|_| SpanData {
1717
span_context: SpanContext::new(
18-
TraceId::from_u128(12),
19-
SpanId::from_u64(12),
18+
TraceId::from(12),
19+
SpanId::from(12),
2020
TraceFlags::default(),
2121
false,
2222
TraceState::default(),
2323
),
24-
parent_span_id: SpanId::from_u64(12),
24+
parent_span_id: SpanId::from(12),
2525
span_kind: SpanKind::Client,
2626
name: Default::default(),
2727
start_time: now(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,8 @@ mod tests {
607607
tracer.in_span("test-span", |cx| {
608608
let ambient_ctxt = cx.span().span_context().clone();
609609
let explicit_ctxt = TraceContext {
610-
trace_id: TraceId::from_u128(13),
611-
span_id: SpanId::from_u64(14),
610+
trace_id: TraceId::from(13),
611+
span_id: SpanId::from(14),
612612
trace_flags: None,
613613
};
614614

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ mod tests {
308308
#[test]
309309
fn compare_trace_context() {
310310
let trace_context = TraceContext {
311-
trace_id: TraceId::from_u128(1),
312-
span_id: SpanId::from_u64(1),
311+
trace_id: TraceId::from(1),
312+
span_id: SpanId::from(1),
313313
trace_flags: Some(TraceFlags::default()),
314314
};
315315

@@ -318,8 +318,8 @@ mod tests {
318318
assert_eq!(trace_context, trace_context_cloned);
319319

320320
let trace_context_different = TraceContext {
321-
trace_id: TraceId::from_u128(2),
322-
span_id: SpanId::from_u64(2),
321+
trace_id: TraceId::from(2),
322+
span_id: SpanId::from(2),
323323
trace_flags: Some(TraceFlags::default()),
324324
};
325325

@@ -338,8 +338,8 @@ mod tests {
338338
body: Some(AnyValue::String("Test body".into())),
339339
attributes: LogRecordAttributes::new(),
340340
trace_context: Some(TraceContext {
341-
trace_id: TraceId::from_u128(1),
342-
span_id: SpanId::from_u64(1),
341+
trace_id: TraceId::from(1),
342+
span_id: SpanId::from(1),
343343
trace_flags: Some(TraceFlags::default()),
344344
}),
345345
};

‎opentelemetry-sdk/src/propagation/trace_context.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@ mod tests {
164164
#[rustfmt::skip]
165165
fn extract_data() -> Vec<(&'static str, &'static str, SpanContext)> {
166166
vec![
167-
("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())),
168-
("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())),
169-
("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())),
170-
("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())),
171-
("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())),
172-
("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())),
173-
("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())),
174-
("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())),
167+
("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())),
168+
("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())),
169+
("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())),
170+
("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())),
171+
("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())),
172+
("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())),
173+
("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())),
174+
("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())),
175175
]
176176
}
177177

@@ -200,9 +200,9 @@ mod tests {
200200
#[rustfmt::skip]
201201
fn inject_data() -> Vec<(&'static str, &'static str, SpanContext)> {
202202
vec![
203-
("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())),
204-
("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())),
205-
("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())),
203+
("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())),
204+
("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())),
205+
("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())),
206206
("", "", SpanContext::empty_context()),
207207
]
208208
}

‎opentelemetry-sdk/src/testing/trace/span_exporters.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use std::fmt::{Display, Formatter};
1414
pub fn new_test_export_span_data() -> SpanData {
1515
SpanData {
1616
span_context: SpanContext::new(
17-
TraceId::from_u128(1),
18-
SpanId::from_u64(1),
17+
TraceId::from(1),
18+
SpanId::from(1),
1919
TraceFlags::SAMPLED,
2020
false,
2121
TraceState::default(),

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ mod tests {
352352
let mut links = Vec::new();
353353
for _i in 0..(DEFAULT_MAX_LINKS_PER_SPAN * 2) {
354354
links.push(Link::with_context(SpanContext::new(
355-
TraceId::from_u128(12),
356-
SpanId::from_u64(12),
355+
TraceId::from(12),
356+
SpanId::from(12),
357357
TraceFlags::default(),
358358
false,
359359
Default::default(),
@@ -422,8 +422,8 @@ mod tests {
422422
let trace_state = TraceState::from_key_value(vec![("foo", "bar")]).unwrap();
423423

424424
let parent_context = Context::new().with_span(TestSpan(SpanContext::new(
425-
TraceId::from_u128(10000),
426-
SpanId::from_u64(20),
425+
TraceId::from(10000),
426+
SpanId::from(20),
427427
TraceFlags::SAMPLED,
428428
true,
429429
trace_state.clone(),
@@ -475,8 +475,8 @@ mod tests {
475475
let trace_state = TraceState::from_key_value(vec![("foo", "bar")]).unwrap();
476476

477477
let parent_context = Context::new().with_span(TestSpan(SpanContext::new(
478-
TraceId::from_u128(10000),
479-
SpanId::from_u64(20),
478+
TraceId::from(10000),
479+
SpanId::from(20),
480480
TraceFlags::SAMPLED,
481481
true,
482482
trace_state.clone(),

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ mod tests {
311311
TraceFlags::default()
312312
};
313313
let span_context = SpanContext::new(
314-
TraceId::from_u128(1),
315-
SpanId::from_u64(1),
314+
TraceId::from(1),
315+
SpanId::from(1),
316316
trace_flags,
317317
false,
318318
TraceState::default(),
@@ -366,7 +366,7 @@ mod tests {
366366

367367
let result = sampler.should_sample(
368368
Some(&cx),
369-
TraceId::from_u128(1),
369+
TraceId::from(1),
370370
"should sample",
371371
&SpanKind::Internal,
372372
&[],
@@ -375,7 +375,7 @@ mod tests {
375375

376376
let cloned_result = cloned_sampler.should_sample(
377377
Some(&cx),
378-
TraceId::from_u128(1),
378+
TraceId::from(1),
379379
"should sample",
380380
&SpanKind::Internal,
381381
&[],
@@ -399,8 +399,8 @@ mod tests {
399399
"should use parent result, always off",
400400
Sampler::AlwaysOn,
401401
Context::current_with_span(TestSpan(SpanContext::new(
402-
TraceId::from_u128(1),
403-
SpanId::from_u64(1),
402+
TraceId::from(1),
403+
SpanId::from(1),
404404
TraceFlags::default(), // not sampling
405405
false,
406406
TraceState::default(),
@@ -411,8 +411,8 @@ mod tests {
411411
"should use parent result, always on",
412412
Sampler::AlwaysOff,
413413
Context::current_with_span(TestSpan(SpanContext::new(
414-
TraceId::from_u128(1),
415-
SpanId::from_u64(1),
414+
TraceId::from(1),
415+
SpanId::from(1),
416416
TraceFlags::SAMPLED, // not sampling
417417
false,
418418
TraceState::default(),
@@ -425,7 +425,7 @@ mod tests {
425425
let sampler = Sampler::ParentBased(Box::new(delegate));
426426
let result = sampler.should_sample(
427427
Some(&parent_cx),
428-
TraceId::from_u128(1),
428+
TraceId::from(1),
429429
name,
430430
&SpanKind::Internal,
431431
&[],

0 commit comments

Comments
 (0)