From 7045eaa2469061a86091d3b771ce644431f9f9b6 Mon Sep 17 00:00:00 2001
From: Jay DeLuca <jaydeluca4@gmail.com>
Date: Tue, 8 Sep 2026 06:53:23 -0400
Subject: [PATCH 1/2] Fix oats

---
 .github/renovate.json5                                  | 6 ------
 doc-snippets/extensions-minimal/oats/oats-case.yaml     | 3 +++
 javaagent-declarative-configuration/oats/oats-case.yaml | 5 +++++
 logging-k8s-stdout-otlp-json/oats-case.yaml             | 4 ++++
 mise.toml                                               | 2 +-
 spring-declarative-configuration/oats/oats-case.yaml    | 4 ++++
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 48fafe31a5..b802f8c14e 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -83,12 +83,6 @@
       "matchDatasources": ["docker"],
       "matchPackageNames": ["dice"],
       "enabled": false
-    },
-    {
-      // Tests fails with oats 0.10.0
-      "matchPackageNames": ["grafana/oats"],
-      "matchUpdateTypes": ["minor"],
-      "enabled": false
     }
   ],
   "kubernetes": {
diff --git a/doc-snippets/extensions-minimal/oats/oats-case.yaml b/doc-snippets/extensions-minimal/oats/oats-case.yaml
index c50a94c36c..515f7f0816 100644
--- a/doc-snippets/extensions-minimal/oats/oats-case.yaml
+++ b/doc-snippets/extensions-minimal/oats/oats-case.yaml
@@ -7,7 +7,10 @@ interval: 5s
 seed:
   type: app
 input:
+  # retry: the compose fixture reports "running" before Spring finishes booting,
+  # so the first request(s) can hit a closed port; retry until the app is ready.
   - path: /hello
+    retry: {}
 expected:
   traces:
     - traceql: '{ span.http.route = "/hello" }'
diff --git a/javaagent-declarative-configuration/oats/oats-case.yaml b/javaagent-declarative-configuration/oats/oats-case.yaml
index 5b163aefcc..587b4e92e9 100644
--- a/javaagent-declarative-configuration/oats/oats-case.yaml
+++ b/javaagent-declarative-configuration/oats/oats-case.yaml
@@ -6,9 +6,14 @@ fixture:
 seed:
   type: app
 input:
+  # retry: the compose fixture reports "running" before Spring finishes booting,
+  # so the first request(s) can hit a closed port; retry until the app is ready.
   - path: /api/example
+    retry: {}
   - path: /actuator/health
+    retry: {}
   - path: /api/remote
+    retry: {}
 expected:
   traces:
     - traceql: '{ span.http.route = "/api/example" }'
diff --git a/logging-k8s-stdout-otlp-json/oats-case.yaml b/logging-k8s-stdout-otlp-json/oats-case.yaml
index 6fdc298260..bf1657fa85 100644
--- a/logging-k8s-stdout-otlp-json/oats-case.yaml
+++ b/logging-k8s-stdout-otlp-json/oats-case.yaml
@@ -7,6 +7,10 @@ fixture:
     app_docker_tag: dice:1.1-SNAPSHOT
     app_port: 8080
 input:
+  # RollController seeds its Random with a fixed 0, so call 1 always succeeds
+  # and call 2 always throws. Two calls are needed since oats now drives each
+  # input exactly once instead of retrying it on every assertion poll.
+  - path: /rolldice
   - path: /rolldice
 expected:
   logs:
diff --git a/mise.toml b/mise.toml
index 43781f711c..a9d25c25dd 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,6 +1,6 @@
 [tools]
 "aqua:grafana/gcx" = "v1.2.0"
-"aqua:grafana/oats" = "0.8.0"
+"aqua:grafana/oats" = "0.10.0"
 k3d = "5.9.0"
 kubectl = "1.37.0"
 
diff --git a/spring-declarative-configuration/oats/oats-case.yaml b/spring-declarative-configuration/oats/oats-case.yaml
index 1532e54e20..a2aaf3cb35 100644
--- a/spring-declarative-configuration/oats/oats-case.yaml
+++ b/spring-declarative-configuration/oats/oats-case.yaml
@@ -6,8 +6,12 @@ fixture:
 seed:
   type: app
 input:
+  # retry: the compose fixture reports "running" before Spring finishes booting,
+  # so the first request(s) can hit a closed port; retry until the app is ready.
   - path: /api/example
+    retry: {}
   - path: /actuator/health
+    retry: {}
 expected:
   traces:
     - traceql: '{ span.http.route = "/api/example" }'

From 8a35cef81cc7563dba2a5e23f8985ba3204920b1 Mon Sep 17 00:00:00 2001
From: Jay DeLuca <jaydeluca4@gmail.com>
Date: Wed, 9 Sep 2026 09:32:29 -0400
Subject: [PATCH 2/2] logging one

---
 logging-k8s-stdout-otlp-json/oats-case.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/logging-k8s-stdout-otlp-json/oats-case.yaml b/logging-k8s-stdout-otlp-json/oats-case.yaml
index bf1657fa85..8e0e2e7b7b 100644
--- a/logging-k8s-stdout-otlp-json/oats-case.yaml
+++ b/logging-k8s-stdout-otlp-json/oats-case.yaml
@@ -12,6 +12,7 @@ input:
   # input exactly once instead of retrying it on every assertion poll.
   - path: /rolldice
   - path: /rolldice
+    status: "500"
 expected:
   logs:
     - logql: '{service_name="dice"} |~ `.*Anonymous player is rolling the dice:.*`'