Avoid calls to context.detach with None token (#3673)

* fixes #3351

* Add changelog entry about #3673

---------

Co-authored-by: Emídio Neto <[email protected]>
Co-authored-by: Riccardo Magliocchetti <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+
+- `opentelemetry-instrumentation`: Avoid calls to `context.detach` with `None` token.
+  ([#3673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3673))
+
 ## Version 1.36.0/0.57b0 (2025-07-29)
 
 ### Fixed

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/callback_decorator.py

@@ -53,7 +53,8 @@ async def decorated(message: AbstractIncomingMessage):
                 with trace.use_span(span, end_on_exit=True):
                     return_value = await callback(message)
             finally:
-                context.detach(token)
+                if token:
+                    context.detach(token)
             return return_value
 
         return decorated

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -273,7 +273,8 @@ def create_trace_config(
 
     def _end_trace(trace_config_ctx: types.SimpleNamespace):
         elapsed_time = max(default_timer() - trace_config_ctx.start_time, 0)
-        context_api.detach(trace_config_ctx.token)
+        if trace_config_ctx.token:
+            context_api.detach(trace_config_ctx.token)
         trace_config_ctx.span.end()
 
         if trace_config_ctx.duration_histogram_old is not None:

instrumentation/opentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/utils.py

@@ -490,7 +490,8 @@ async def _create_consumer_span(
                 await async_consume_hook(span, record, args, kwargs)
         except Exception as hook_exception:  # pylint: disable=W0703
             _LOG.exception(hook_exception)
-        context.detach(token)
+        if token:
+            context.detach(token)
 
     return span
 

instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py

@@ -384,7 +384,8 @@ def _instrumented_lambda_handler_call(  # noqa pylint: disable=too-many-branches
                             result.get("statusCode"),
                         )
         finally:
-            context_api.detach(token)
+            if token:
+                context_api.detach(token)
 
         now = time.time()
         _tracer_provider = tracer_provider or get_tracer_provider()

instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/__init__.py

@@ -180,8 +180,9 @@ def _safe_end_processing_span(receipt_handle: str) -> None:
                 Boto3SQSInstrumentor.current_span_related_to_token
                 == started_span
             ):
-                context.detach(Boto3SQSInstrumentor.current_context_token)
-                Boto3SQSInstrumentor.current_context_token = None
+                if Boto3SQSInstrumentor.current_context_token:
+                    context.detach(Boto3SQSInstrumentor.current_context_token)
+                    Boto3SQSInstrumentor.current_context_token = None
             started_span.end()
 
     @staticmethod

instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/utils.py

@@ -82,7 +82,8 @@ def set(self, carrier: textmap.CarrierT, key: str, value: str) -> None:
 
 
 def _end_current_consume_span(instance):
-    context.detach(instance._current_context_token)
+    if instance._current_context_token:
+        context.detach(instance._current_context_token)
     instance._current_context_token = None
     instance._current_consume_span.end()
     instance._current_consume_span = None

instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py

@@ -209,7 +209,8 @@ def _set_remote_context(self, servicer_context):
             try:
                 yield
             finally:
-                detach(token)
+                if token:
+                    detach(token)
         else:
             yield
 

instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry/instrumentation/kafka/utils.py

@@ -196,7 +196,8 @@ def _create_consumer_span(
                 consume_hook(span, record, args, kwargs)
         except Exception as hook_exception:  # pylint: disable=W0703
             _LOG.exception(hook_exception)
-        context.detach(token)
+        if token:
+            context.detach(token)
 
 
 def _wrap_next(

instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py

@@ -80,7 +80,8 @@ def decorated_callback(
                     _LOG.exception(hook_exception)
                 retval = callback(channel, method, properties, body)
         finally:
-            context.detach(token)
+            if token:
+                context.detach(token)
         return retval
 
     return decorated_callback
@@ -252,7 +253,8 @@ def popleft(self, *args, **kwargs):
                     operation=MessagingOperationValues.RECEIVE,
                 )
                 try:
-                    context.detach(message_ctx_token)
+                    if message_ctx_token:
+                        context.detach(message_ctx_token)
                     self._self_active_token = context.attach(
                         trace.set_span_in_context(span)
                     )