@@ -41,10 +41,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-grpc"
-      - name: Test httpx
+      - name: Test httpx0
         run: |
           set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx"
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-httpx0"
       - name: Test httpx2
         run: |
           set -x # print commands that are executed
 
@@ -77,6 +77,9 @@ typing = [
     "anthropic>=1.2.0",
     "google-genai>=2.21.0",
     "openai>=3.7.0",
+    "tiktoken>=0.14.0",
+    "aiohttp>=3.14.3",
+    "openai-agents>=0.22.0",
 ]
 test = [
     "dataclasses ; python_full_version < '3.7'",
 
@@ -146,7 +146,7 @@ a Python version older than 3.9 if the HTTPX version is 0.28 or higher, you can
 say:
 
 ```python
-"httpx": {
+"httpx0": {
     "python": {
         # run the test suite for httpx v0.28+ on Python 3.9+ only
         ">=0.28": ">=3.9",
 
@@ -205,8 +205,9 @@
         },
         "python": ">=3.7",
     },
-    "httpx": {
+    "httpx0": {
         "package": "httpx",
+        "integration_name": "httpx",
         "deps": {
             "*": ["anyio>=3,<5", "pytest-asyncio"],
             "<0.24": ["anyio<4"],
 
@@ -128,7 +128,7 @@
     ],
     "Network": [
         "grpc",
-        "httpx",
+        "httpx0",
         "httpx2",
         "pyreqwest",
         "requests",
 
@@ -310,7 +310,7 @@ async def sentry_app_handle(
 
                         return response
 
-        Application._handle = sentry_app_handle
+        Application._handle = sentry_app_handle  # type: ignore[method-assign]
 
         old_urldispatcher_resolve = UrlDispatcher.resolve
 
@@ -350,7 +350,7 @@ async def sentry_urldispatcher_resolve(
 
             return rv
 
-        UrlDispatcher.resolve = sentry_urldispatcher_resolve
+        UrlDispatcher.resolve = sentry_urldispatcher_resolve  # type: ignore[method-assign]
 
         old_client_session_init = ClientSession.__init__
 
@@ -363,7 +363,7 @@ def init(*args: "Any", **kwargs: "Any") -> None:
             kwargs["trace_configs"] = client_trace_configs
             return old_client_session_init(*args, **kwargs)
 
-        ClientSession.__init__ = init
+        ClientSession.__init__ = init  # type: ignore[method-assign]
 
 
 def create_trace_config() -> "TraceConfig":
 
@@ -26,6 +26,7 @@
 )
 from sentry_sdk.utils import (
     capture_internal_exceptions,
+    event_from_exception,
     has_data_collection_enabled,
     logger,
 )
@@ -266,6 +267,15 @@ def setup_once() -> None:
         _patch_embeddings_provider(OllamaEmbeddings)
 
 
+def _capture_exception(exc: "Any", scope: "Optional[Any]" = None) -> None:
+    event, hint = event_from_exception(
+        exc,
+        client_options=sentry_sdk.get_client().options,
+        mechanism={"type": "langchain", "handled": False},
+    )
+    sentry_sdk.capture_event(event, hint=hint, scope=scope)
+
+
 class SentryLangchainCallback(BaseCallbackHandler):
     """Callback handler that creates Sentry spans."""
 
@@ -294,7 +304,7 @@ def _handle_error(self, run_id: "UUID", error: "Any") -> None:
             if is_ignored:
                 span.__exit__(None, None, None)
             else:
-                sentry_sdk.capture_exception(
+                _capture_exception(
                     error, span._scope if isinstance(span, StreamedSpan) else span.scope
                 )
                 span.__exit__(type(error), error, error.__traceback__)
 
@@ -21,6 +21,8 @@
 from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import (
+    capture_internal_exceptions,
+    event_from_exception,
     has_data_collection_enabled,
     nullcontext,
     package_version,
@@ -100,6 +102,15 @@ def setup_once() -> None:
             _patch_fastmcp()
 
 
+def _capture_exception(exc: "Any") -> None:
+    event, hint = event_from_exception(
+        exc,
+        client_options=sentry_sdk.get_client().options,
+        mechanism={"type": "mcp", "handled": False},
+    )
+    sentry_sdk.capture_event(event, hint=hint)
+
+
 @contextmanager
 def _active_http_scopes(
     ctx: "Any",
@@ -259,57 +270,6 @@ def _extract_text_from_content_blocks(content_blocks: "Any") -> "Any":
     return " ".join(texts) if texts else content_blocks
 
 
-def _extract_handler_data_from_args(
-    handler_type: str,
-    original_args: "tuple[Any, ...]",
-    original_kwargs: "Optional[dict[str, Any]]" = None,
-) -> "tuple[str, dict[str, Any]]":
-    """
-    Extract handler name and arguments from v1 positional args.
-
-    In MCP SDK v1, handlers receive positional args:
-    - Tool: (tool_name, arguments)
-    - Prompt: (name, arguments)
-    - Resource: (uri,)
-    """
-    original_kwargs = original_kwargs or {}
-
-    if handler_type == "tool":
-        if original_args:
-            handler_name = original_args[0]
-        elif original_kwargs.get("name"):
-            handler_name = original_kwargs["name"]
-
-        arguments = {}
-        if len(original_args) > 1:
-            arguments = original_args[1]
-        elif original_kwargs.get("arguments"):
-            arguments = original_kwargs["arguments"]
-
-    elif handler_type == "prompt":
-        if original_args:
-            handler_name = original_args[0]
-        elif original_kwargs.get("name"):
-            handler_name = original_kwargs["name"]
-
-        arguments = {}
-        if len(original_args) > 1:
-            arguments = original_args[1]
-        elif original_kwargs.get("arguments"):
-            arguments = original_kwargs["arguments"]
-
-    else:  # resource
-        handler_name = "unknown"
-        if original_args:
-            handler_name = str(original_args[0])
-        elif original_kwargs.get("uri"):
-            handler_name = str(original_kwargs["uri"])
-
-        arguments = {}
-
-    return handler_name, arguments
-
-
 async def _tool_handler_wrapper(
     func: "Callable[..., Awaitable[Union[CallToolResult, InputRequiredResult]]]",
     original_args: "tuple[Any, ...]",
@@ -329,12 +289,18 @@ async def _tool_handler_wrapper(
     """
     client = sentry_sdk.get_client()
 
-    if original_kwargs is None:
-        original_kwargs = {}
+    original_kwargs = original_kwargs or {}
 
-    handler_name, arguments = _extract_handler_data_from_args(
-        "tool", original_args, original_kwargs
-    )
+    if original_args:
+        handler_name = original_args[0]
+    elif original_kwargs.get("name"):
+        handler_name = original_kwargs["name"]
+
+    arguments = {}
+    if len(original_args) > 1 and original_args[1] is not None:
+        arguments = original_args[1]
+    elif original_kwargs.get("arguments"):
+        arguments = original_kwargs["arguments"]
 
     if has_data_collection_enabled(client.options):
         if not client.options["data_collection"]["gen_ai"]["inputs"]:
@@ -394,7 +360,8 @@ async def _tool_handler_wrapper(
                     result = await result
 
             except Exception as e:
-                sentry_sdk.capture_exception(e)
+                with capture_internal_exceptions():
+                    _capture_exception(e)
                 raise
 
             if result is None:
@@ -490,7 +457,8 @@ async def _instrument_v2_tool_call(
                 result = await call_next(ctx)
 
             except Exception as e:
-                sentry_sdk.capture_exception(e)
+                with capture_internal_exceptions():
+                    _capture_exception(e)
                 raise
 
             if not isinstance(result, dict):
@@ -549,13 +517,20 @@ async def _prompt_handler_wrapper(
         original_kwargs: Original keyword arguments passed to the handler
         self: Optional instance for bound methods
     """
-    if original_kwargs is None:
-        original_kwargs = {}
-
     client = sentry_sdk.get_client()
-    handler_name, arguments = _extract_handler_data_from_args(
-        "prompt", original_args, original_kwargs
-    )
+
+    original_kwargs = original_kwargs or {}
+
+    if original_args:
+        handler_name = original_args[0]
+    elif original_kwargs.get("name"):
+        handler_name = original_kwargs["name"]
+
+    arguments = {}
+    if len(original_args) > 1 and original_args[1] is not None:
+        arguments = original_args[1]
+    elif original_kwargs.get("arguments"):
+        arguments = original_kwargs["arguments"]
 
     if has_data_collection_enabled(client.options):
         if not client.options["data_collection"]["gen_ai"]["inputs"]:
@@ -615,7 +590,8 @@ async def _prompt_handler_wrapper(
                     result = await result
 
             except Exception as e:
-                sentry_sdk.capture_exception(e)
+                with capture_internal_exceptions():
+                    _capture_exception(e)
                 raise
 
             if result is None:
@@ -764,7 +740,8 @@ async def _instrument_v2_prompt_get(
             try:
                 result = await call_next(ctx)
             except Exception as e:
-                sentry_sdk.capture_exception(e)
+                with capture_internal_exceptions():
+                    _capture_exception(e)
                 raise
 
             if not isinstance(result, dict):
@@ -847,12 +824,15 @@ async def _resource_handler_wrapper(
         original_kwargs: Original keyword arguments passed to the handler
         self: Optional instance for bound methods
     """
-    if original_kwargs is None:
-        original_kwargs = {}
+    original_kwargs = original_kwargs or {}
 
-    handler_name, arguments = _extract_handler_data_from_args(
-        "resource", original_args, original_kwargs
-    )
+    handler_name = "unknown"
+    if original_args:
+        handler_name = str(original_args[0])
+    elif original_kwargs.get("uri"):
+        handler_name = str(original_kwargs["uri"])
+
+    arguments: "dict[str, Any]" = {}
 
     ctx = None
     try:
@@ -919,7 +899,8 @@ async def _resource_handler_wrapper(
                     result = await result
 
             except Exception as e:
-                sentry_sdk.capture_exception(e)
+                with capture_internal_exceptions():
+                    _capture_exception(e)
                 raise
 
     return result
@@ -984,7 +965,8 @@ async def _instrument_v2_resource_read(
                 result = await call_next(ctx)
 
             except Exception as e:
-                sentry_sdk.capture_exception(e)
+                with capture_internal_exceptions():
+                    _capture_exception(e)
                 raise
 
     return result
 
@@ -130,7 +130,7 @@ def __init__(
 
         self.tiktoken_encoding = None
         if tiktoken_encoding_name is not None:
-            import tiktoken  # type: ignore
+            import tiktoken
 
             self.tiktoken_encoding = tiktoken.get_encoding(tiktoken_encoding_name)