Skip to content

Commit 693a919

Browse files
authored
update oats (#938)
1 parent 43232e6 commit 693a919

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

.mise/tasks/oats-tests.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@ pushd javaagent-declarative-configuration
1212
../gradlew clean bootJar
1313
popd
1414

15+
./gradlew :doc-snippets:extensions-testapp:jar :doc-snippets:extensions-minimal:shadowJar
16+
1517
oats -timeout 5m logging-k8s-stdout-otlp-json/
1618
oats -timeout 5m javaagent-declarative-configuration/oats/
19+
oats -timeout 5m doc-snippets/extensions-minimal/oats/
Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats
2+
oats-schema-version: 2
23

34
docker-compose:
45
files:
56
- ./docker-compose.yml
6-
app-service: app
7-
app-docker-tag: extensions-minimal:latest
8-
app-docker-port: 8080
97

108
input:
119
- path: /hello
12-
interval: 5000ms
10+
11+
interval: 5000ms
1312

1413
expected:
1514
traces:
1615
- traceql: '{ span.http.route = "/hello" }'
17-
spans:
18-
- name: "GET /hello"
19-
attributes:
20-
http.request.method: "GET"
21-
http.route: "/hello"
22-
# This custom attribute is added by MySpanProcessor
23-
custom.processor: "active"
16+
equals: "GET /hello"
17+
attributes:
18+
http.request.method: "GET"
19+
http.route: "/hello"
20+
# This custom attribute is added by MySpanProcessor
21+
custom.processor: "active"
Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats
2+
oats-schema-version: 2
23

34
docker-compose:
45
files:
56
- ./docker-compose.yml
6-
app-service: app
7-
app-docker-tag: javaagent-declarative-config:latest
8-
app-docker-port: 8080
97

108
input:
119
# This endpoint should be traced normally
1210
- path: /api/example
1311
# This endpoint should NOT be traced (excluded by declarative config)
14-
# We send the request but don't assert spans for it - the absence of spans
15-
# for /actuator/health demonstrates the sampling rule is working
1612
- path: /actuator/health
1713

1814
expected:
1915
traces:
2016
# Verify that /api/example creates a trace with SERVER span
2117
- traceql: '{ span.http.route = "/api/example" }'
22-
spans:
23-
- name: "GET /api/example"
24-
attributes:
25-
http.request.method: "GET"
26-
http.route: "/api/example"
18+
equals: "GET /api/example"
19+
attributes:
20+
http.request.method: "GET"
21+
http.route: "/api/example"
22+
- traceql: '{ span.http.route = "/actuator/health" }'
23+
count:
24+
max: 0

logging-k8s-stdout-otlp-json/oats.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats
2+
oats-schema-version: 2
23

34
kubernetes:
45
dir: k8s

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tools]
22
lychee = "0.21.0"
33
k3d = "5.8.2"
4-
"go:github.com/grafana/oats" = "0.4.1"
4+
"go:github.com/grafana/oats" = "0.6.0"
55
kubectl = "1.34.2"
66
markdownlint-cli2 = "0.19.1"
77

0 commit comments

Comments
 (0)