Merge remote-tracking branch 'refs/remotes/origin/fix-wagtail-transaction-names' into fix-wagtail-transaction-names

Author: hmstepanek

.claude/CLAUDE.md

@@ -80,6 +80,36 @@ NEW_RELIC_EXTENSIONS=true pip install -e .
 NEW_RELIC_EXTENSIONS=false pip install -e .
 ```
 
+
+## Reading External Library Code
+
+When you need to read the source of an instrumented third-party library — to verify an API signature, understand class internals, or trace how a wrapped method behaves — **always look in `.tox/` first**. Do not grep system Python paths, and do not run `pip install` into the project.
+
+### Source Layout
+
+External library source lives at:
+
+```
+.tox/<env_name>/lib/python*/site-packages/<library>/
+```
+
+Use a `python*` glob — the Python minor version (e.g., `python3.12`, `python3.14`) varies by env and is encoded in the env name itself (`-py312-`, `-py314-`).
+
+### Lookup Procedure
+
+1. **List existing envs**: `tox -l | grep <library>` (or `ls .tox/`). Built envs contain the library; the others are just names in `tox.ini`.
+2. **Pick a version**: Prefer the env suffixed with `latest` (e.g., `flasklatest`, `djangolatest`) for the newest upstream code. If multiple `*latest` envs exist at different Python versions, prefer the newest Python (e.g., `-py314-` over `-py312-`). If you need an older or specific library version (e.g., `flask0203`), pick the matching versioned env instead.
+3. **Build the env if it doesn't exist yet**: If the env appears in `tox.ini` but not in `.tox/`, generate it without running tests:
+   ```bash
+   tox r -e <env_name> --notest
+   ```
+   Use this same command to install any specific version you need — just pick the right env name.
+4. **If no env name covers the library at all**: Run `grep -i <library> tox.ini` to confirm. If genuinely absent from the test matrix, ask the user before adding a new env.
+
+### Reading the newrelic Package
+
+The Python Agent (`newrelic` package) is installed into every env's `site-packages` with either the full source or as an editable install (you'll see `__editable__.newrelic-*.pth` files). Do not read agent code from `.tox/` — always read it from the project source tree to avoid stale or cached versions.
+
 ## Architecture
 
 ### Core Components

.github/workflows/build-ci-image.yml

@@ -65,7 +65,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # 4.1.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # 4.2.0
 
       # Lowercase image name and append -ci
       - name: Generate Image Name
@@ -75,7 +75,7 @@ jobs:
 
       - name: Generate Docker Metadata (Tags and Labels)
         id: meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # 6.1.0
+        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # 6.2.0
         with:
           images: ghcr.io/${{ steps.image-name.outputs.IMAGE_NAME }}
           flavor: |
@@ -90,15 +90,15 @@ jobs:
             type=ref,event=pr
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # 4.2.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # 4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Push Image by Digest
         id: build
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # 7.2.0
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # 7.3.0
         with:
           context: .github/containers/ci
           platforms: ${{ matrix.platform }}
@@ -135,14 +135,14 @@ jobs:
           merge-multiple: true
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # 4.2.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # 4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # 4.1.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # 4.2.0
 
       # Lowercase image name and append -ci
       - name: Generate Image Name
@@ -152,7 +152,7 @@ jobs:
 
       - name: Generate Docker Metadata (Tags and Labels)
         id: meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # 6.1.0
+        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # 6.2.0
         with:
           images: ghcr.io/${{ steps.image-name.outputs.IMAGE_NAME }}
           flavor: |

.github/workflows/deploy.yml

@@ -83,7 +83,7 @@ jobs:
 
       - name: Setup QEMU
         if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # 4.1.0
+        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # 4.2.0
         with:
           platforms: arm64
 

.github/workflows/tests.yml

@@ -301,7 +301,7 @@ jobs:
           git fetch --tags origin
 
       - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # 8.2.0
+        uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3 # 8.3.0
 
       - name: Install Python
         run: |
@@ -370,7 +370,7 @@ jobs:
           git fetch --tags origin
 
       - name: Install uv
-        uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # 8.2.0
+        uses: astral-sh/setup-uv@d31148d669074a8d0a63714ba94f3201e7020bc3 # 8.3.0
 
       - name: Install Python
         run: |

.github/workflows/trivy.yml

@@ -67,6 +67,6 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: ${{ github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # 4.36.2
+        uses: github/codeql-action/upload-sarif@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # 4.36.3
         with:
           sarif_file: "trivy-results.sarif"

.gitignore

@@ -10,6 +10,9 @@ megalinter-reports/
 # Benchmarks
 .asv/
 
+# LLM Cache Files
+.tiktoken_cache
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

newrelic/config.py

@@ -3189,6 +3189,27 @@ def _process_module_builtin_defaults():
         "newrelic.hooks.mlmodel_autogen",
         "instrument_autogen_agentchat_agents__assistant_agent",
     )
+    _process_module_definition(
+        "google.adk.agents.llm_agent", "newrelic.hooks.mlmodel_googleadk", "instrument_googleadk_agents_llm_agent"
+    )
+    _process_module_definition(
+        "google.adk.agents.loop_agent", "newrelic.hooks.mlmodel_googleadk", "instrument_googleadk_agents_loop_agent"
+    )
+    _process_module_definition(
+        "google.adk.agents.parallel_agent",
+        "newrelic.hooks.mlmodel_googleadk",
+        "instrument_googleadk_agents_parallel_agent",
+    )
+    _process_module_definition(
+        "google.adk.agents.sequential_agent",
+        "newrelic.hooks.mlmodel_googleadk",
+        "instrument_googleadk_agents_sequential_agent",
+    )
+    _process_module_definition(
+        "google.adk.flows.llm_flows.functions",
+        "newrelic.hooks.mlmodel_googleadk",
+        "instrument_googleadk_flows_llm_flows_functions",
+    )
     _process_module_definition(
         "strands.agent.agent", "newrelic.hooks.mlmodel_strands", "instrument_strands_agent_agent"
     )