File tree 5 files changed +13
-13
lines changed
opentelemetry-api/src/trace
opentelemetry-contrib/src/trace/propagator/binary
opentelemetry-datadog/src
opentelemetry-sdk/src/trace 5 files changed +13
-13
lines changed Original file line number Diff line number Diff line change @@ -120,9 +120,9 @@ impl TraceId {
120
120
}
121
121
}
122
122
123
- impl From < [ u8 ; 16 ] > for TraceId {
124
- fn from ( bytes : [ u8 ; 16 ] ) -> Self {
125
- TraceId :: from_bytes ( bytes )
123
+ impl From < u128 > for TraceId {
124
+ fn from ( value : u128 ) -> Self {
125
+ TraceId ( value )
126
126
}
127
127
}
128
128
@@ -181,9 +181,9 @@ impl SpanId {
181
181
}
182
182
}
183
183
184
- impl From < [ u8 ; 8 ] > for SpanId {
185
- fn from ( bytes : [ u8 ; 8 ] ) -> Self {
186
- SpanId :: from_bytes ( bytes )
184
+ impl From < u64 > for SpanId {
185
+ fn from ( value : u64 ) -> Self {
186
+ SpanId ( value )
187
187
}
188
188
}
189
189
Original file line number Diff line number Diff line change @@ -69,8 +69,8 @@ impl BinaryFormat for BinaryPropagator {
69
69
}
70
70
71
71
let span_context = SpanContext :: new (
72
- TraceId :: from ( trace_id) ,
73
- SpanId :: from ( span_id) ,
72
+ TraceId :: from_bytes ( trace_id) ,
73
+ SpanId :: from_bytes ( span_id) ,
74
74
TraceFlags :: new ( trace_flags) ,
75
75
true ,
76
76
// TODO traceparent and tracestate should both begin with a 0 byte, figure out how to differentiate
Original file line number Diff line number Diff line change @@ -201,14 +201,14 @@ mod propagator {
201
201
fn extract_trace_id ( & self , trace_id : & str ) -> Result < TraceId , ExtractError > {
202
202
trace_id
203
203
. parse :: < u64 > ( )
204
- . map ( |id| TraceId :: from ( ( id as u128 ) . to_be_bytes ( ) ) )
204
+ . map ( |id| TraceId :: from ( id as u128 ) )
205
205
. map_err ( |_| ExtractError :: TraceId )
206
206
}
207
207
208
208
fn extract_span_id ( & self , span_id : & str ) -> Result < SpanId , ExtractError > {
209
209
span_id
210
210
. parse :: < u64 > ( )
211
- . map ( |id| SpanId :: from ( id . to_be_bytes ( ) ) )
211
+ . map ( SpanId :: from)
212
212
. map_err ( |_| ExtractError :: SpanId )
213
213
}
214
214
Original file line number Diff line number Diff line change @@ -25,11 +25,11 @@ pub struct RandomIdGenerator {
25
25
26
26
impl IdGenerator for RandomIdGenerator {
27
27
fn new_trace_id ( & self ) -> TraceId {
28
- CURRENT_RNG . with ( |rng| TraceId :: from ( rng. borrow_mut ( ) . gen :: < [ u8 ; 16 ] > ( ) ) )
28
+ CURRENT_RNG . with ( |rng| TraceId :: from ( rng. borrow_mut ( ) . gen :: < u128 > ( ) ) )
29
29
}
30
30
31
31
fn new_span_id ( & self ) -> SpanId {
32
- CURRENT_RNG . with ( |rng| SpanId :: from ( rng. borrow_mut ( ) . gen :: < [ u8 ; 8 ] > ( ) ) )
32
+ CURRENT_RNG . with ( |rng| SpanId :: from ( rng. borrow_mut ( ) . gen :: < u64 > ( ) ) )
33
33
}
34
34
}
35
35
Original file line number Diff line number Diff line change @@ -326,7 +326,7 @@ mod tests {
326
326
None
327
327
} ;
328
328
329
- let trace_id = TraceId :: from ( rng. gen :: < [ u8 ; 16 ] > ( ) ) ;
329
+ let trace_id = TraceId :: from ( rng. gen :: < u128 > ( ) ) ;
330
330
if sampler
331
331
. should_sample (
332
332
parent_context. as_ref ( ) ,
You can’t perform that action at this time.
0 commit comments