Merge branch 'main' into aleksandr.pasechnik/cleanup-trace-utils

DataDog · Sep 30, 2024 · 7978006 · 7978006
2 parents d47c48e + 7e8eb0b
commit 7978006
Show file tree

Hide file tree

Showing 323 changed files with 14,895 additions and 4,638 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -51,26 +51,31 @@ tests/runtime                       @DataDog/apm-core-python
 tests/tracer                        @DataDog/apm-core-python
 
 # CI App and related
-ddtrace/contrib/coverage            @DataDog/ci-app-libraries
-ddtrace/contrib/pytest              @DataDog/ci-app-libraries
-ddtrace/contrib/pytest_bdd          @DataDog/ci-app-libraries
-ddtrace/contrib/unittest            @DataDog/ci-app-libraries
-tests/contrib/pytest                @DataDog/ci-app-libraries
-tests/contrib/pytest_bdd            @DataDog/ci-app-libraries
-tests/contrib/unittest_plugin       @DataDog/ci-app-libraries
-ddtrace/ext/ci.py                   @DataDog/ci-app-libraries
-ddtrace/ext/test_visibility         @DataDog/ci-app-libraries
-ddtrace/ext/test.py                 @DataDog/ci-app-libraries
-ddtrace/internal/ci_visibility      @DataDog/ci-app-libraries
-ddtrace/internal/test_visibility    @DataDog/ci-app-libraries
-ddtrace/internal/codeowners.py      @DataDog/apm-core-python @datadog/ci-app-libraries
-ddtrace/internal/coverage           @DataDog/apm-core-python @datadog/ci-app-libraries
-tests/internal/test_codeowners.py   @datadog/ci-app-libraries
-tests/ci_visibility                 @DataDog/ci-app-libraries
-tests/coverage                      @DataDog/apm-core-python @DataDog/ci-app-libraries
-tests/tracer/test_ci.py             @DataDog/ci-app-libraries
-ddtrace/ext/git.py                  @DataDog/ci-app-libraries @DataDog/apm-core-python
-scripts/ci_visibility/*             @DataDog/ci-app-libraries
+ddtrace/contrib/asynctest                             @DataDog/ci-app-libraries
+ddtrace/contrib/coverage                              @DataDog/ci-app-libraries
+ddtrace/contrib/pytest                                @DataDog/ci-app-libraries
+ddtrace/contrib/pytest_bdd                            @DataDog/ci-app-libraries
+ddtrace/contrib/pytest_benchmark                      @DataDog/ci-app-libraries
+ddtrace/contrib/unittest                              @DataDog/ci-app-libraries
+tests/contrib/asynctest                               @DataDog/ci-app-libraries
+tests/contrib/pytest                                  @DataDog/ci-app-libraries
+tests/contrib/pytest_bdd                              @DataDog/ci-app-libraries
+tests/contrib/pytest_benchmark                        @DataDog/ci-app-libraries
+tests/contrib/unittest                                @DataDog/ci-app-libraries
+tests/integration/test_integration_civisibility.py    @DataDog/ci-app-libraries
+ddtrace/ext/ci.py                                     @DataDog/ci-app-libraries
+ddtrace/ext/test_visibility                           @DataDog/ci-app-libraries
+ddtrace/ext/test.py                                   @DataDog/ci-app-libraries
+ddtrace/internal/ci_visibility                        @DataDog/ci-app-libraries
+ddtrace/internal/test_visibility                      @DataDog/ci-app-libraries
+ddtrace/internal/codeowners.py                        @DataDog/apm-core-python @datadog/ci-app-libraries
+ddtrace/internal/coverage                             @DataDog/apm-core-python @datadog/ci-app-libraries
+tests/internal/test_codeowners.py                     @datadog/ci-app-libraries
+tests/ci_visibility                                   @DataDog/ci-app-libraries
+tests/coverage                                        @DataDog/apm-core-python @DataDog/ci-app-libraries
+tests/tracer/test_ci.py                               @DataDog/ci-app-libraries
+ddtrace/ext/git.py                                    @DataDog/ci-app-libraries @DataDog/apm-core-python
+scripts/ci_visibility/*                               @DataDog/ci-app-libraries
 
 # Debugger
 ddtrace/debugging/                  @DataDog/debugger-python

diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
@@ -77,25 +77,3 @@ jobs:
         run: python $GITHUB_WORKSPACE/tests/smoke_test.py
         # Move out of the workspace to avoid importing ddtrace from the source
         working-directory: /
-
-  upload_pypi:
-    needs:
-      - build_wheels
-      - test_alpine_sdist
-    runs-on: ubuntu-latest
-    if: (github.event_name == 'release' && github.event.action == 'published')
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          path: dist
-          merge-multiple: true
-
-      - uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_TOKEN }}
-          # To test: repository_url: https://test.pypi.org/legacy/
-          # Setting skip_existing will prevent the deploy from erring out early
-          # due to a duplicate wheel being present which will ensure that the rest
-          # of the wheels will be uploaded if some are uploaded manually.
-          skip_existing: true
diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml
@@ -82,7 +82,7 @@ jobs:
           platforms: all
 
       - name: Build wheels arm64
-        if: matrix.os == 'arm-4core-linux'
+        if: always() && matrix.os == 'arm-4core-linux'
         run: /home/runner/.local/bin/pipx run cibuildwheel==2.16.5 --only ${{ matrix.only }}
         env:
           CIBW_SKIP: ${{ inputs.cibw_skip }}
@@ -116,7 +116,7 @@ jobs:
           # CIBW_BUILD_VERBOSITY_MACOS: 3
 
       - name: Build wheels
-        if: matrix.os != 'arm-4core-linux'
+        if: always() && matrix.os != 'arm-4core-linux'
         uses: pypa/[email protected]
         with:
           only: ${{ matrix.only }}

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -44,7 +44,14 @@ onboarding_tests_installer:
 onboarding_tests_k8s_injection:
   parallel:
     matrix:
-      - WEBLOG_VARIANT: [dd-lib-python-init-test-django, dd-lib-python-init-test-django-gunicorn, dd-lib-python-init-test-django-uvicorn, dd-lib-python-init-test-protobuf-old]
+      - WEBLOG_VARIANT:
+          - dd-lib-python-init-test-django
+          - dd-lib-python-init-test-django-gunicorn
+          - dd-lib-python-init-test-django-gunicorn-alpine
+          - dd-lib-python-init-test-django-preinstalled
+          - dd-lib-python-init-test-django-unsupported-package-force
+          - dd-lib-python-init-test-django-uvicorn
+          - dd-lib-python-init-test-protobuf-old
 
 deploy_to_di_backend:manual:
   stage: shared-pipeline

diff --git a/.gitlab/package.yml b/.gitlab/package.yml
@@ -15,7 +15,7 @@ build_base_venvs:
     paths:
       - .riot/venv_*
       - ddtrace/**/*.so*
