feat(httpx2): add httpx2 instrumentation

.riot/requirements/13c3933.txt

@@ -0,0 +1,28 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/13c3933.in
+#
+anyio==4.14.2
+attrs==26.1.0
+certifi==2026.7.22
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.0.0
+httpx2==2.0.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+typing-extensions==4.16.0

.riot/requirements/143e698.txt

@@ -0,0 +1,31 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/143e698.in
+#
+anyio==4.14.2
+attrs==26.1.0
+backports-asyncio-runner==1.2.0
+coverage[toml]==7.15.4
+exceptiongroup==1.3.1
+h11==0.16.0
+httpcore2==2.12.0
+httpx2==2.12.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+tomli==2.4.1
+truststore==0.10.4
+typing-extensions==4.16.0

.riot/requirements/1e7c279.txt

@@ -0,0 +1,31 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1e7c279.in
+#
+anyio==4.14.2
+attrs==26.1.0
+backports-asyncio-runner==1.2.0
+certifi==2026.7.22
+coverage[toml]==7.15.4
+exceptiongroup==1.3.1
+h11==0.16.0
+httpcore2==2.0.0
+httpx2==2.0.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+tomli==2.4.1
+typing-extensions==4.16.0

.riot/requirements/2a0ccf2.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/2a0ccf2.in
+#
+anyio==4.14.2
+attrs==26.1.0
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.12.0
+httpx2==2.12.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+truststore==0.10.4

.riot/requirements/a77aa22.txt

@@ -0,0 +1,28 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/a77aa22.in
+#
+anyio==4.14.2
+attrs==26.1.0
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.12.0
+httpx2==2.12.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+truststore==0.10.4
+typing-extensions==4.16.0

.riot/requirements/da479b1.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.14
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/da479b1.in
+#
+anyio==4.14.2
+attrs==26.1.0
+certifi==2026.7.22
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.0.0
+httpx2==2.0.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0

.riot/requirements/e49b70d.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.14
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/e49b70d.in
+#
+anyio==4.14.2
+attrs==26.1.0
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.12.0
+httpx2==2.12.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+truststore==0.10.4

.riot/requirements/e9af4c9.txt

@@ -0,0 +1,28 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/e9af4c9.in
+#
+anyio==4.14.2
+attrs==26.1.0
+certifi==2026.7.22
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.0.0
+httpx2==2.0.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+typing-extensions==4.16.0

.riot/requirements/f2c3ec9.txt

@@ -0,0 +1,28 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/f2c3ec9.in
+#
+anyio==4.14.2
+attrs==26.1.0
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.12.0
+httpx2==2.12.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0
+truststore==0.10.4
+typing-extensions==4.16.0

.riot/requirements/f38b0e1.txt

@@ -0,0 +1,33 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/f38b0e1.in
+#
+anyio==4.12.1
+attrs==26.1.0
+backports-asyncio-runner==1.2.0
+certifi==2026.7.22
+coverage[toml]==7.10.7
+exceptiongroup==1.3.1
+h11==0.16.0
+httpcore2==2.0.0
+httpx2==2.0.0
+hypothesis==6.45.0
+idna==3.19
+importlib-metadata==8.7.1
+iniconfig==2.1.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==8.4.2
+pytest-asyncio==1.2.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.0.1
+sortedcontainers==2.4.0
+tomli==2.4.1
+typing-extensions==4.16.0
+zipp==3.23.1

.riot/requirements/fd33cd8.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/fd33cd8.in
+#
+anyio==4.14.2
+attrs==26.1.0
+certifi==2026.7.22
+coverage[toml]==7.15.4
+h11==0.16.0
+httpcore2==2.0.0
+httpx2==2.0.0
+hypothesis==6.45.0
+idna==3.19
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==26.3
+pluggy==1.6.0
+pygments==2.21.0
+pytest==9.1.1
+pytest-asyncio==1.4.0
+pytest-cov==7.1.0
+pytest-mock==3.15.1
+pytest-randomly==4.1.0
+sortedcontainers==2.4.0

ddtrace/_monkey.py

@@ -47,6 +47,7 @@
     "gevent": True,
     "graphql": True,
     "grpc": True,
+    "httpx2": True,
     "httpx": True,
     "kafka": True,
     "langgraph": True,

ddtrace/contrib/internal/httpx/patch.py

@@ -11,10 +11,8 @@
 from ddtrace.contrib._events.http_client import HttpClientEvents
 from ddtrace.contrib._events.http_client import HttpClientRequestEvent
 from ddtrace.contrib._events.http_client import HttpClientSendEvent
-from ddtrace.contrib.internal.trace_utils import ext_service
 from ddtrace.ext import SpanKind
 from ddtrace.internal import core
-from ddtrace.internal.compat import ensure_binary
 from ddtrace.internal.compat import ensure_text
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.settings import env
@@ -23,6 +21,7 @@
 from ddtrace.internal.utils.version import parse_version
 from ddtrace.internal.utils.wrappers import unwrap as _u
 
+from .utils import httpx_get_service_name
 from .utils import httpx_url_to_str
 
 
@@ -48,18 +47,6 @@ def _supported_versions() -> dict[str, str]:
     return {"httpx": ">=0.25"}
 
 
-def _get_service_name(request: httpx.Request) -> Optional[str]:
-    if config.httpx.split_by_domain:
-        if hasattr(request.url, "netloc"):
-            return ensure_text(request.url.netloc, errors="backslashreplace")
-
-        service = ensure_binary(request.url.host)
-        if request.url.port:
-            service += b":" + ensure_binary(str(request.url.port))
-        return ensure_text(service, errors="backslashreplace")
-    return ext_service(None, config.httpx)
-
-
 def _wrapped_sync_send_single_request(
     wrapped: "BoundFunctionWrapper[..., httpx.Response]",
     instance: httpx.Client,
@@ -121,7 +108,7 @@ async def _wrapped_async_send(
     with core.context_with_event(
         HttpClientRequestEvent(
             http_operation="http.request",
-            service=_get_service_name(req),
+            service=httpx_get_service_name(req, config.httpx),
             component=config.httpx.integration_name,
             request_method=req.method,
             request_headers=req.headers,
@@ -153,7 +140,7 @@ def _wrapped_sync_send(
         HttpClientRequestEvent(
             component=config.httpx.integration_name,
             http_operation="http.request",
-            service=_get_service_name(req),
+            service=httpx_get_service_name(req, config.httpx),
             request_method=req.method,
             request_headers=req.headers,
             integration_config=config.httpx,