Merge remote-tracking branch 'origin/main' into develop-windows

Author: TimPansino

.devcontainer/Dockerfile

@@ -26,10 +26,8 @@ RUN mkdir -p ${HOME} && \
     useradd --uid ${UID} --gid ${GID} --home ${HOME} vscode && \
     chown -R ${UID}:${GID} /home/vscode
 
-# Fix pyenv installation
-RUN echo 'eval "$(pyenv init -)"' >>${HOME}/.bashrc && \
-    chown -R vscode:vscode "${PYENV_ROOT}" && \
-    chown -R vscode:vscode "${PIPX_HOME}"
+# Allow uv to download Python versions manually
+ENV UV_PYTHON_DOWNLOADS=manual
 
 # Set user
 USER ${UID}:${GID}

.github/.trivyignore

@@ -2,7 +2,7 @@
 # Ignored Vulnerabilities
 # =======================
 
-# Accepting risk due to Python 3.7 and 3.8 support.
+# Accepting risk due to Python 3.8 support.
 CVE-2025-50181
 
 # Not relevant, only affects Pyodide

codecov.yml renamed to .github/codecov.yml

@@ -23,7 +23,6 @@ ignore:
   - "newrelic/hooks/database_psycopg2ct.py"
   - "newrelic/hooks/datastore_aioredis.py"
   - "newrelic/hooks/datastore_aredis.py"
-  - "newrelic/hooks/datastore_motor.py"
   - "newrelic/hooks/datastore_pyelasticsearch.py"
   - "newrelic/hooks/external_dropbox.py"
   - "newrelic/hooks/external_facepy.py"

.github/containers/Dockerfile

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 ARG TARGETPLATFORM
 
 # Install OS packages
@@ -103,36 +103,34 @@ RUN ln -fs "/usr/share/zoneinfo/${TZ}" /etc/localtime && \
 ENV HOME=/root
 WORKDIR "${HOME}"
 
-# Install pyenv
-ENV PYENV_ROOT="/usr/local/pyenv"
-RUN curl https://pyenv.run/ | /bin/bash
-ENV PATH="${PYENV_ROOT}/bin:${PYENV_ROOT}/shims:${PATH}"
-RUN echo 'eval "$(pyenv init -)"' >>${HOME}/.bashrc && \
-    pyenv update
+# Install and configure uv
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+ENV PATH="${HOME}/.local/bin:${PATH}"
+ENV UV_PYTHON_PREFERENCE="only-managed"
+ENV UV_LINK_MODE="copy"
 
-# Install Python
-ARG PYTHON_VERSIONS="3.12 3.11 3.10 3.9 3.8 3.7 3.13 pypy3.10-7.3.17"
-COPY --chown=0:0 --chmod=755 ./install-python.sh /tmp/install-python.sh
-RUN /tmp/install-python.sh && \
-    rm /tmp/install-python.sh
+# Install PyPy versions and rename shims
+RUN uv python install -f pp3.11 pp3.10
+RUN mv "${HOME}/.local/bin/python3.11" "${HOME}/.local/bin/pypy3.11" && \
+    mv "${HOME}/.local/bin/python3.10" "${HOME}/.local/bin/pypy3.10"
 
-# Install dependencies for main python installation
-COPY ./requirements.txt /tmp/requirements.txt
-RUN pyenv exec pip install --upgrade -r /tmp/requirements.txt && \
-    rm /tmp/requirements.txt
+# Install CPython versions
+RUN uv python install -f cp3.14 cp3.13 cp3.12 cp3.11 cp3.10 cp3.9 cp3.8
 
-# Install tools with pipx in isolated environments
-COPY ./requirements-tools.txt /tmp/requirements-tools.txt
-ENV PIPX_HOME="/opt/pipx"
-ENV PIPX_BIN_DIR="${PIPX_HOME}/bin"
-ENV PATH="${PIPX_BIN_DIR}:${PATH}"
-RUN mkdir -p "${PIPX_BIN_DIR}" && \
-    while IFS="" read -r line || [ -n "$line" ]; do \
-        pyenv exec pipx install --global "${line}"; \
-    done </tmp/requirements-tools.txt && \
-    rm /tmp/requirements-tools.txt
+# Set default Python version to CPython 3.13
+RUN uv python install -f --default cp3.13
 
