feat: integration with dd-trace-api

.riot/requirements/10e65d1.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/10e65d1.in
+#
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.10
+dd-trace-api @ git+https://github.com/DataDog/dd-trace-api-py
+exceptiongroup==1.2.2
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pyyaml==6.0.2
+requests==2.32.3
+sortedcontainers==2.4.0
+tomli==2.2.1
+urllib3==2.3.0

.riot/requirements/1261872.txt

@@ -0,0 +1,24 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/1261872.in
+#
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.10
+dd-trace-api @ git+https://github.com/DataDog/dd-trace-api-py
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+requests==2.32.3
+sortedcontainers==2.4.0
+urllib3==2.3.0

.riot/requirements/14d1688.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/14d1688.in
+#
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.1
+dd-trace-api @ git+https://github.com/DataDog/dd-trace-api-py
+exceptiongroup==1.2.2
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pyyaml==6.0.2
+requests==2.32.3
+sortedcontainers==2.4.0
+tomli==2.2.1
+urllib3==2.2.3

.riot/requirements/668f2f5.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/668f2f5.in
+#
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.10
+dd-trace-api @ git+https://github.com/DataDog/dd-trace-api-py
+exceptiongroup==1.2.2
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pyyaml==6.0.2
+requests==2.32.3
+sortedcontainers==2.4.0
+tomli==2.2.1
+urllib3==2.3.0

.riot/requirements/d5f777e.txt

@@ -0,0 +1,25 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/d5f777e.in
+#
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.10
+dd-trace-api @ git+https://github.com/DataDog/dd-trace-api-py
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pyyaml==6.0.2
+requests==2.32.3
+sortedcontainers==2.4.0
+urllib3==2.3.0

.riot/requirements/e49670c.txt

@@ -0,0 +1,25 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/e49670c.in
+#
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.10
+dd-trace-api @ git+https://github.com/DataDog/dd-trace-api-py
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pyyaml==6.0.2
+requests==2.32.3
+sortedcontainers==2.4.0
+urllib3==2.3.0

ddtrace/_monkey.py

@@ -37,6 +37,7 @@
     "cassandra": True,
     "celery": True,
     "consul": True,
+    "dd_trace_api": True,
     "django": True,
     "dramatiq": True,
     "elasticsearch": True,

ddtrace/contrib/internal/dd_trace_api/patch.py

@@ -0,0 +1,79 @@
+from sys import addaudithook
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Tuple
+import weakref
+
+import dd_trace_api
+
+import ddtrace
+
+
+_DD_HOOK_NAME = "dd.hook"
+_TRACER_KEY = "Tracer"
+_STUB_TO_REAL = weakref.WeakKeyDictionary()
+_STUB_TO_REAL[dd_trace_api.tracer] = ddtrace.tracer
+
+
+def _proxy_span_arguments(args: List, kwargs: Dict) -> Tuple[List, Dict]:
+    """Convert all dd_trace_api.Span objects in the args/kwargs collections to their held ddtrace.Span objects"""
+    proxied_args = []
+    for arg in args:
+        if isinstance(arg, dd_trace_api.Span):
+            proxied_args.append(_STUB_TO_REAL[arg])
+        else:
+            proxied_args.append(arg)
+    proxied_kwargs = {}
+    for name, kwarg in kwargs.items():
+        if isinstance(kwarg, dd_trace_api.Span):
+            proxied_kwargs[name] = _STUB_TO_REAL[kwarg]
+        else:
+            proxied_kwargs[name] = kwarg
+    return proxied_args, proxied_kwargs
+
+
+def _call_on_real_instance(
+    operand_stub: dd_trace_api._Stub, method_name: str, retval_from_api: Optional[Any], *args: List, **kwargs: Dict
+) -> None:
+    """
+    Call `method_name` on the real object corresponding to `operand_stub` with `args` and `kwargs` as arguments.
+
+    Store the value that will be returned from the API call we're in the middle of, for the purpose
+    of mapping from those Stub objects to their real counterparts.
+    """
+    args, kwargs = _proxy_span_arguments(args, kwargs)
+    retval_from_impl = getattr(_STUB_TO_REAL[operand_stub], method_name)(*args, **kwargs)
+    if retval_from_api is not None:
+        _STUB_TO_REAL[retval_from_api] = retval_from_impl
+
+
+def _hook(name, hook_args):
+    """Called in response to `sys.audit` events"""
+    if not dd_trace_api.__datadog_patch or name != _DD_HOOK_NAME:
+        return
+    args = hook_args[0][0]
+    api_return_value, stub_self, event_name = args[0:3]
+    _call_on_real_instance(stub_self, event_name, api_return_value, *args[3:], **hook_args[0][1])
+
+
+def get_version() -> str:
+    return getattr(dd_trace_api, "__version__", "")
+
+
+def patch(tracer=None):
+    if getattr(dd_trace_api, "__datadog_patch", False):
+        return
+    dd_trace_api.__datadog_patch = True
+    _STUB_TO_REAL[dd_trace_api.tracer] = tracer
+    if not getattr(dd_trace_api, "__dd_has_audit_hook", False):
+        addaudithook(_hook)
+    dd_trace_api.__dd_has_audit_hook = True
+
+
+def unpatch():
+    if not getattr(dd_trace_api, "__datadog_patch", False):
+        return
+    dd_trace_api.__datadog_patch = False
+    # NB sys.addaudithook's cannot be removed

