@@ -60,6 +60,8 @@ use ingestion::job_runner::JobRunner;
6060use itertools:: Itertools ;
6161use log:: { debug, error, info, warn} ;
6262use mockall:: automock;
63+ use opentelemetry:: trace:: { SpanContext , SpanId , TraceContextExt , TraceFlags , TraceId } ;
64+ use opentelemetry:: Context as OtelContext ;
6365use regex:: Regex ;
6466use serde:: { Deserialize , Serialize } ;
6567use std:: collections:: hash_map:: DefaultHasher ;
@@ -77,10 +79,6 @@ use tokio::time::timeout;
7779use tokio_util:: sync:: CancellationToken ;
7880use tracing:: { instrument, Instrument } ;
7981use tracing_opentelemetry:: OpenTelemetrySpanExt ;
80- use opentelemetry:: trace:: {
81- SpanContext , SpanId , TraceContextExt , TraceFlags , TraceId ,
82- } ;
83- use opentelemetry:: { Context as OtelContext } ;
8482
8583#[ automock]
8684#[ async_trait]
@@ -338,34 +336,30 @@ impl WorkerProcessing for WorkerProcessor {
338336 . to_lowercase ( )
339337 . as_str ( )
340338 {
341- "otel" => {
342- trace_id_and_span_id. map ( |( t, s) | {
343- let trace_id = TraceId :: from ( t) ;
344- let span_id = SpanId :: from ( s) ;
345- let span_context = SpanContext :: new (
346- trace_id,
347- span_id,
348- TraceFlags :: SAMPLED ,
349- true ,
350- Default :: default ( ) ,
351- ) ;
352-
353- let context = OtelContext :: new ( ) . with_remote_span_context ( span_context) ;
354- let span = tracing:: info_span!( "Process on select worker" ) ;
355-
356- span. set_parent ( context) ;
357- span
358- } )
359- } ,
360- _ => {
361- trace_id_and_span_id. map ( |( t, s) | {
362- tracing:: info_span!(
363- "Process on select worker" ,
364- cube_dd_trace_id = t,
365- cube_dd_parent_span_id = s
366- )
367- } )
368- }
339+ "otel" => trace_id_and_span_id. map ( |( t, s) | {
340+ let trace_id = TraceId :: from ( t) ;
341+ let span_id = SpanId :: from ( s) ;
342+ let span_context = SpanContext :: new (
343+ trace_id,
344+ span_id,
345+ TraceFlags :: SAMPLED ,
346+ true ,
347+ Default :: default ( ) ,
348+ ) ;
349+
350+ let context = OtelContext :: new ( ) . with_remote_span_context ( span_context) ;
351+ let span = tracing:: info_span!( "Process on select worker" ) ;
352+
353+ span. set_parent ( context) ;
354+ span
355+ } ) ,
356+ _ => trace_id_and_span_id. map ( |( t, s) | {
357+ tracing:: info_span!(
358+ "Process on select worker" ,
359+ cube_dd_trace_id = t,
360+ cube_dd_parent_span_id = s
361+ )
362+ } ) ,
369363 } ;
370364
371365 if let Some ( span) = span {
0 commit comments