Merge Changes for v12.0.0

.github/.trivyignore

@@ -1,16 +1 @@
-# =============================
-# Accepted Risk Vulnerabilities
-# =============================
-
-# Accepting risk due to Python 3.8 support.
-CVE-2025-50181  # Requires misconfiguration of urllib3, which agent does not do without intervention
-CVE-2025-66418  # Malicious servers could cause high resource consumption
-CVE-2025-66471  # Malicious servers could cause high resource consumption
-CVE-2026-21441  # Improper Handling of Highly Compressed Data (Data Amplification)
-
-# =======================
-# Ignored Vulnerabilities
-# =======================
-
-# Not relevant, only affects Pyodide
-CVE-2025-50182
+# Empty for now

.github/containers/Dockerfile

@@ -113,7 +113,7 @@ ENV UV_LINK_MODE="copy"
 
 # Install CPython and PyPy versions
 RUN uv python install -f \
-        cp3.14 cp3.13 cp3.12 cp3.11 cp3.10 cp3.9 cp3.8 \
+        cp3.14 cp3.13 cp3.12 cp3.11 cp3.10 cp3.9 \
         pp3.11 pp3.10 \
         cp3.14t && \
     uv clean

.github/workflows/benchmarks.yml

@@ -57,7 +57,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
 
     env:
       ASV_FACTOR: "1.1"

.github/workflows/deploy.yml

@@ -29,8 +29,6 @@ jobs:
       matrix:
         include:
           # Linux glibc
-          - wheel: cp38-manylinux
-            os: ubuntu-24.04
           - wheel: cp39-manylinux
             os: ubuntu-24.04
           - wheel: cp310-manylinux
@@ -41,11 +39,13 @@ jobs:
             os: ubuntu-24.04
           - wheel: cp313-manylinux
             os: ubuntu-24.04
+          - wheel: cp313t-manylinux
+            os: ubuntu-24.04
           - wheel: cp314-manylinux
             os: ubuntu-24.04
-          # Linux musllibc
-          - wheel: cp38-musllinux
+          - wheel: cp314t-manylinux
             os: ubuntu-24.04
+          # Linux musllibc
           - wheel: cp39-musllinux
             os: ubuntu-24.04
           - wheel: cp310-musllinux
@@ -56,8 +56,12 @@ jobs:
             os: ubuntu-24.04
           - wheel: cp313-musllinux
             os: ubuntu-24.04
+          - wheel: cp313t-musllinux
+            os: ubuntu-24.04
           - wheel: cp314-musllinux
             os: ubuntu-24.04
+          - wheel: cp314t-musllinux
+            os: ubuntu-24.04
           # Windows
           # Windows wheels won't but published until the full release announcement.
           # - wheel: cp313-win
@@ -89,6 +93,7 @@ jobs:
           CIBW_ARCHS_MACOS: native
           CIBW_ARCHS_WINDOWS: AMD64 ARM64
           CIBW_ENVIRONMENT_LINUX: "LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib"
+          CIBW_ENABLE: cpython-freethreading
           CIBW_TEST_REQUIRES: pytest
           CIBW_TEST_COMMAND_LINUX: "export PYTHONPATH={project}/tests; pytest {project}/tests/agent_unittests -vx"
           CIBW_TEST_COMMAND_MACOS: "export PYTHONPATH={project}/tests; pytest {project}/tests/agent_unittests -vx"

.github/workflows/tests.yml

@@ -188,7 +188,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -253,7 +253,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -322,7 +322,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -395,7 +395,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -465,7 +465,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -548,7 +548,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -628,7 +628,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -709,7 +709,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -794,7 +794,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -859,7 +859,7 @@ jobs:
       - name: Test
         run: |
           tox run \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -949,7 +949,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1027,7 +1027,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1105,7 +1105,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1183,7 +1183,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1266,7 +1266,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1349,7 +1349,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1428,7 +1428,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1509,7 +1509,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1589,7 +1589,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1669,7 +1669,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1748,7 +1748,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1826,7 +1826,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -1945,7 +1945,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -2025,7 +2025,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:
@@ -2103,7 +2103,7 @@ jobs:
       - name: Test
         run: |
           tox run-parallel \
-            -vv -e ${{ steps.get-envs.outputs.envs }} \
+            -v -e ${{ steps.get-envs.outputs.envs }} \
             --result-json=./.tox/${{ github.job }}-${{ matrix.group-number }}-${{ github.run_id }}-${{ job.check_run_id }}-results.json \
             --exit-and-dump-after=900
         env:

MANIFEST.in

@@ -3,7 +3,6 @@ include README.md
 include LICENSE
 include THIRD_PARTY_NOTICES.md
 include newrelic/newrelic.ini
-include newrelic/common/cacert.pem
 include newrelic/packages/wrapt/LICENSE
 include newrelic/packages/urllib3/LICENSE.txt
 include newrelic/packages/isort/LICENSE

THIRD_PARTY_NOTICES.md

@@ -37,7 +37,7 @@ Distributed under the following license(s):
 
 ## [urllib3](https://pypi.org/project/urllib3)
 
-Copyright (c) 2008-2019 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
+Copyright (c) 2008-2020 Andrey Petrov and contributors.
 
 Distributed under the following license(s):
 
@@ -46,7 +46,7 @@ Distributed under the following license(s):
 
 ## [wrapt](https://pypi.org/project/wrapt)
 
-Copyright (c) 2013-2019, Graham Dumpleton
+Copyright (c) 2013-2025, Graham Dumpleton
 All rights reserved.
 
 Distributed under the following license(s):

asv.conf.json

@@ -6,7 +6,7 @@
     "repo": ".",
     "environment_type": "virtualenv",
     "install_timeout": 120,
-    "pythons": ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"],
+    "pythons": ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"],
     "benchmark_dir": "tests/agent_benchmarks",
     "env_dir": ".asv/env",
     "results_dir": ".asv/results",

newrelic/admin/__init__.py

@@ -120,19 +120,7 @@ def load_internal_plugins():
 
 
 def load_external_plugins():
-    try:
-        # importlib.metadata was introduced into the standard library starting in Python 3.8.
-        from importlib.metadata import entry_points
-    except ImportError:
-        try:
-            # importlib_metadata is a backport library installable from PyPI.
-            from importlib_metadata import entry_points
-        except ImportError:
-            try:
-                # Fallback to pkg_resources, which is available in older versions of setuptools.
-                from pkg_resources import iter_entry_points as entry_points
-            except ImportError:
-                return
+    from importlib.metadata import entry_points
 
     group = "newrelic.admin"