Merge branch 'main' into munir/remove-patch-unpatch-get-version-from-…

…public-api

.circleci/config.templ.yml

@@ -404,12 +404,12 @@ jobs:
           paths:
             - "."
 
-  appsec_integrations:
+  appsec_integrations_pygoat:
     <<: *machine_executor
     parallelism: 13
     steps:
       - run_test:
-          pattern: 'appsec_integrations'
+          pattern: 'appsec_integrations_pygoat'
           snapshot: true
           run_agent_checks: false
           docker_services: "pygoat"

.github/CODEOWNERS

@@ -119,8 +119,6 @@ tests/appsec/                       @DataDog/asm-python
 tests/contrib/dbapi/test_dbapi_appsec.py    @DataDog/asm-python
 tests/contrib/subprocess            @DataDog/asm-python
 tests/contrib/flask/test_flask_appsec.py    @DataDog/asm-python
-tests/contrib/django/django_app/appsec_urls.py @DataDog/asm-python
-tests/contrib/django/test_django_appsec.py  @DataDog/asm-python
 tests/snapshots/tests*appsec*.json  @DataDog/asm-python
 tests/contrib/*/test*appsec*.py     @DataDog/asm-python
 scripts/iast/*                      @DataDog/asm-python
@@ -147,6 +145,8 @@ ddtrace/contrib/internal/google_generativeai            @DataDog/ml-observabilit
 ddtrace/contrib/google_generativeai                     @DataDog/ml-observability
 ddtrace/contrib/internal/vertexai                       @DataDog/ml-observability
 ddtrace/contrib/vertexai                                @DataDog/ml-observability
+ddtrace/contrib/langgraph                               @DataDog/ml-observability
+ddtrace/contrib/internal/langgraph                      @DataDog/ml-observability
 tests/llmobs                                            @DataDog/ml-observability
 tests/contrib/openai                                    @DataDog/ml-observability
 tests/contrib/langchain                                 @DataDog/ml-observability
@@ -156,6 +156,7 @@ tests/contrib/botocore/bedrock_cassettes                @DataDog/ml-observabilit
 tests/contrib/anthropic                                 @DataDog/ml-observability
 tests/contrib/google_generativeai                       @DataDog/ml-observability
 tests/contrib/vertexai                                  @DataDog/ml-observability
+tests/contrib/langgraph                                 @DataDog/ml-observability
 .gitlab/tests/llmobs.yml                                @DataDog/ml-observability
 
 # Remote Config

.github/workflows/system-tests.yml

@@ -47,6 +47,7 @@ jobs:
           - weblog-variant: fastapi
           # runs django-poc for 3.12
           - weblog-variant: python3.12
+          - weblog-variant: django-py3.13
       fail-fast: false
     env:
       TEST_LIBRARY: python
@@ -96,7 +97,7 @@ jobs:
     needs: [system-tests-build-agent, system-tests-build-weblog]
     strategy:
       matrix:
-        weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12]
+        weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12, django-py3.13]
         scenario: [remote-config, appsec, appsec-1, other, debugger-1, debugger-2]
 
       fail-fast: false

.gitlab/prepare-oci-package.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eo pipefail
 
 if [ -n "$CI_COMMIT_TAG" ] && [ -z "$PYTHON_PACKAGE_VERSION" ]; then
   PYTHON_PACKAGE_VERSION=${CI_COMMIT_TAG##v}
@@ -38,3 +39,18 @@ fi
 cp -r ../pywheels-dep/site-packages* sources/ddtrace_pkgs
 
 cp ../lib-injection/sources/* sources/
+
+if ! type rdfind &> /dev/null; then
+  clean-apt install rdfind
+fi
+echo "Deduplicating package files"
+cd ./sources
+rdfind -makesymlinks true -makeresultsfile true -checksum sha256 -deterministic true -outputname deduped.txt .
+echo "Converting symlinks to relative symlinks"
+find . -type l | while read -r l; do
+  target="$(realpath "$l")"
+  rel_target="$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")"
+  dest_base="$(basename "$l")"
+  dest_dir="$(dirname "$l")"
+  (cd "${dest_dir}" && ln -sf "${rel_target}" "${dest_base}")
+done

.riot/requirements/115283d.txt

@@ -0,0 +1,42 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/115283d.in
+#
+anyio==4.7.0
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.10
+h11==0.14.0
+httpcore==1.0.7
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+jsonpatch==1.33
+jsonpointer==3.0.0
+langchain-core==0.3.28
+langgraph==0.2.60
+langgraph-checkpoint==2.0.9
+langgraph-sdk==0.1.48
+langsmith==0.2.6
+mock==5.1.0
+msgpack==1.1.0
+opentracing==2.4.0
+orjson==3.10.12
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-asyncio==0.25.0
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pyyaml==6.0.2
+requests==2.32.3
+requests-toolbelt==1.0.0
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tenacity==9.0.0
+typing-extensions==4.12.2
+urllib3==2.3.0