refactor: move tracer to generator, clean up dead code

Author: keith-decker

util/opentelemetry-util-genai/src/opentelemetry/util/genai/generators.py

@@ -31,31 +31,26 @@
     follow the GenAI semantic conventions.
 """
 
-from contextvars import Token
-from typing import Dict, Optional
-from uuid import UUID
-
-from typing_extensions import TypeAlias
+from typing import Any
 
 from opentelemetry import context as otel_context
 from opentelemetry import trace
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes as GenAI,
 )
+from opentelemetry.semconv.schemas import Schemas
 from opentelemetry.trace import (
-    Span,
     SpanKind,
     Tracer,
+    get_tracer,
     set_span_in_context,
 )
 from opentelemetry.util.genai.span_utils import (
     _apply_error_attributes,
     _apply_finish_attributes,
 )
 from opentelemetry.util.genai.types import Error, LLMInvocation
-
-# Type alias matching the token type expected by opentelemetry.context.detach
-ContextToken: TypeAlias = Token[otel_context.Context]
+from opentelemetry.util.genai.version import __version__
 
 
 class BaseTelemetryGenerator:
@@ -80,13 +75,17 @@ class SpanGenerator(BaseTelemetryGenerator):
 
     def __init__(
         self,
-        tracer: Optional[Tracer] = None,
+        **kwargs: Any,
     ):
+        tracer_provider = kwargs.get("tracer_provider")
+        tracer = get_tracer(
+            __name__,
+            __version__,
+            tracer_provider,
+            schema_url=Schemas.V1_36_0.value,
+        )
         self._tracer: Tracer = tracer or trace.get_tracer(__name__)
 
-        # Store the active span and its context attachment token
-        self._active: Dict[UUID, tuple[Span, ContextToken]] = {}
-
     def start(self, invocation: LLMInvocation):
         # Create a span and attach it as current; keep the token to detach later
         if not (invocation.request_model and invocation.request_model.strip()):

util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py

@@ -54,11 +54,8 @@
 from contextlib import contextmanager
 from typing import Any, Iterator, Optional
 
-from opentelemetry.semconv.schemas import Schemas
-from opentelemetry.trace import get_tracer
 from opentelemetry.util.genai.generators import SpanGenerator
 from opentelemetry.util.genai.types import Error, LLMInvocation
-from opentelemetry.util.genai.version import __version__
 
 
 class TelemetryHandler:
@@ -68,15 +65,7 @@ class TelemetryHandler:
     """
 
     def __init__(self, **kwargs: Any):
-        tracer_provider = kwargs.get("tracer_provider")
-        self._tracer = get_tracer(
-            __name__,
-            __version__,
-            tracer_provider,
-            schema_url=Schemas.V1_36_0.value,
-        )
-
-        self._generator = SpanGenerator(tracer=self._tracer)
+        self._generator = SpanGenerator(**kwargs)
 
     @contextmanager
     def llm(self, invocation: LLMInvocation) -> Iterator[LLMInvocation]:
@@ -91,7 +80,7 @@ def llm(self, invocation: LLMInvocation) -> Iterator[LLMInvocation]:
         self._generator.start(invocation)
         try:
             yield invocation
-        except BaseException as exc:  # noqa: B902 - ensure we capture all exceptions incl. SystemExit, KeyboardInterrupt
+        except Exception as exc:  # noqa: B902 - ensure we capture all exceptions incl. SystemExit, KeyboardInterrupt
             invocation.end_time = time.time()
             self._generator.error(
                 Error(message=str(exc), type=type(exc)), invocation