@@ -130,14 +130,11 @@ def on_start(self, otel_span, parent_context=None):
130130 if self ._is_sentry_span (otel_span ):
131131 return
132132
133- if parent_context is None :
134- return
135-
136133 trace_data = self ._get_trace_data (otel_span , parent_context )
137134
138135 parent_span_id = trace_data ["parent_span_id" ]
139136 sentry_parent_span = (
140- self .otel_span_map .get (parent_span_id , None ) if parent_span_id else None
137+ self .otel_span_map .get (parent_span_id ) if parent_span_id else None
141138 )
142139
143140 start_timestamp = None
@@ -261,7 +258,7 @@ def _get_otel_context(self, otel_span):
261258 return ctx
262259
263260 def _get_trace_data (self , otel_span , parent_context ):
264- # type: (OTelSpan, context_api.Context) -> dict[str, Any]
261+ # type: (OTelSpan, Optional[ context_api.Context] ) -> dict[str, Any]
265262 """
266263 Extracts tracing information from one OTel span and its parent OTel context.
267264 """
@@ -279,14 +276,17 @@ def _get_trace_data(self, otel_span, parent_context):
279276 )
280277 trace_data ["parent_span_id" ] = parent_span_id
281278
282- sentry_trace_data = get_value (SENTRY_TRACE_KEY , parent_context )
283- sentry_trace_data = cast ("dict[str, Union[str, bool, None]]" , sentry_trace_data )
284- trace_data ["parent_sampled" ] = (
285- sentry_trace_data ["parent_sampled" ] if sentry_trace_data else None
286- )
279+ if parent_context is not None :
280+ sentry_trace_data = get_value (SENTRY_TRACE_KEY , parent_context )
281+ sentry_trace_data = cast (
282+ "dict[str, Union[str, bool, None]]" , sentry_trace_data
283+ )
284+ trace_data ["parent_sampled" ] = (
285+ sentry_trace_data ["parent_sampled" ] if sentry_trace_data else None
286+ )
287287
288- baggage = get_value (SENTRY_BAGGAGE_KEY , parent_context )
289- trace_data ["baggage" ] = baggage
288+ baggage = get_value (SENTRY_BAGGAGE_KEY , parent_context )
289+ trace_data ["baggage" ] = baggage
290290
291291 return trace_data
292292
0 commit comments