Merge branch 'main' into evan.li/ragas-skeleton

.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

.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

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

.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

.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

.riot/requirements/13fe884.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/13fe884.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/13fe884.in
 #
-attrs==23.2.0
-coverage[toml]==7.4.0
+attrs==24.2.0
+coverage[toml]==7.6.1
 hypothesis==6.45.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
+packaging==24.1
+pluggy==1.5.0
 pymongo==3.12.3
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0

.riot/requirements/14b37e6.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/14b37e6.in
+#    pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/14b37e6.in
 #
 attrs==24.2.0
 coverage[toml]==7.2.7
@@ -11,7 +11,7 @@ hypothesis==6.45.0
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.29.0
+mongoengine==0.29.1
 opentracing==2.4.0
 packaging==24.0
 pluggy==1.2.0

.riot/requirements/167d6de.txt

@@ -2,24 +2,24 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/167d6de.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/167d6de.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.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
 sortedcontainers==2.4.0
 tomli==2.0.1
-zipp==3.20.1
+zipp==3.20.2

.riot/requirements/185fc1c.txt

@@ -2,24 +2,24 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/185fc1c.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/185fc1c.in
 #
-attrs==23.2.0
-coverage[toml]==7.4.0
-exceptiongroup==1.2.0
+attrs==24.2.0
+coverage[toml]==7.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
+packaging==24.1
+pluggy==1.5.0
 pymongo==3.13.0
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+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

.riot/requirements/19aba18.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/19aba18.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/19aba18.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

.riot/requirements/1ba8c21.txt

@@ -2,21 +2,21 @@
 # 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/1ba8c21.in
+#    pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1ba8c21.in
 #
-attrs==23.2.0
+attrs==24.2.0
 coverage[toml]==7.2.7
 dnspython==2.3.0
-exceptiongroup==1.2.0
+exceptiongroup==1.2.2
 hypothesis==6.45.0
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0
-mongoengine==0.27.0
+mongoengine==0.29.1
 opentracing==2.4.0
-packaging==23.2
+packaging==24.0
 pluggy==1.2.0
-pymongo==4.6.1
+pymongo==4.7.3
 pytest==7.4.4
 pytest-cov==4.1.0
 pytest-mock==3.11.1

.riot/requirements/1dbb110.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/1dbb110.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1dbb110.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

.riot/requirements/1e60db0.txt

@@ -2,20 +2,20 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/1e60db0.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1e60db0.in
 #
-attrs==23.2.0
-coverage[toml]==7.4.0
+attrs==24.2.0
+coverage[toml]==7.6.1
 hypothesis==6.45.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
+packaging==24.1
+pluggy==1.5.0
 pymongo==3.12.3
-pytest==7.4.4
-pytest-cov==4.1.0
-pytest-mock==3.12.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
 pytest-randomly==3.15.0
 sortedcontainers==2.4.0