Skip to content

Commit 7050530

Browse files
committed
test(otel-thread-ctx): use more realistic, non-repeating span ids
1 parent 3cdfee9 commit 7050530

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

libdd-profiling/src/otel_thread_ctx.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -553,11 +553,11 @@ pub mod linux {
553553
#[cfg_attr(miri, ignore)]
554554
fn update_record_in_place() {
555555
let trace_id1 = [1u8; 16];
556-
let span_id1 = [1u8; 8];
557-
let root_span_id1 = [0x78u8; 8];
556+
let span_id1 = [0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78];
557+
let root_span_id1 = [0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F];
558558
let trace_id2 = [2u8; 16];
559-
let span_id2 = [2u8; 8];
560-
let root_span_id2 = [0x79u8; 8];
559+
let span_id2 = [0x0A, 0x1B, 0x2C, 0x3D, 0x4E, 0x5F, 0x6A, 0x7B];
560+
let root_span_id2 = [0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80];
561561

562562
// Updating before any context is attached should be equivalent to `attach()`
563563
ThreadContext::update(trace_id1, span_id1, root_span_id1, &[(0, "v1")]);
@@ -570,7 +570,7 @@ pub mod linux {
570570
assert_eq!(record.valid.load(Ordering::Relaxed), 1);
571571
assert_eq!(record.attrs_data[0], 0);
572572
assert_eq!(record.attrs_data[1], 16);
573-
assert_eq!(&record.attrs_data[2..18], b"7878787878787878");
573+
assert_eq!(&record.attrs_data[2..18], b"78797a7b7c7d7e7f");
574574
assert_eq!(record.attrs_data[18], 0);
575575
assert_eq!(record.attrs_data[19], 2);
576576
assert_eq!(&record.attrs_data[20..22], b"v1");
@@ -589,7 +589,7 @@ pub mod linux {
589589
assert_eq!(record.valid.load(Ordering::Relaxed), 1);
590590
assert_eq!(record.attrs_data[0], 0);
591591
assert_eq!(record.attrs_data[1], 16);
592-
assert_eq!(&record.attrs_data[2..18], b"7979797979797979");
592+
assert_eq!(&record.attrs_data[2..18], b"797a7b7c7d7e7f80");
593593
assert_eq!(record.attrs_data[18], 0);
594594
assert_eq!(record.attrs_data[19], 2);
595595
assert_eq!(&record.attrs_data[20..22], b"v2");
@@ -640,11 +640,11 @@ pub mod linux {
640640
let b = barrier.clone();
641641

642642
let spawned_trace_id = [0xABu8; 16];
643-
let spawned_span_id = [0xCDu8; 8];
644-
let spawned_root_span_id = [0xEFu8; 8];
643+
let spawned_span_id = [0xCD, 0xBC, 0xAB, 0x9A, 0x89, 0x78, 0x67, 0x56];
644+
let spawned_root_span_id = [0xEF, 0xDE, 0xCD, 0xBC, 0xAB, 0x9A, 0x89, 0x78];
645645
let main_trace_id = [0x11u8; 16];
646-
let main_span_id = [0x22u8; 8];
647-
let main_root_span_id = [0x33u8; 8];
646+
let main_span_id = [0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99];
647+
let main_root_span_id = [0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA];
648648

649649
let handle = std::thread::spawn(move || {
650650
ThreadContext::new(spawned_trace_id, spawned_span_id, spawned_root_span_id, &[])
@@ -661,7 +661,7 @@ pub mod linux {
661661
let record = unsafe { &*ptr };
662662
assert_eq!(record.trace_id, spawned_trace_id);
663663
assert_eq!(record.span_id, spawned_span_id);
664-
assert_eq!(&record.attrs_data[2..18], b"efefefefefefefef");
664+
assert_eq!(&record.attrs_data[2..18], b"efdecdbcab9a8978");
665665

666666
let _ = ThreadContext::detach();
667667
assert!(read_tls_context_ptr().is_null());
@@ -682,7 +682,7 @@ pub mod linux {
682682
let record = unsafe { &*ptr };
683683
assert_eq!(record.trace_id, main_trace_id);
684684
assert_eq!(record.span_id, main_span_id);
685-
assert_eq!(&record.attrs_data[2..18], b"3333333333333333");
685+
assert_eq!(&record.attrs_data[2..18], b"33445566778899aa");
686686

687687
barrier.wait();
688688

0 commit comments

Comments
 (0)