Merge branch 'main' into wantsui/celery-chain-task

Author: wantsui

.circleci/config.templ.yml

@@ -16,7 +16,7 @@ mongo_image: &mongo_image mongo:3.6@sha256:19c11a8f1064fd2bb713ef1270f79a742a184
 httpbin_image: &httpbin_image kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb
 vertica_image: &vertica_image vertica/vertica-ce:latest
 rabbitmq_image: &rabbitmq_image rabbitmq:3.7-alpine
-testagent_image: &testagent_image ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.17.0
+testagent_image: &testagent_image ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.20.0
 
 parameters:
   coverage:

.github/workflows/build_deploy.yml

@@ -40,7 +40,7 @@ jobs:
       - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: '3.7'
+          python-version: '3.12'
       - name: Build sdist
         run: |
           pip install "setuptools_scm[toml]>=4" "cython" "cmake>=3.24.2,<3.28" "setuptools-rust"

.github/workflows/pytorch_gpu_tests.yml

@@ -0,0 +1,43 @@
+name: Pytorch Unit Tests (with GPU) 
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'mq-working-branch**'
+    paths:
+      - 'ddtrace/profiling/collector/pytorch.py'
+  pull_request:
+    paths:
+      - 'ddtrace/profiling/collector/pytorch.py'
+  workflow_dispatch: 
+
+jobs:
+   unit-tests:
+    runs-on: APM-4-CORE-GPU-LINUX
+    steps:
+      - uses: actions/checkout@v4
+        # Include all history and tags
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v5
+        name: Install Python
+        with:
+          python-version: '3.12'
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install latest stable toolchain and rustfmt
+        run: rustup update stable && rustup default stable && rustup component add rustfmt clippy
+
+      - name: Install hatch
+        uses: pypa/hatch@install
+        with:
+          version: "1.12.0"
+      
+      - name: Install PyTorch
+        run: pip install torch
+
+      - name: Run tests
+        run: hatch run profiling_pytorch:test 

.gitlab/services.yml

@@ -12,7 +12,7 @@
       DD_REMOTE_CONFIGURATION_REFRESH_INTERVAL: 5s
       DD_DOGSTATSD_NON_LOCAL_TRAFFIC: true
   testagent:
-    name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.17.0
+    name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.20.0
     alias: testagent
     variables:
       LOG_LEVEL: INFO

.gitlab/tests.yml

@@ -1,5 +1,7 @@
 stages:
-  - tests
+  - precheck
+  - hatch
+  - riot
 
 variables:
   RIOT_RUN_CMD: riot -P -v run --exitfirst --pass-env -s
@@ -22,7 +24,7 @@ variables:
 
 .test_base_hatch:
   extends: .testrunner
-  stage: tests
+  stage: hatch
   # Hatch doesn't use pre-built wheels or venvs so we can start them right away
   needs: []
   parallel: 4
@@ -57,7 +59,7 @@ variables:
 
 build_base_venvs:
   extends: .testrunner
-  stage: tests
+  stage: riot
   parallel:
     matrix:
       - PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
@@ -76,9 +78,10 @@ build_base_venvs:
       - ddtrace/internal/datadog/profiling/crashtracker/crashtracker_exe*
       - ddtrace/internal/datadog/profiling/test/test_*
 
+# Do not define a `needs:` in order to depend on the whole `precheck` stage
 .test_base_riot:
   extends: .testrunner
-  stage: tests
+  stage: riot
   needs: [ build_base_venvs ]
   parallel: 4
   services:

.riot/requirements/1050efa.txt

@@ -5,16 +5,16 @@
 #    pip-compile --allow-unsafe --no-annotate .riot/requirements/1050efa.in
 #
 attrs==24.2.0
-coverage[toml]==7.6.1
+coverage[toml]==7.6.9
 hypothesis==6.45.0
 iniconfig==2.0.0
-mariadb==1.1.10
+mariadb==1.1.11
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.1
+packaging==24.2
 pluggy==1.5.0
-pytest==8.3.2
-pytest-cov==5.0.0
+pytest==8.3.4
+pytest-cov==6.0.0
 pytest-mock==3.14.0
-pytest-randomly==3.15.0
+pytest-randomly==3.16.0
 sortedcontainers==2.4.0

.riot/requirements/12594bd.txt

@@ -2,25 +2,25 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/12594bd.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/12594bd.in
 #
-async-timeout==4.0.3
-asyncpg==0.29.0
-attrs==23.2.0
-coverage[toml]==7.4.0
-exceptiongroup==1.2.0
+async-timeout==5.0.1
+asyncpg==0.30.0
+attrs==24.2.0
+coverage[toml]==7.6.9
+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
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.4
-pytest-asyncio==0.21.1
-pytest-cov==4.1.0
-pytest-mock==3.12.0
-pytest-randomly==3.15.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.4
+pytest-asyncio==0.21.2
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.16.0
 sortedcontainers==2.4.0
-tomli==2.0.1
-zipp==3.17.0
+tomli==2.2.1
+zipp==3.21.0

.riot/requirements/12c10e8.txt

@@ -5,20 +5,20 @@
 #    pip-compile --allow-unsafe --no-annotate .riot/requirements/12c10e8.in
 #
 attrs==24.2.0
-coverage[toml]==7.6.1
+coverage[toml]==7.6.9
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.4.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
-mariadb==1.1.10
+mariadb==1.1.11
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.1
+packaging==24.2
 pluggy==1.5.0
-pytest==8.3.2
-pytest-cov==5.0.0
+pytest==8.3.4
+pytest-cov==6.0.0
 pytest-mock==3.14.0
-pytest-randomly==3.15.0
+pytest-randomly==3.16.0
 sortedcontainers==2.4.0
-tomli==2.0.1
-zipp==3.20.0
+tomli==2.2.1
+zipp==3.21.0

.riot/requirements/12cb0e7.txt

@@ -5,16 +5,16 @@
 #    pip-compile --allow-unsafe --no-annotate .riot/requirements/12cb0e7.in
 #
 attrs==24.2.0
-coverage[toml]==7.6.1
+coverage[toml]==7.6.9
 hypothesis==6.45.0
 iniconfig==2.0.0
-mariadb==1.1.10
+mariadb==1.1.11
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.1
+packaging==24.2
 pluggy==1.5.0
-pytest==8.3.2
-pytest-cov==5.0.0
+pytest==8.3.4
+pytest-cov==6.0.0
 pytest-mock==3.14.0
-pytest-randomly==3.15.0
+pytest-randomly==3.16.0
 sortedcontainers==2.4.0

.riot/requirements/147bedb.txt

@@ -5,20 +5,20 @@
 #    pip-compile --allow-unsafe --no-annotate .riot/requirements/147bedb.in
 #
 attrs==24.2.0
-coverage[toml]==7.6.1
+coverage[toml]==7.6.9
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.4.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
-mariadb==1.1.10
+mariadb==1.1.11
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.1
+packaging==24.2
 pluggy==1.5.0
-pytest==8.3.2
-pytest-cov==5.0.0
+pytest==8.3.4
+pytest-cov==6.0.0
 pytest-mock==3.14.0
-pytest-randomly==3.15.0
+pytest-randomly==3.16.0
 sortedcontainers==2.4.0
-tomli==2.0.1
-zipp==3.20.0
+tomli==2.2.1
+zipp==3.21.0