From a7c565d9c862a4299b221c340628e3bde21d7c12 Mon Sep 17 00:00:00 2001 From: Lalit Date: Thu, 24 Oct 2024 23:47:59 -0700 Subject: [PATCH 1/2] initial commit --- .../src/propagator.rs | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/opentelemetry-jaeger-propagator/src/propagator.rs b/opentelemetry-jaeger-propagator/src/propagator.rs index 4dbd0b16fc..4bf7220c6b 100644 --- a/opentelemetry-jaeger-propagator/src/propagator.rs +++ b/opentelemetry-jaeger-propagator/src/propagator.rs @@ -1,8 +1,7 @@ -use opentelemetry::propagation::PropagationError; use opentelemetry::{ - global::{self, Error}, + otel_error, propagation::{text_map_propagator::FieldIter, Extractor, Injector, TextMapPropagator}, - trace::{SpanContext, SpanId, TraceContextExt, TraceError, TraceFlags, TraceId, TraceState}, + trace::{SpanContext, SpanId, TraceContextExt, TraceFlags, TraceId, TraceState}, Context, }; use std::borrow::Cow; @@ -82,10 +81,11 @@ impl Propagator { let parts = header_value.split_terminator(':').collect::>(); if parts.len() != 4 { - global::handle_error(Error::Propagation(PropagationError::extract( - "invalid jaeger header format", - "JaegerPropagator", - ))); + otel_error!( + name: "JaegerPropagator.InvalidHeader", + message = "Invalid jaeger header format", + header_value = header_value.to_string(), + ); return None; } @@ -100,10 +100,11 @@ impl Propagator { Some(SpanContext::new(trace_id, span_id, flags, true, state)) } _ => { - global::handle_error(Error::Propagation(PropagationError::extract( - "invalid jaeger header format", - "JaegerPropagator", - ))); + otel_error!( + name: "JaegerPropagator.InvalidHeader", + message = "Invalid jaeger header format", + header_value = header_value.to_string(), + ); None } } @@ -171,7 +172,11 @@ impl Propagator { match TraceState::from_key_value(baggage_keys) { Ok(trace_state) => Ok(trace_state), Err(trace_state_err) => { - global::handle_error(Error::Trace(TraceError::Other(Box::new(trace_state_err)))); + otel_error!( + name: "JaegerPropagator.InvalidTraceState", + message = "Invalid trace state", + reason = format!("{:?}", trace_state_err), + ); Err(()) //todo: assign an error type instead of using () } } From 2942bbdc852000a86551782c9b06ccca8b25c152 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Fri, 25 Oct 2024 22:21:36 -0700 Subject: [PATCH 2/2] Update propagator.rs --- opentelemetry-jaeger-propagator/src/propagator.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opentelemetry-jaeger-propagator/src/propagator.rs b/opentelemetry-jaeger-propagator/src/propagator.rs index 4bf7220c6b..dfbbf3b05d 100644 --- a/opentelemetry-jaeger-propagator/src/propagator.rs +++ b/opentelemetry-jaeger-propagator/src/propagator.rs @@ -1,5 +1,5 @@ use opentelemetry::{ - otel_error, + otel_warn, propagation::{text_map_propagator::FieldIter, Extractor, Injector, TextMapPropagator}, trace::{SpanContext, SpanId, TraceContextExt, TraceFlags, TraceId, TraceState}, Context, @@ -81,7 +81,7 @@ impl Propagator { let parts = header_value.split_terminator(':').collect::>(); if parts.len() != 4 { - otel_error!( + otel_warn!( name: "JaegerPropagator.InvalidHeader", message = "Invalid jaeger header format", header_value = header_value.to_string(), @@ -100,7 +100,7 @@ impl Propagator { Some(SpanContext::new(trace_id, span_id, flags, true, state)) } _ => { - otel_error!( + otel_warn!( name: "JaegerPropagator.InvalidHeader", message = "Invalid jaeger header format", header_value = header_value.to_string(), @@ -172,7 +172,7 @@ impl Propagator { match TraceState::from_key_value(baggage_keys) { Ok(trace_state) => Ok(trace_state), Err(trace_state_err) => { - otel_error!( + otel_warn!( name: "JaegerPropagator.InvalidTraceState", message = "Invalid trace state", reason = format!("{:?}", trace_state_err),