Merge branch 'main' into sanchda/make_contextvars_indirect

.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

.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 }}

.github/workflows/system-tests.yml

@@ -78,6 +78,10 @@ jobs:
       # If ever it's needed, a valid key exists in the repo, using ${{ secrets.DD_API_KEY }}
       DD_API_KEY: 1234567890abcdef1234567890abcdef
       CMAKE_BUILD_PARALLEL_LEVEL: 12
+      AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION:  us-east-1
+      AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
     steps:
 
       - name: Checkout system tests
@@ -132,6 +136,10 @@ jobs:
       # If ever it's needed, a valid key exists in the repo, using ${{ secrets.DD_API_KEY }}
       DD_API_KEY: 1234567890abcdef1234567890abcdef
       CMAKE_BUILD_PARALLEL_LEVEL: 12
+      AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION:  us-east-1
+      AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
     steps:
 
       - name: Checkout system tests
@@ -304,3 +312,15 @@ jobs:
         with:
           name: logs_parametric
           path: artifact.tar.gz
+
+  finished:
+    runs-on: ubuntu-latest
+    needs: [parametric, system-tests]
+    if: success() || failure()
+    steps:
+      - name: True when everything else succeeded
+        if: needs.parametric.result == 'success' && needs.system-tests.result == 'success'
+        run: exit 0
+      - name: Fails if anything else failed
+        if: needs.parametric.result != 'success' || needs.system-tests.result != 'success'
+        run: exit 1

.gitlab/package.yml

@@ -5,7 +5,7 @@ build_base_venvs:
     matrix:
       - PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
   variables:
-    CMAKE_BUILD_PARALLEL_LEVEL: 24
+    CMAKE_BUILD_PARALLEL_LEVEL: 12
     PIP_VERBOSE: 1
   script:
     - pip install riot~=0.19.1

.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

.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

.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

.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

.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

.riot/requirements/1683094.txt → .riot/requirements/13f7667.txt

@@ -2,34 +2,35 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1683094.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/13f7667.in
 #
 aiofiles==24.1.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.86.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==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.20.4
 typing-extensions==4.12.2
-urllib3==2.2.2
+urllib3==2.2.3

.riot/requirements/172570f.txt → .riot/requirements/1424e42.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/172570f.in
+#    pip-compile --no-annotate .riot/requirements/1424e42.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 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

.riot/requirements/9627328.txt → .riot/requirements/14e85f3.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/9627328.in
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/14e85f3.in
 #
 attrs==24.2.0
 coverage[toml]==7.6.1
 dnspython==2.6.1
 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

.riot/requirements/1b3efb5.txt → .riot/requirements/16759fe.txt

@@ -2,12 +2,12 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1b3efb5.in
+#    pip-compile --allow-unsafe --no-annotate --resolver=backtracking .riot/requirements/16759fe.in
 #
 aiofiles==23.2.1
 anyio==3.7.1
 attrs==24.2.0
-certifi==2024.7.4
+certifi==2024.8.30
 charset-normalizer==3.3.2
 coverage[toml]==7.2.7
 exceptiongroup==1.2.2
@@ -16,7 +16,7 @@ h11==0.14.0
 httpcore==0.17.3
 httpx==0.24.1
 hypothesis==6.45.0
-idna==3.8
+idna==3.10
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0
@@ -29,6 +29,7 @@ pytest-asyncio==0.21.1
 pytest-cov==4.1.0
 pytest-mock==3.11.1
 pytest-randomly==3.12.0
+python-multipart==0.0.8
 requests==2.31.0
 sniffio==1.3.1
 sortedcontainers==2.4.0