fix(langchain): Make span_map an instance variable

Author: cursoragent

sentry_sdk/integrations/langchain.py

@@ -87,12 +87,9 @@ def __init__(self, span):
 class SentryLangchainCallback(BaseCallbackHandler):  # type: ignore[misc]
     """Base callback handler that can be used to handle callbacks from langchain."""
 
-    span_map = OrderedDict()  # type: OrderedDict[UUID, WatchedSpan]
-
-    max_span_map_size = 0
-
     def __init__(self, max_span_map_size, include_prompts, tiktoken_encoding_name=None):
         # type: (int, bool, Optional[str]) -> None
+        self.span_map = OrderedDict()  # type: OrderedDict[UUID, WatchedSpan]
         self.max_span_map_size = max_span_map_size
         self.include_prompts = include_prompts
 

sentry_sdk/scope.py

@@ -42,6 +42,7 @@
     event_from_exception,
     exc_info_from_error,
     logger,
+    safe_str,
 )
 
 import typing
@@ -850,9 +851,9 @@ def set_tag(self, key, value):
 
         :param key: Key of the tag to set.
 
-        :param value: Value of the tag to set.
+        :param value: Value of the tag to set. Will be converted to string.
         """
-        self._tags[key] = value
+        self._tags[key] = safe_str(value)
 
     def set_tags(self, tags):
         # type: (Mapping[str, object]) -> None
@@ -869,9 +870,11 @@ def set_tags(self, tags):
         This method only modifies tag keys in the `tags` mapping passed to the method.
         `scope.set_tags({})` is, therefore, a no-op.
 
-        :param tags: A mapping of tag keys to tag values to set.
+        :param tags: A mapping of tag keys to tag values to set. Values will be
+        converted to strings.
         """
-        self._tags.update(tags)
+        for key, value in tags.items():
+            self.set_tag(key, value)
 
     def remove_tag(self, key):
         # type: (str) -> None

sentry_sdk/tracing.py

@@ -13,6 +13,7 @@
     logger,
     nanosecond_time,
     should_be_treated_as_error,
+    safe_str,
 )
 
 from typing import TYPE_CHECKING
@@ -596,7 +597,7 @@ def to_baggage(self):
 
     def set_tag(self, key, value):
         # type: (str, Any) -> None
-        self._tags[key] = value
+        self._tags[key] = safe_str(value)
 
     def set_data(self, key, value):
         # type: (str, Any) -> None

tests/integrations/langchain/test_langchain.py

@@ -17,7 +17,10 @@
 from langchain_core.outputs import ChatGenerationChunk
 
 from sentry_sdk import start_transaction
-from sentry_sdk.integrations.langchain import LangchainIntegration
+from sentry_sdk.integrations.langchain import (
+    LangchainIntegration,
+    SentryLangchainCallback,
+)
 from langchain.agents import tool, AgentExecutor, create_openai_tools_agent
 from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
 
@@ -342,3 +345,22 @@ def test_span_origin(sentry_init, capture_events):
     assert event["contexts"]["trace"]["origin"] == "manual"
     for span in event["spans"]:
         assert span["origin"] == "auto.ai.langchain"
+
+
+def test_span_map_is_instance_variable():
+    """Test that each SentryLangchainCallback instance has its own span_map."""
+    # Create two separate callback instances
+    callback1 = SentryLangchainCallback(max_span_map_size=100, include_prompts=True)
+    callback2 = SentryLangchainCallback(max_span_map_size=100, include_prompts=True)
+
+    # Verify they have different span_map instances
+    assert (
+        callback1.span_map is not callback2.span_map
+    ), "span_map should be an instance variable, not shared between instances"
+
+
+def test_span_map_not_class_attribute():
+    """Test that span_map is not accessible as a class attribute."""
+    # This should raise AttributeError if span_map is properly an instance variable
+    with pytest.raises(AttributeError):
+        SentryLangchainCallback.span_map