-# Inject compatibile dependencies for tox
-COPY ./requirements-tox.txt /tmp/requirements-tox.txt
-RUN pipx inject --force tox -r /tmp/requirements-tox.txt && \
-    rm /tmp/requirements-tox.txt
+# Add shim for pip to use 'uv pip'
+COPY --chmod=775 <<EOF "${HOME}/.local/bin/pip"
+#!/bin/bash
+exec uv pip \$@
+EOF
+
+# Prevent any runtime downloads
+ENV UV_PYTHON_DOWNLOADS=never
+
+# Install tools with uv in isolated environments
+RUN uv tool install tox==4.23.2 --with tox-uv && \
+    uv tool install ruff && \
+    uv tool install pre-commit --with pre-commit-uv && \
+    uv tool install asv --with virtualenv

.github/containers/Makefile

@@ -14,7 +14,6 @@
 
 # Override constants
 PLATFORM_OVERRIDE:=
-PYTHON_VERSIONS_OVERRIDE:=
 
 # Computed variables
 IMAGE_NAME:=ghcr.io/newrelic/newrelic-python-agent-ci
@@ -23,8 +22,6 @@ REPO_ROOT:=$(realpath ${MAKEFILE_DIR}../../)
 UNAME_P:=$(shell uname -p)
 PLATFORM_AUTOMATIC:=$(if $(findstring arm,${UNAME_P}),linux/arm64,linux/amd64)
 PLATFORM:=$(if ${PLATFORM_OVERRIDE},${PLATFORM_OVERRIDE},${PLATFORM_AUTOMATIC})
-PYTHON_VERSIONS_AUTOMATIC:=3.10
-PYTHON_VERSIONS:=$(if ${PYTHON_VERSIONS_OVERRIDE},${PYTHON_VERSIONS_OVERRIDE},${PYTHON_VERSIONS_AUTOMATIC})
 
 .PHONY: default
 default: test
@@ -33,8 +30,7 @@ default: test
 build:
 	@docker build ${MAKEFILE_DIR} \
 		--platform=${PLATFORM} \
-		-t ${IMAGE_NAME}:local \
-		--build-arg='PYTHON_VERSIONS=${PYTHON_VERSIONS}'
+		-t ${IMAGE_NAME}:local
 
 # Run the local tag as a container.
 .PHONY: run
@@ -62,12 +58,12 @@ run.%:
 		-e GITHUB_ACTIONS="true" \
 		${IMAGE_NAME}:$* /bin/bash
 
-# Ensure python versions are usable. Cannot be automatically used with PYTHON_VERSIONS_OVERRIDE.
+# Ensures python versions are usable.
 .PHONY: test
 test: build
 	@docker run --rm \
 		--platform=${PLATFORM} \
-		ghcr.io/newrelic/python-agent-ci:local \
+		${IMAGE_NAME}:local \
 		/bin/bash -c '\
 			python3.10 --version && \
 			touch tox.ini && tox --version && \

.github/containers/install-python.sh

@@ -0,0 +1,70 @@
+# Copyright 2010 New Relic, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+name: Benchmarks
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.ref || github.run_id }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  # Benchmarks
+  benchmark:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
+    strategy:
+      matrix:
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    env:
+      ASV_FACTOR: "1.1"
+      BASE_SHA: ${{ github.event.pull_request.base.sha }}
+
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # 6.0.0
+        with:
+          python-version: "${{ matrix.python }}"
+
+      - name: Fetch git tags
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git fetch --tags origin
+
+      - name: Install Dependencies
+        run: |
+          pip install --upgrade pip
+          pip install asv virtualenv
+
+      - name: Configure Machine Information
+        run: |
+          asv machine --yes
+
+      - name: Run Benchmark
+        run: |
+          asv continuous \
+            --show-stderr \
+            --split \
+            --factor "${ASV_FACTOR}" \
+            --python=${{ matrix.python }} \
+            "${BASE_SHA}" "${GITHUB_SHA}"