@@ -456,26 +456,18 @@ def set_multi_modality_map(self, key: str):
456456 self .multi_modality_key_map [key ] = True
457457
458458 def set_baggage (self , baggage_item : Dict [str , str ]):
459- if not baggage_item :
460- return
461- self .set_baggage_escape (baggage_item , True )
462-
463- def set_baggage_escape (self , baggage_item : Dict [str , str ], escape : bool ):
464459 if not baggage_item :
465460 return
466461 try :
467462 for key , value in baggage_item .items ():
468463 if self .is_valid_baggage_item (key , value ):
469464 self .set_tags ({key : value })
470- if escape :
471- key = urllib .parse .quote (key )
472- value = urllib .parse .quote (value )
473465 self .set_baggage_item (key , value )
474466 else :
475467 logger .error (f"[trace] invalid baggageItem:{ key } :{ value } " )
476468 pass
477469 except Exception as e :
478- logger .error (f"Failed to set_baggage_escape : { e } " )
470+ logger .error (f"Failed to set_baggage : { e } " )
479471
480472 def is_valid_baggage_item (self , key : str , value : str ) -> bool :
481473 key_limit = get_tag_key_size_limit ()
@@ -565,7 +557,7 @@ def to_header(self) -> Dict[str, str]:
565557 def to_header_baggage (self ) -> str :
566558 if not self .baggage :
567559 return ""
568- return "," .join (f"{ k } ={ v } " for k , v in self .baggage ().items () if k and v )
560+ return "," .join (f"{ urllib . parse . quote ( k ) } ={ urllib . parse . quote ( v ) } " for k , v in self .baggage ().items () if k and v )
569561
570562 def to_header_parent (self ) -> str :
571563 return f"{ GLOBAL_TRACE_VERSION :02x} -{ self .trace_id } -{ self .span_id } -{ self .flags :02x} "
0 commit comments