Replace pilot OATS files in place

Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

Author: zeitlinger

ci/oats-v2/docker-compose.lgtm.yml ci/oats/docker-compose.lgtm.ymlci/oats-v2/docker-compose.lgtm.yml renamed to ci/oats/docker-compose.lgtm.yml

@@ -1,22 +1,11 @@
-# OATS is an acceptance testing framework for OpenTelemetry
-# https://github.com/grafana/oats/tree/main/yaml
-oats-schema-version: 2
-docker-compose:
-  files:
-    - ./docker-compose.oats.yml
+oats: 2
+name: ebpf profiler captures rolldice profile symbols
+seed:
+  type: app
 input:
   - path: /rolldice
 expected:
   profiles:
-    # go
     - query: 'process_cpu:cpu:nanoseconds:cpu:nanoseconds{"process.executable.name"=~"rolldice"}'
-      flamebearers:
-        equals: "main.rolldice"
-    # python and java are flaky
-#    - query: 'process_cpu:cpu:nanoseconds:cpu:nanoseconds{process_executable_name=~"python.*"}'
-#      flamebearers:
-#        # not very useful, because the python function names are not in the flamegraph
-#        contains: "python"
-#    - query: 'process_cpu:cpu:nanoseconds:cpu:nanoseconds{process_executable_name="java"}'
-#      flamebearers:
-#        contains: "void org.springframework.boot.SpringApplication.refreshContext(org.springframework.context.ConfigurableApplicationContext)"
+      match:
+        - name: main.rolldice

examples/ebpf-profiler/oats-v2.yaml

@@ -1,20 +1,20 @@
-# OATS is an acceptance testing framework for OpenTelemetry
-# https://github.com/grafana/oats/tree/main/yaml
-oats-schema-version: 2
-docker-compose:
-  files:
-    - ./docker-compose.oats.yml
+oats: 2
+name: nodejs rolldice emits traces metrics and logs
+seed:
+  type: app
 input:
   - path: /rolldice?rolls=5
 expected:
   traces:
     - traceql: '{ span.http.route = "/rolldice" }'
-      equals: "GET /rolldice"
-      attributes:
-        otel.library.name: "@opentelemetry/instrumentation-http"
+      match:
+        - name: GET /rolldice
+          attributes:
+            otel.library.name: '@opentelemetry/instrumentation-http'
   metrics:
-    - promql: 'dice_lib_rolls_counter_total{service_name="dice-server"}'
-      value: ">= 0"
+    - promql: dice_lib_rolls_counter_total{service_name="dice-server"}
+      value: '>= 0'
   logs:
     - logql: '{service_name="dice-server"} |~ `Received request to roll dice`'
-      equals: "Received request to roll dice"
+      match:
+        - name: Received request to roll dice

examples/ebpf-profiler/oats.yaml

@@ -1,30 +1,24 @@
----
-# OATS is an acceptance testing framework for OpenTelemetry
-# https://github.com/grafana/oats/tree/main/yaml
-oats-schema-version: 2
-docker-compose:
-  files:
-    - ./docker-compose.oats.yml
-# No input: section — OATS only supports a single application port, but this
-# test exercises 5 services on different ports. The generate-traffic sidecar
-# sends requests to all services instead.
+oats: 2
+name: obi sidecar traffic yields spans and metrics across services
+seed:
+  type: app
 expected:
   traces:
-    # Java (port 8080) - reuses ../java source, no OTel agent
     - traceql: '{ span.url.path = "/rolldice" && span.server.port = 8080 }'
-      equals: "GET /rolldice"
-    # Go (port 8081) - minimal source, no OTel SDK
+      match:
+        - name: GET /rolldice
     - traceql: '{ span.url.path = "/rolldice" && span.server.port = 8081 }'
-      equals: "GET /rolldice"
-    # Python (port 8082) - reuses ../python source, no opentelemetry-distro
+      match:
+        - name: GET /rolldice
     - traceql: '{ span.url.path = "/rolldice" && span.server.port = 8082 }'
-      equals: "GET /rolldice"
-    # .NET (port 8083) - minimal source, no OTel NuGet packages
+      match:
+        - name: GET /rolldice
     - traceql: '{ span.url.path = "/rolldice" && span.server.port = 8083 }'
-      equals: "GET /rolldice"
-    # Node.js (port 8084) - minimal source, no @opentelemetry/* packages
+      match:
+        - name: GET /rolldice
     - traceql: '{ span.url.path = "/rolldice" && span.server.port = 8084 }'
-      equals: "GET /rolldice"
+      match:
+        - name: GET /rolldice
   metrics:
-    - promql: 'http_server_request_duration_seconds_count{http_route="/rolldice"}'
-      value: "> 0"
+    - promql: http_server_request_duration_seconds_count{http_route="/rolldice"}
+      value: '> 0'

examples/nodejs/oats-v2.yaml

@@ -1,26 +1,23 @@
-# OATS is an acceptance testing framework for OpenTelemetry
-# https://github.com/grafana/oats/tree/main/yaml
-oats-schema-version: 2
-docker-compose:
-  files:
-    - ./docker-compose.oats.yml
+oats: 2
+name: python rolldice emits traces metrics logs and lgtm readiness
+seed:
+  type: app
 input:
   - path: /rolldice
 expected:
-  # this is checking that the health check is working
-  # this is usually not needed - because we check the functionality of the app
-  # but some cases are missing, e.g. that grafana is up and running
-  # We also check that this exact log line is present in the logs, which some users rely on
-  compose-logs:
-    - "The OpenTelemetry collector and the Grafana LGTM stack are up and running. (created /tmp/ready)"
+  custom-checks:
+    - script: ./scripts/check-lgtm-ready.sh
   traces:
     - traceql: '{ span.http.route = "/rolldice" }'
-      equals: "GET /rolldice"
-      attributes:
-        otel.library.name: opentelemetry.instrumentation.flask
+      match:
+        - name: GET /rolldice
+          attributes:
+            otel.library.name: opentelemetry.instrumentation.flask
   metrics:
-    - promql: 'http_server_active_requests{http_method="GET"}'
-      value: ">= 0"
+    - promql: http_server_active_requests{http_method="GET"}
+      value: '>= 0'
   logs:
     - logql: '{service_name="rolldice"} |~ `Anonymous player is rolling the dice.*`'
-      regexp: "Anonymous player is rolling the dice"
+      match:
+        - match_type: regexp
+          name: Anonymous player is rolling the dice

examples/nodejs/oats.yaml

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
 cd "$(dirname "$0")/.."
-docker compose -f ../../ci/oats-v2/docker-compose.lgtm.yml -f docker-compose.oats.yml logs lgtm \
+docker compose -f ../../ci/oats/docker-compose.lgtm.yml -f docker-compose.oats.yml logs lgtm \
   | grep -F "The OpenTelemetry collector and the Grafana LGTM stack are up and running. (created /tmp/ready)"