From bd4527ce4bc94f8c1746300dd7a40242c0c69165 Mon Sep 17 00:00:00 2001
From: Kyle-Neale <kyle.neale@datadoghq.com>
Date: Mon, 11 May 2026 09:22:11 -0400
Subject: [PATCH 1/2] Add bounded retry around agent check invocations in
 env/agent.py

---
 ddev/changelog.d/23646.fixed   |  1 +
 ddev/src/ddev/cli/env/agent.py | 29 ++++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 ddev/changelog.d/23646.fixed

diff --git a/ddev/changelog.d/23646.fixed b/ddev/changelog.d/23646.fixed
new file mode 100644
index 0000000000000..e274862697c8a
--- /dev/null
+++ b/ddev/changelog.d/23646.fixed
@@ -0,0 +1 @@
+Retry agent check invocations on transient failures to address SNMP E2E flake from autodiscovery reload races
\ No newline at end of file
diff --git a/ddev/src/ddev/cli/env/agent.py b/ddev/src/ddev/cli/env/agent.py
index 0a24f221b9a4f..248a431d9de0f 100644
--- a/ddev/src/ddev/cli/env/agent.py
+++ b/ddev/src/ddev/cli/env/agent.py
@@ -9,6 +9,26 @@
 
 if TYPE_CHECKING:
     from ddev.cli.application import Application
+    from ddev.e2e.agent.interface import AgentInterface
+
+
+def _invoke_check_with_retry(agent: AgentInterface, args: list[str], *, retries: int = 3, backoff: float = 0.5) -> None:
+    """Invoke ``agent check`` with bounded retry to absorb transient autodiscovery-reload races."""
+    import subprocess
+    import time
+
+    for attempt in range(retries + 1):
+        try:
+            agent.invoke(args)
+            return
+        except subprocess.CalledProcessError:
+            if attempt >= retries:
+                raise
+            click.echo(
+                f'agent check failed (attempt {attempt + 1}/{retries + 1}), retrying in {backoff:.1f}s...',
+                err=True,
+            )
+            time.sleep(backoff)
 
 
 @click.command(
@@ -54,7 +74,10 @@ def agent(app: Application, *, intg_name: str, environment: str, args: tuple[str
 
     if config_file is None or not trigger_run:
         try:
-            agent.invoke(full_args)
+            if trigger_run:
+                _invoke_check_with_retry(agent, full_args)
+            else:
+                agent.invoke(full_args)
         except subprocess.CalledProcessError as e:
             app.abort(code=e.returncode)
 
@@ -67,7 +90,7 @@ def agent(app: Application, *, intg_name: str, environment: str, args: tuple[str
     if not env_data.config_file.is_file():
         try:
             env_data.write_config(config)
-            agent.invoke(full_args)
+            _invoke_check_with_retry(agent, full_args)
         finally:
             env_data.config_file.unlink()
     else:
@@ -75,6 +98,6 @@ def agent(app: Application, *, intg_name: str, environment: str, args: tuple[str
         env_data.config_file.replace(temp_config_file)
         try:
             env_data.write_config(config)
-            agent.invoke(full_args)
+            _invoke_check_with_retry(agent, full_args)
         finally:
             temp_config_file.replace(env_data.config_file)

From 7dbeb043dddf510c7f6b107f245a0bec705382f0 Mon Sep 17 00:00:00 2001
From: Kyle-Neale <kyle.neale@datadoghq.com>
Date: Tue, 12 May 2026 11:54:52 -0400
Subject: [PATCH 2/2] fix(ddev): add trailing period to changelog entry

Per AGENTS.md, changelog entries must end with a period.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 ddev/changelog.d/23646.fixed | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ddev/changelog.d/23646.fixed b/ddev/changelog.d/23646.fixed
index e274862697c8a..e4ee6f9927f36 100644
--- a/ddev/changelog.d/23646.fixed
+++ b/ddev/changelog.d/23646.fixed
@@ -1 +1 @@
-Retry agent check invocations on transient failures to address SNMP E2E flake from autodiscovery reload races
\ No newline at end of file
+Retry agent check invocations on transient failures to address SNMP E2E flake from autodiscovery reload races.
\ No newline at end of file