Merge branch 'main' into munir/remove-v03-encoder

.circleci/config.templ.yml

@@ -581,25 +581,6 @@ jobs:
           wait: cassandra
           pattern: 'cassandra'
 
-  celery:
-    <<: *contrib_job_large
-    docker:
-      - image: *ddtrace_dev_image
-      - image: *redis_image
-      - image: *rabbitmq_image
-      - image: *testagent_image
-        environment:
-        - LOG_LEVEL=DEBUG
-        - SNAPSHOT_DIR=/snapshots
-        - PORT=9126
-        - SNAPSHOT_CI=1
-        - DD_POOL_TRACE_CHECK_FAILURES=true
-        - DD_DISABLE_ERROR_RESPONSES=true
-        - ENABLED_CHECKS=trace_stall,meta_tracer_version_header,trace_content_length,trace_peer_service,trace_dd_service # disable flaky content length check
-    steps:
-      - run_test:
-          pattern: 'celery'
-
   consul:
     <<: *contrib_job_small
     docker:
@@ -722,17 +703,6 @@ jobs:
           wait: postgres
           pattern: 'aiopg'
 
-  kombu:
-    <<: *contrib_job
-    docker:
-      - image: *ddtrace_dev_image
-      - image: *rabbitmq_image
-      - *testagent
-    steps:
-      - run_test:
-          wait: rabbitmq
-          pattern: 'kombu'
-
   build_docs:
     # build documentation and store as an artifact
     executor: ddtrace_dev

.gitlab/services.yml

@@ -74,4 +74,6 @@
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
       POSTGRES_DB: postgres
-
+  rabbitmq:
+    name: registry.ddbuild.io/images/mirror/rabbitmq:3.12.7-management-alpine
+    alias: rabbitmq

.gitlab/tests/appsec.yml

@@ -29,6 +29,8 @@ appsec iast memcheck:
   parallel: 5
   variables:
     SUITE_NAME: "appsec_iast_memcheck"
+    CI_DEBUG_TRACE: "true" 
+    PYTEST_ADDOPTS: "-v -s" 
   retry: 2
 
 appsec threats django:
@@ -54,7 +56,7 @@ appsec threats fastapi:
 
 appsec aggregated leak testing:
   extends: .test_base_hatch
-  parallel: 6
+  parallel: 5
   variables:
     SUITE_NAME: "appsec_aggregated_leak_testing"
   retry: 2

.gitlab/tests/contrib.yml

@@ -33,6 +33,23 @@ bottle:
   variables:
     SUITE_NAME: "bottle"
 
+celery:
+  extends: .test_base_riot_snapshot    
+  services:
+    - !reference [.test_base_riot_snapshot, services]
+    - !reference [.services, rabbitmq]
+    - !reference [.services, redis]
+  variables:
+    SUITE_NAME: "celery"
+    LOG_LEVEL: DEBUG
+    SNAPSHOT_DIR: /snapshots
+    PORT: 9126
+    SNAPSHOT_CI: 1
+    DD_POOL_TRACE_CHECK_FAILURES: true
+    DD_DISABLE_ERROR_RESPONSES: true
+    ENABLED_CHECKS: trace_stall,meta_tracer_version_header,trace_content_length,trace_peer_service,trace_dd_service # disable flaky content length check
+
+
 cherrypy:
   extends: .test_base_riot_snapshot
   variables:
@@ -55,7 +72,7 @@ django_hosts:
   extends: .test_base_riot_snapshot
   variables:
     SUITE_NAME: 'django_hosts$'
-    
+
 djangorestframework:
   extends: .test_base_riot_snapshot
   services:
@@ -159,6 +176,14 @@ kafka:
     TEST_KAFKA_HOST: "kafka"
     TEST_KAFKA_PORT: "29092"
 
+kombu:
+  extends: .test_base_riot_snapshot
+  services:
+    - !reference [.test_base_riot_snapshot, services]
+    - !reference [.services, rabbitmq]
+  variables:
+    SUITE_NAME: "kombu"
+
 logbook:
   extends: .test_base_riot_snapshot
   variables:
@@ -188,7 +213,7 @@ opentracer:
   extends: .test_base_riot
   variables:
     SUITE_NAME: "opentracer"
-    
+
 pylibmc:
   extends: .test_base_riot_snapshot
   services:
@@ -290,7 +315,7 @@ structlog:
   extends: .test_base_riot_snapshot
   variables:
     SUITE_NAME: "structlog"
-    
+
 sourcecode:
   extends: .test_base_riot
   variables:

.riot/requirements/112dc22.txt

