migrate span generator to use updated data type

Author: zhirafovod

instrumentation-genai/opentelemetry-instrumentation-langchain-alpha/src/opentelemetry/instrumentation/langchain/__init__.py

@@ -42,6 +42,7 @@
 """
 
 import json
+import os
 from typing import Collection
 
 from wrapt import wrap_function_wrapper
@@ -98,10 +99,17 @@ def instrumentation_dependencies(self) -> Collection[str]:
         return _instruments
 
     def _instrument(self, **kwargs):
+        # Ensure metrics + events generator by default
+        from opentelemetry.util.genai.environment_variables import OTEL_INSTRUMENTATION_GENAI_GENERATOR
+
+        if not os.environ.get(OTEL_INSTRUMENTATION_GENAI_GENERATOR):
+            os.environ[OTEL_INSTRUMENTATION_GENAI_GENERATOR] = "span_metric_event"
         tracer_provider = kwargs.get("tracer_provider")
-        # Create dedicated handler bound to provided tracer provider (ensures spans go to test exporter)
+        meter_provider = kwargs.get("meter_provider")
+        # Create dedicated handler bound to provided tracer and meter providers (ensures spans and metrics go to test exporters)
         self._telemetry_handler = TelemetryHandler(
-            tracer_provider=tracer_provider
+            tracer_provider=tracer_provider,
+            meter_provider=meter_provider,
         )
 
         def _build_input_messages(messages):

instrumentation-genai/opentelemetry-instrumentation-langchain-alpha/src/opentelemetry/instrumentation/langchain/callback_handler.py

@@ -139,6 +139,7 @@ def on_chat_model_start(
             input_messages=input_messages,
             attributes=attrs,
         )
+        # no need for messages/chat_generations fields; generator uses input_messages and output_messages
         self._telemetry_handler.start_llm(inv)
         with self._lock:
             self._invocations[run_id] = inv
@@ -178,6 +179,7 @@ def on_llm_end(
                     finish_reason=finish_reason,
                 )
             ]
+        # no additional assignments needed; generator uses output_messages
         llm_output = getattr(response, "llm_output", None) or {}
         response_model = llm_output.get("model_name") or llm_output.get(
             "model"

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

@@ -121,18 +121,14 @@ def finish(self, invocation: LLMInvocation):  # type: ignore[override]
             )
             invocation.span = span
 
-        # Normalize invocation collections for metrics helpers
-        if not invocation.messages:
-            invocation.messages = invocation.input_messages
-        if not invocation.chat_generations:
-            invocation.chat_generations = invocation.output_messages
+        # Use input_messages and output_messages directly
 
         # Update any new attributes added after start
         for k, v in invocation.attributes.items():
             span.set_attribute(k, v)
 
         # Finish reasons & response / usage attrs
-        finish_reasons = _collect_finish_reasons(invocation.chat_generations)
+        finish_reasons = _collect_finish_reasons(invocation.output_messages)
         if finish_reasons:
             span.set_attribute(
                 GenAI.GEN_AI_RESPONSE_FINISH_REASONS, finish_reasons
@@ -147,20 +143,16 @@ def finish(self, invocation: LLMInvocation):  # type: ignore[override]
         )
 
         # Emit per-choice generation events (gated by environment var)
-        if (
-            invocation.chat_generations
-            and self._logger
-            and os.getenv(_ENV_VAR)
-        ):
+        if invocation.output_messages and self._logger and os.getenv(_ENV_VAR):
             try:
                 _emit_chat_generation_logs(
                     self._logger,
-                    invocation.chat_generations,
+                    invocation.output_messages,
                     provider_name=invocation.provider,
                     framework=invocation.attributes.get("framework"),
                     capture_content=self._capture_content,
                 )
-            except Exception:  # pragma: no cover
+            except Exception:
                 pass
 
         # Record metrics (duration + tokens)