-      - ddtrace/internal/datadog/profiling/crashtracker/crashtracker_exe
+      - ddtrace/internal/datadog/profiling/crashtracker/crashtracker_exe*
 
 download_ddtrace_artifacts:
   image: registry.ddbuild.io/github-cli:v27480869-eafb11d-2.43.0

diff --git a/.gitlab/prepare-oci-package.sh b/.gitlab/prepare-oci-package.sh
@@ -25,6 +25,16 @@ BUILD_DIR=sources
 
 echo -n "$PYTHON_PACKAGE_VERSION" > sources/version
 
+echo "Cleaning up binaries for ${ARCH}"
+if [ "${ARCH}" == "arm64" ]; then
+  echo "Removing x86_64 binaries"
+  find ../pywheels-dep/ -type f -name '*x86_64*' -exec rm -f {} \;
+elif [ "${ARCH}" == "amd64" ]; then
+  echo "Removing aarch64 binaries"
+  find ../pywheels-dep/ -type f -name '*aarch64*' -exec rm -f {} \;
+else
+  echo "No ARCH set, not removing any binaries"
+fi
 cp -r ../pywheels-dep/site-packages* sources/ddtrace_pkgs
 
 cp ../lib-injection/sources/* sources/
diff --git a/.gitlab/release.yml b/.gitlab/release.yml
@@ -33,15 +33,15 @@ variables:
       - pywheels/*.whl
       - pywheels/*.tar.gz
 
-release_pypi_test:
+# Can be used to validate uploading of artifacts
+# release_pypi_test:
+#   extends: .release_pypi
+#   dependencies: [ "download_ddtrace_artifacts" ]
+#   variables:
+#     PYPI_REPOSITORY: testpypi
+
+release_pypi_prod:
   extends: .release_pypi
   dependencies: [ "download_ddtrace_artifacts" ]
   variables:
-    PYPI_REPOSITORY: testpypi
-
-# TODO: Replace GitHub Action PyPI upload with this job
-# release_pypi_prod:
-#   extends: .release_pypi
-#   needs: [ "release_pypi_test" ]
-#   variables:
-#     PYPI_REPOSITORY: pypi
+    PYPI_REPOSITORY: pypi
diff --git a/.gitlab/tests/appsec.yml b/.gitlab/tests/appsec.yml
@@ -15,6 +15,7 @@ appsec iast:
     SUITE_NAME: "appsec_iast$"
     TEST_POSTGRES_HOST: "postgres"
   retry: 2
+  timeout: 25m
 
 appsec iast tdd_propagation:
   extends: .test_base_riot_snapshot

diff --git a/.riot/requirements/eb3b2f1.txt → .riot/requirements/108f9cf.txt b/.riot/requirements/eb3b2f1.txt → .riot/requirements/108f9cf.txt
@@ -2,12 +2,12 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/eb3b2f1.in
+#    pip-compile --allow-unsafe --no-annotate --resolver=backtracking .riot/requirements/108f9cf.in
 #
 aiofiles==24.1.0
-anyio==4.4.0
+anyio==4.6.0
 attrs==24.2.0
-certifi==2024.7.4
+certifi==2024.8.30
 charset-normalizer==3.3.2
 coverage[toml]==7.6.1
 exceptiongroup==1.2.2
@@ -16,22 +16,23 @@ h11==0.14.0
 httpcore==1.0.5
 httpx==0.27.2
 hypothesis==6.45.0
-idna==3.8
+idna==3.10
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pydantic==1.10.18
-pytest==8.3.2
+pytest==8.3.3
 pytest-asyncio==0.21.1
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
+python-multipart==0.0.10
 requests==2.32.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
 starlette==0.23.1
 tomli==2.0.1
 typing-extensions==4.12.2
-urllib3==2.2.2
+urllib3==2.2.3
diff --git a/.riot/requirements/f97f8c0.txt → .riot/requirements/10a00e7.txt b/.riot/requirements/f97f8c0.txt → .riot/requirements/10a00e7.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/f97f8c0.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/10a00e7.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
@@ -11,12 +11,12 @@ exceptiongroup==1.2.2
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.28.2
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==4.8.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0

diff --git a/.riot/requirements/12616cb.txt b/.riot/requirements/12616cb.txt
@@ -2,24 +2,24 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/12616cb.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/12616cb.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.4.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.29.0
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pymongo==3.9.0
-pytest==8.3.2
+pytest==8.3.3
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0
 tomli==2.0.1
-zipp==3.20.1
+zipp==3.20.2
diff --git a/.riot/requirements/13015fd.txt b/.riot/requirements/13015fd.txt
@@ -2,25 +2,25 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/13015fd.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/13015fd.in
 #
-attrs==23.2.0
-coverage[toml]==7.4.0
-dnspython==2.4.2
-exceptiongroup==1.2.0
+attrs==24.2.0
+coverage[toml]==7.6.1
+dnspython==2.6.1
+exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==7.0.1
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.27.0
+mongoengine==0.29.1
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pymongo==4.6.1
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+packaging==24.1
+pluggy==1.5.0
+pymongo==4.9.1
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0
 tomli==2.0.1
-zipp==3.17.0
+zipp==3.20.2
diff --git a/.riot/requirements/958996c.txt → .riot/requirements/1322180.txt b/.riot/requirements/958996c.txt → .riot/requirements/1322180.txt
@@ -2,12 +2,12 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/958996c.in
+#    pip-compile --allow-unsafe --no-annotate --resolver=backtracking .riot/requirements/1322180.in
 #
 aiofiles==24.1.0
-anyio==4.4.0
+anyio==4.6.0
 attrs==24.2.0
-certifi==2024.7.4
+certifi==2024.8.30
 charset-normalizer==3.3.2
 coverage[toml]==7.6.1
 exceptiongroup==1.2.2
@@ -16,22 +16,23 @@ h11==0.14.0
 httpcore==1.0.5
 httpx==0.27.2
 hypothesis==6.45.0
-idna==3.8
+idna==3.10
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
 pydantic==1.10.18
-pytest==8.3.2
+pytest==8.3.3
 pytest-asyncio==0.21.1
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
+python-multipart==0.0.10
 requests==2.32.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
 starlette==0.13.6
 tomli==2.0.1
 typing-extensions==4.12.2
-urllib3==2.2.2
+urllib3==2.2.3
diff --git a/.riot/requirements/7faa8e0.txt → .riot/requirements/134c543.txt b/.riot/requirements/7faa8e0.txt → .riot/requirements/134c543.txt
@@ -2,36 +2,37 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/7faa8e0.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/134c543.in
 #
 aiofiles==24.1.0
 annotated-types==0.7.0
 anyio==3.7.1
 attrs==24.2.0
-certifi==2024.7.4
+certifi==2024.8.30
 charset-normalizer==3.3.2
 coverage[toml]==7.6.1
-fastapi==0.112.2
+fastapi==0.115.0
 h11==0.14.0
 httpcore==1.0.5
 httpx==0.27.2
 hypothesis==6.45.0
-idna==3.8
+idna==3.10
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
 packaging==24.1
 pluggy==1.5.0
-pydantic==2.8.2
-pydantic-core==2.20.1
-pytest==8.3.2
+pydantic==2.9.2
+pydantic-core==2.23.4
+pytest==8.3.3
 pytest-asyncio==0.21.1
 pytest-cov==5.0.0
 pytest-mock==3.14.0
 pytest-randomly==3.15.0
+python-multipart==0.0.10
 requests==2.32.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
-starlette==0.38.2
+starlette==0.38.6
 typing-extensions==4.12.2
-urllib3==2.2.2
+urllib3==2.2.3