From 081b70eaa6edbc9aabe545fc0f63f2c7ed9f6ae8 Mon Sep 17 00:00:00 2001
From: Haojun Cheng <haojun@hioscar.com>
Date: Thu, 23 Oct 2025 14:30:53 -0400
Subject: [PATCH] manually manage the span lifecycle instead of relying context
 manager

---
 .../opentelemetry/instrumentation/grpc/_client.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py
index bbeb4ec1d9..f1dcc4e620 100644
--- a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py
+++ b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py
@@ -200,7 +200,17 @@ def _intercept_server_stream(
         else:
             mutable_metadata = OrderedDict(metadata)
 
-        with self._start_span(client_info.full_method) as span:
+        # Manually manage span lifecycle to avoid context issues with generators
+        span = self._tracer.start_span(
+            name=client_info.full_method,
+            kind=trace.SpanKind.CLIENT,
+            attributes={
+                SpanAttributes.RPC_SYSTEM: "grpc",
+                SpanAttributes.RPC_GRPC_STATUS_CODE: grpc.StatusCode.OK.value[0],
+            },
+        )
+
+        try:
             inject(mutable_metadata, setter=_carrier_setter)
             metadata = tuple(mutable_metadata.items())
             rpc_info = RpcInfo(
@@ -218,6 +228,9 @@ def _intercept_server_stream(
                 span.set_status(Status(StatusCode.ERROR))
                 span.set_attribute(RPC_GRPC_STATUS_CODE, err.code().value[0])
                 raise err
+        finally:
+            span.end()
+
 
     def intercept_stream(
         self, request_or_iterator, metadata, client_info, invoker