|
| 1 | +""" |
| 2 | +Proposed fix for the Langchain callback duplication issue. |
| 3 | +This shows the changes needed in sentry_sdk/integrations/langchain.py |
| 4 | +
|
| 5 | +The issue is in the _wrap_configure function around line 415. |
| 6 | +""" |
| 7 | + |
| 8 | +from functools import wraps |
| 9 | +from typing import Any, List |
| 10 | +from sentry_sdk.integrations.langchain import ( |
| 11 | + SentryLangchainCallback, |
| 12 | + LangchainIntegration, |
| 13 | +) |
| 14 | +from langchain_core.callbacks import BaseCallbackHandler |
| 15 | +import sentry_sdk |
| 16 | +from sentry_sdk.utils import capture_internal_exceptions, logger |
| 17 | + |
| 18 | +# ============================================================================ |
| 19 | +# CURRENT PROBLEMATIC CODE (from _wrap_configure function) |
| 20 | +# ============================================================================ |
| 21 | + |
| 22 | + |
| 23 | +def _wrap_configure_CURRENT(f): |
| 24 | + """Current implementation that has the bug""" |
| 25 | + |
| 26 | + @wraps(f) |
| 27 | + def new_configure(*args, **kwargs): |
| 28 | + integration = sentry_sdk.get_client().get_integration(LangchainIntegration) |
| 29 | + if integration is None: |
| 30 | + return f(*args, **kwargs) |
| 31 | + |
| 32 | + with capture_internal_exceptions(): |
| 33 | + new_callbacks = [] # type: List[BaseCallbackHandler] |
| 34 | + |
| 35 | + # Handle local_callbacks from kwargs or args[2] |
| 36 | + if "local_callbacks" in kwargs: |
| 37 | + existing_callbacks = kwargs["local_callbacks"] |
| 38 | + kwargs["local_callbacks"] = new_callbacks |
| 39 | + elif len(args) > 2: |
| 40 | + existing_callbacks = args[2] # ❌ ONLY checks args[2]! |
| 41 | + args = ( |
| 42 | + args[0], |
| 43 | + args[1], |
| 44 | + new_callbacks, |
| 45 | + ) + args[3:] |
| 46 | + else: |
| 47 | + existing_callbacks = [] |
| 48 | + |
| 49 | + # Copy existing callbacks to new_callbacks |
| 50 | + if existing_callbacks: |
| 51 | + if isinstance(existing_callbacks, list): |
| 52 | + for cb in existing_callbacks: |
| 53 | + new_callbacks.append(cb) |
| 54 | + elif isinstance(existing_callbacks, BaseCallbackHandler): |
| 55 | + new_callbacks.append(existing_callbacks) |
| 56 | + else: |
| 57 | + logger.debug("Unknown callback type: %s", existing_callbacks) |
| 58 | + |
| 59 | + # ❌ BUG: Only checks callbacks that were copied to new_callbacks |
| 60 | + # Misses callbacks in args[1] (inheritable_callbacks)! |
| 61 | + already_added = False |
| 62 | + for callback in new_callbacks: |
| 63 | + if isinstance(callback, SentryLangchainCallback): |
| 64 | + already_added = True |
| 65 | + |
| 66 | + if not already_added: |
| 67 | + new_callbacks.append( |
| 68 | + SentryLangchainCallback( |
| 69 | + integration.max_spans, |
| 70 | + integration.include_prompts, |
| 71 | + integration.tiktoken_encoding_name, |
| 72 | + ) |
| 73 | + ) |
| 74 | + return f(*args, **kwargs) |
| 75 | + |
| 76 | + return new_configure |
| 77 | + |
| 78 | + |
| 79 | +# ============================================================================ |
| 80 | +# FIXED IMPLEMENTATION |
| 81 | +# ============================================================================ |
| 82 | + |
| 83 | + |
| 84 | +def _wrap_configure_FIXED(f): |
| 85 | + """Fixed implementation that checks all callback locations""" |
| 86 | + |
| 87 | + @wraps(f) |
| 88 | + def new_configure(*args, **kwargs): |
| 89 | + integration = sentry_sdk.get_client().get_integration(LangchainIntegration) |
| 90 | + if integration is None: |
| 91 | + return f(*args, **kwargs) |
| 92 | + |
| 93 | + with capture_internal_exceptions(): |
| 94 | + # ✅ FIX: Check if SentryLangchainCallback already exists in ANY location |
| 95 | + already_added = False |
| 96 | + |
| 97 | + # Check in kwargs["local_callbacks"] |
| 98 | + if "local_callbacks" in kwargs: |
| 99 | + callbacks = kwargs.get("local_callbacks", []) |
| 100 | + if isinstance(callbacks, list): |
| 101 | + for cb in callbacks: |
| 102 | + if isinstance(cb, SentryLangchainCallback): |
| 103 | + already_added = True |
| 104 | + break |
| 105 | + |
| 106 | + # ✅ KEY FIX: Check in args[1] (inheritable_callbacks) |
| 107 | + # This is where RunnableConfig callbacks are placed! |
| 108 | + if not already_added and len(args) > 1 and args[1] is not None: |
| 109 | + callbacks = args[1] |
| 110 | + if isinstance(callbacks, list): |
| 111 | + for cb in callbacks: |
| 112 | + if isinstance(cb, SentryLangchainCallback): |
| 113 | + already_added = True |
| 114 | + break |
| 115 | + elif isinstance(callbacks, BaseCallbackHandler) and isinstance( |
| 116 | + callbacks, SentryLangchainCallback |
| 117 | + ): |
| 118 | + already_added = True |
| 119 | + |
| 120 | + # Check in args[2] (local_callbacks) |
| 121 | + if not already_added and len(args) > 2 and args[2] is not None: |
| 122 | + callbacks = args[2] |
| 123 | + if isinstance(callbacks, list): |
| 124 | + for cb in callbacks: |
| 125 | + if isinstance(cb, SentryLangchainCallback): |
| 126 | + already_added = True |
| 127 | + break |
| 128 | + elif isinstance(callbacks, BaseCallbackHandler) and isinstance( |
| 129 | + callbacks, SentryLangchainCallback |
| 130 | + ): |
| 131 | + already_added = True |
| 132 | + |
| 133 | + # Only add a new callback if none was found in ANY location |
| 134 | + if not already_added: |
| 135 | + new_callbacks = [] # type: List[BaseCallbackHandler] |
| 136 | + |
| 137 | + # Preserve existing callbacks from local_callbacks |
| 138 | + if "local_callbacks" in kwargs: |
| 139 | + existing_callbacks = kwargs["local_callbacks"] |
| 140 | + kwargs["local_callbacks"] = new_callbacks |
| 141 | + elif len(args) > 2: |
| 142 | + existing_callbacks = args[2] |
| 143 | + args = ( |
| 144 | + args[0], |
| 145 | + args[1], |
| 146 | + new_callbacks, |
| 147 | + ) + args[3:] |
| 148 | + else: |
| 149 | + existing_callbacks = [] |
| 150 | + |
| 151 | + # Copy existing callbacks |
| 152 | + if existing_callbacks: |
| 153 | + if isinstance(existing_callbacks, list): |
| 154 | + for cb in existing_callbacks: |
| 155 | + new_callbacks.append(cb) |
| 156 | + elif isinstance(existing_callbacks, BaseCallbackHandler): |
| 157 | + new_callbacks.append(existing_callbacks) |
| 158 | + else: |
| 159 | + logger.debug("Unknown callback type: %s", existing_callbacks) |
| 160 | + |
| 161 | + # Add our callback |
| 162 | + new_callbacks.append( |
| 163 | + SentryLangchainCallback( |
| 164 | + integration.max_spans, |
| 165 | + integration.include_prompts, |
| 166 | + integration.tiktoken_encoding_name, |
| 167 | + ) |
| 168 | + ) |
| 169 | + |
| 170 | + return f(*args, **kwargs) |
| 171 | + |
| 172 | + return new_configure |
| 173 | + |
| 174 | + |
| 175 | +# ============================================================================ |
| 176 | +# SUMMARY OF CHANGES |
| 177 | +# ============================================================================ |
| 178 | + |
| 179 | +""" |
| 180 | +Key changes in the fix: |
| 181 | +
|
| 182 | +1. EARLY DETECTION: Check for existing SentryLangchainCallback instances |
| 183 | + BEFORE modifying any callback lists |
| 184 | +
|
| 185 | +2. COMPREHENSIVE CHECKING: Check ALL possible callback locations: |
| 186 | + - kwargs["local_callbacks"] |
| 187 | + - args[1] (inheritable_callbacks) ← THE MISSING CHECK! |
| 188 | + - args[2] (local_callbacks) |
| 189 | +
|
| 190 | +3. PROPER LOGIC: Only create and add a new callback if NO existing |
| 191 | + SentryLangchainCallback is found in any location |
| 192 | +
|
| 193 | +The original bug occurred because the function only checked args[2] for |
| 194 | +existing callbacks, but user-provided callbacks from RunnableConfig |
| 195 | +are actually placed in args[1] (inheritable_callbacks). |
| 196 | +
|
| 197 | +This fix ensures that manually configured SentryLangchainCallback |
| 198 | +instances are properly detected and respected, preventing duplication. |
| 199 | +""" |
0 commit comments