fixed conflict

Author: wrisa

.github/component_owners.yml

@@ -40,3 +40,7 @@ components:
   util/opentelemetry-util-genai:
     - DylanRussell
     - keith-decker
+
+  instrumentation-genai/opentelemetry-instrumentation-langchain:
+    - zhirafovod
+    - wrisa

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

@@ -60,7 +60,7 @@ class LangChainInstrumentor(BaseInstrumentor):
     """
 
     def __init__(
-        self, exception_logger: Optional[Callable[[Exception], Any]] = None
+        self,
     ):
         super().__init__()
 
@@ -76,7 +76,7 @@ def _instrument(self, **kwargs: Any):
             __name__,
             __version__,
             tracer_provider,
-            schema_url=Schemas.V1_28_0.value,
+            schema_url=Schemas.V1_30_0.value,
         )
 
         otel_callback_handler = OpenTelemetryLangChainCallbackHandler(

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/span_manager.py

@@ -97,6 +97,7 @@ def end_span(self, run_id: UUID) -> None:
             child_state = self.spans.get(child_id)
             if child_state:
                 child_state.span.end()
+                del self.spans[child_id]
         state.span.end()
         del self.spans[run_id]
 

instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_span_manager.py

@@ -4,7 +4,7 @@
 import pytest
 
 from opentelemetry.instrumentation.langchain.span_manager import (
-    SpanManager,
+    _SpanManager,
     _SpanState,
 )
 from opentelemetry.trace import SpanKind, get_tracer
@@ -18,7 +18,7 @@ def tracer(self):
 
     @pytest.fixture
     def handler(self, tracer):
-        return SpanManager(tracer=tracer)
+        return _SpanManager(tracer=tracer)
 
     @pytest.mark.parametrize(
         "parent_run_id,parent_in_spans",
@@ -28,6 +28,7 @@ def handler(self, tracer):
             (uuid.uuid4(), True),  # Parent in spans
         ],
     )
+
     def test_create_span(
         self, handler, tracer, parent_run_id, parent_in_spans
     ):
@@ -42,7 +43,7 @@ def test_create_span(
         if parent_run_id is not None and parent_in_spans:
             parent_mock_span = unittest.mock.Mock(spec=Span)
             handler.spans[parent_run_id] = _SpanState(
-                span=parent_mock_span, context=None
+                span=parent_mock_span
             )
 
         with (
@@ -52,12 +53,9 @@ def test_create_span(
             unittest.mock.patch(
                 "opentelemetry.instrumentation.langchain.span_manager.set_span_in_context"
             ) as mock_set_span_in_context,
-            unittest.mock.patch(
-                "opentelemetry.instrumentation.langchain.span_manager.get_current"
-            ),
         ):
             # Act
-            result = handler.create_span(
+            result = handler._create_span(
                 run_id, parent_run_id, span_name, kind
             )
 
@@ -81,4 +79,29 @@ def test_create_span(
                 mock_start_span.assert_called_once_with(
                     name=span_name, kind=kind
                 )
-                mock_set_span_in_context.assert_not_called()
+                mock_set_span_in_context.assert_called_once_with(mock_span)
+
+
+    def test_end_span(
+            self, handler
+    ):
+        # Arrange
+        run_id = uuid.uuid4()
+        mock_span = unittest.mock.Mock(spec=Span)
+        mock_context = unittest.mock.Mock()
+        handler.spans[run_id] = _SpanState(span=mock_span)
+
+        # Add a child to verify it's removed
+        child_run_id = uuid.uuid4()
+        child_mock_span = unittest.mock.Mock(spec=Span)
+        handler.spans[child_run_id] = _SpanState(span=child_mock_span)
+        handler.spans[run_id].children.append(child_run_id)
+
+        # Act
+        handler.end_span(run_id)
+
+        # Assert
+        mock_span.end.assert_called_once()
+        child_mock_span.end.assert_called_once()
+        assert run_id not in handler.spans
+        assert child_run_id not in handler.spans