lib-injection/sources/min_compatible_versions.csv

@@ -17,14 +17,15 @@ algoliasearch,~=2.5
 anthropic,==0.26.0
 anyio,>=3.4.0
 aredis,0
-asgiref,~=3.0
+asgiref,~=3.0.0
 astunparse,0
 async_generator,~=1.10
-asyncpg,~=0.23
+asyncpg,~=0.23.0
 asynctest,==0.13.0
 austin-python,~=1.0
 avro,0
 azure.functions,0
+bcrypt,==4.2.1
 blinker,0
 boto3,==1.34.49
 bottle,>=0.12
@@ -64,19 +65,20 @@ elasticsearch[async],0
 envier,==0.5.2
 exceptiongroup,0
 faiss-cpu,==1.8.0
-falcon,~=3.0
+falcon,~=3.0.0
 fastapi,~=0.64.0
 flask,~=0.12.0
 flask-caching,~=1.10.0
 flask-openapi3,0
 gevent,~=20.12.0
+git+https://github.com/DataDog/dd-trace-api-py,0
 google-ai-generativelanguage,0
 google-generativeai,0
 googleapis-common-protos,0
 graphene,~=3.0.0
 graphql-core,~=3.2.0
 graphql-relay,0
-greenlet,~=1.0.0
+greenlet,~=1.0
 grpcio,~=1.34.0
 gunicorn,==20.0.4
 gunicorn[gevent],0
@@ -97,13 +99,13 @@ langchain-community,==0.0.14
 langchain-core,==0.1.52
 langchain-openai,==0.1.6
 langchain-pinecone,==0.1.0
-langchain_experimental,==0.0.47
+langgraph,~=0.2.60
 logbook,~=1.0.0
 loguru,~=0.4.0
 lxml,0
 lz4,0
 mako,~=1.1.0
-mariadb,~=1.0.0
+mariadb,~=1.0
 markupsafe,<2.0
 mock,0
 molten,>=1.0

min_compatible_versions.csv

@@ -17,14 +17,15 @@ algoliasearch,~=2.5
 anthropic,==0.26.0
 anyio,>=3.4.0
 aredis,0
-asgiref,~=3.0
+asgiref,~=3.0.0
 astunparse,0
 async_generator,~=1.10
-asyncpg,~=0.23
+asyncpg,~=0.23.0
 asynctest,==0.13.0
 austin-python,~=1.0
 avro,0
 azure.functions,0
+bcrypt,==4.2.1
 blinker,0
 boto3,==1.34.49
 bottle,>=0.12
@@ -64,19 +65,20 @@ elasticsearch[async],0
 envier,==0.5.2
 exceptiongroup,0
 faiss-cpu,==1.8.0
-falcon,~=3.0
+falcon,~=3.0.0
 fastapi,~=0.64.0
 flask,~=0.12.0
 flask-caching,~=1.10.0
 flask-openapi3,0
 gevent,~=20.12.0
+git+https://github.com/DataDog/dd-trace-api-py,0
 google-ai-generativelanguage,0
 google-generativeai,0
 googleapis-common-protos,0
 graphene,~=3.0.0
 graphql-core,~=3.2.0
 graphql-relay,0
-greenlet,~=1.0.0
+greenlet,~=1.0
 grpcio,~=1.34.0
 gunicorn,==20.0.4
 gunicorn[gevent],0
@@ -97,13 +99,13 @@ langchain-community,==0.0.14
 langchain-core,==0.1.52
 langchain-openai,==0.1.6
 langchain-pinecone,==0.1.0
-langchain_experimental,==0.0.47
+langgraph,~=0.2.60
 logbook,~=1.0.0
 loguru,~=0.4.0
 lxml,0
 lz4,0
 mako,~=1.1.0
-mariadb,~=1.0.0
+mariadb,~=1.0
 markupsafe,<2.0
 mock,0
 molten,>=1.0

releasenotes/notes/dd-trace-api-integration-0fa7ea051a4d6ce1.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    dd-trace-api: adds a simple and minimal instrumentation for the dd-trace-api-py package

riotfile.py

@@ -756,6 +756,12 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
                 ),
             ],
         ),
+        Venv(
+            name="dd_trace_api",
+            command="pytest {cmdargs} tests/contrib/dd_trace_api",
+            pkgs={"git+https://github.com/DataDog/dd-trace-api-py": latest, "requests": latest},
+            pys=select_pys(min_version="3.8"),
+        ),
         # Django  Python version support
         # 2.2     3.5, 3.6, 3.7, 3.8  3.9
         # 3.2     3.6, 3.7, 3.8, 3.9, 3.10