review comments

Author: sabrenner

ddtrace/contrib/internal/langchain/patch.py

@@ -582,29 +582,31 @@ def traced_similarity_search(langchain_core, pin, func, instance, args, kwargs):
 
 
 def patched_embeddings_init_subclass(func, instance, args, kwargs):
-    try:
-        func(*args, **kwargs)
-    finally:
-        cls = func.__self__
+    func(*args, **kwargs)
+    cls = func.__self__
 
+    try:
         embed_documents = getattr(cls, "embed_documents", None)
         if embed_documents and not isinstance(embed_documents, wrapt.ObjectProxy):
             wrap(cls, "embed_documents", traced_embedding(langchain_core))
 
         embed_query = getattr(cls, "embed_query", None)
         if embed_query and not isinstance(embed_query, wrapt.ObjectProxy):
             wrap(cls, "embed_query", traced_embedding(langchain_core))
+    except Exception:
+        log.warning("Unable to patch LangChain Embeddings class %s", str(cls))
 
 
 def patched_vectorstore_init_subclass(func, instance, args, kwargs):
-    try:
-        func(*args, **kwargs)
-    finally:
-        cls = func.__self__
+    func(*args, **kwargs)
+    cls = func.__self__
 
+    try:
         method = getattr(cls, "similarity_search", None)
         if method and not isinstance(method, wrapt.ObjectProxy):
             wrap(cls, "similarity_search", traced_similarity_search(langchain_core))
+    except Exception:
+        log.warning("Unable to patch LangChain VectorStore class %s", str(cls))
 
 
 def patch():

tests/contrib/langchain/conftest.py

@@ -62,7 +62,6 @@ def llmobs_events(llmobs, llmobs_span_writer):
 # `sys.modules`. Additionally, changing to "session" will fail snapshot tests.
 # Setting this to "module" seems to work the best.
 # Additionally, this likely isn't an indication of a bug in our code, but how patching happens during tests.
-# In userland, patching will really only happen once, and unpatching almost never.
 @pytest.fixture(scope="module")
 def langchain_core():
     with override_env(