@@ -2,40 +2,40 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/112dc22.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/112dc22.in
 #
-aiofiles==23.2.1
+aiofiles==24.1.0
 aiosqlite==0.20.0
 anyio==3.7.1
-attrs==23.2.0
-certifi==2024.2.2
+attrs==24.2.0
+certifi==2024.8.30
 charset-normalizer==3.3.2
-coverage[toml]==7.4.4
+coverage[toml]==7.6.1
 databases==0.8.0
-exceptiongroup==1.2.0
+exceptiongroup==1.2.2
 greenlet==3.0.3
 h11==0.14.0
-httpcore==1.0.4
-httpx==0.27.0
+httpcore==1.0.5
+httpx==0.27.2
 hypothesis==6.45.0
-idna==3.6
-importlib-metadata==7.0.2
+idna==3.9
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.0
-pluggy==1.4.0
-pytest==8.1.1
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
 pytest-asyncio==0.21.1
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
-sqlalchemy==1.4.52
+sqlalchemy==1.4.54
 starlette==0.14.2
 tomli==2.0.1
-typing-extensions==4.10.0
-urllib3==2.2.1
-zipp==3.18.1
+typing-extensions==4.12.2
+urllib3==2.2.3
+zipp==3.20.2

.riot/requirements/1250d61.txt

@@ -2,23 +2,23 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1250d61.in
+#    pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1250d61.in
 #
 aiofiles==23.2.1
 aiosqlite==0.19.0
 anyio==3.7.1
-attrs==23.2.0
-certifi==2024.2.2
+attrs==24.2.0
+certifi==2024.8.30
 charset-normalizer==3.3.2
 coverage[toml]==7.2.7
 databases==0.8.0
-exceptiongroup==1.2.0
+exceptiongroup==1.2.2
 greenlet==3.0.3
 h11==0.14.0
 httpcore==0.17.3
 httpx==0.24.1
 hypothesis==6.45.0
-idna==3.6
+idna==3.9
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0
@@ -33,7 +33,7 @@ pytest-randomly==3.12.0
 requests==2.31.0
 sniffio==1.3.1
 sortedcontainers==2.4.0
-sqlalchemy==1.4.52
+sqlalchemy==1.4.54
 starlette==0.20.4
 tomli==2.0.1
 typing-extensions==4.7.1

.riot/requirements/156e3cc.txt

@@ -2,36 +2,36 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/156e3cc.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/156e3cc.in
 #
-aiofiles==23.2.1
+aiofiles==24.1.0
 aiosqlite==0.20.0
 anyio==3.7.1
-attrs==23.2.0
-certifi==2024.2.2
+attrs==24.2.0
+certifi==2024.8.30
 charset-normalizer==3.3.2
-coverage[toml]==7.4.4
+coverage[toml]==7.6.1
 databases==0.8.0
 greenlet==3.0.3
 h11==0.14.0
-httpcore==1.0.4
-httpx==0.27.0
+httpcore==1.0.5
+httpx==0.27.2
 hypothesis==6.45.0
-idna==3.6
+idna==3.9
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.0
-pluggy==1.4.0
-pytest==8.1.1
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
 pytest-asyncio==0.21.1
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
-sqlalchemy==1.4.52
+sqlalchemy==1.4.54
 starlette==0.21.0
-typing-extensions==4.10.0
-urllib3==2.2.1
+typing-extensions==4.12.2
+urllib3==2.2.3

.riot/requirements/17a0f7f.txt

@@ -2,36 +2,36 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/17a0f7f.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/17a0f7f.in
 #
-aiofiles==23.2.1
+aiofiles==24.1.0
 aiosqlite==0.20.0
 anyio==3.7.1
-attrs==23.2.0
-certifi==2024.2.2
+attrs==24.2.0
+certifi==2024.8.30
 charset-normalizer==3.3.2
-coverage[toml]==7.4.4
+coverage[toml]==7.6.1
 databases==0.8.0
 greenlet==3.0.3
 h11==0.14.0
-httpcore==1.0.4
-httpx==0.27.0
+httpcore==1.0.5
+httpx==0.27.2
 hypothesis==6.45.0
-idna==3.6
+idna==3.9
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.0
-pluggy==1.4.0
-pytest==8.1.1
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
 pytest-asyncio==0.21.1
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
-requests==2.31.0
+requests==2.32.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
-sqlalchemy==1.4.52
+sqlalchemy==1.4.54
 starlette==0.33.0
-typing-extensions==4.10.0
-urllib3==2.2.1
+typing-extensions==4.12.2
+urllib3==2.2.3