Fix OATS workflow

.github/workflows/oats.yml

@@ -2,36 +2,49 @@ name: OATS
 
 on:
   push:
-    branches: [ 'main*' ]
+    branches: [ main ]
     paths-ignore:
-    - '**.md'
+      - '**/*.gitattributes'
+      - '**/*.gitignore'
+      - '**/*.md'
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+permissions: {}
 
 jobs:
   acceptance-tests:
     runs-on: ubuntu-latest
-    permissions: {}
+    timeout-minutes: 20
 
     steps:
-      - name: Check out
-        uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-      - name: Check out oats
-        uses: actions/checkout@v4
+
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          repository: grafana/oats
-          path: oats
+          filter: 'tree:0'
           persist-credentials: false
+          show-progress: false
+
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: '1.22'
-          cache-dependency-path: oats/go.sum
+          go-version: '1.24'
+
+      - name: Install OATS
+        env:
+          # renovate: datasource=github-releases depName=oats packageName=grafana/oats
+          OATS_VERSION: v0.3.2
+        run: go install "github.com/grafana/oats@${OATS_VERSION}"
+
       - name: Run acceptance tests
-        run: ./scripts/run-oats-tests.sh
-      - name: upload log file
-        uses: actions/upload-artifact@v4
+        run: oats --timeout=5m ./docker/docker-compose-aspnetcore
+
+      - name: Upload log file
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: failure()
         with:
           name: docker-compose.log
           path: oats/yaml/build/**/output.log
+          if-no-files-found: ignore

docker/docker-compose-aspnetcore/docker-compose.oats.yml

@@ -1,16 +1,14 @@
-version: '3.4'
-
 services:
   aspnetcore:
     image: ${DOCKER_REGISTRY-}aspnetcore
     build:
       context: ../..
       dockerfile: examples/net8.0/aspnetcore/Dockerfile
     environment:
-      - OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://lgtm:4317
     ports:
-      - "5000:80"
-      - "8080:80" # for OATs
+      - "5000:8080"
+      - "8080:8080" # for OATs
     depends_on:
       - redis
       - mssql
@@ -25,6 +23,8 @@ services:
       retries: 5
   mssql:
     image: mcr.microsoft.com/mssql/server:2022-latest
+    ports:
+      - "1433:1433"
     environment:
     - ACCEPT_EULA=Y
     - MSSQL_SA_PASSWORD=Password12345%%

docker/docker-compose-aspnetcore/docker-compose.override.yml

@@ -1,8 +1,6 @@
-version: '3.4'
-
 services:
   aspnetcore:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     ports:
-      - "80"
+      - "8080"

docker/docker-compose-aspnetcore/docker-compose.self-contained.oats.yml

@@ -1,19 +1,17 @@
-version: '3.4'
-
 services:
   aspnetcore:
     image: ${DOCKER_REGISTRY-}aspnetcore
     build:
       context: ../..
-      dockerfile: examples/net6.0/aspnetcore/Dockerfile
+      dockerfile: examples/net8.0/aspnetcore/Dockerfile
       args:
         DOTNET_PUBLISH_ARGS: "--self-contained true /p:PublishSingleFile=true"
     entrypoint: ./aspnetcore
     environment:
-      - OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://lgtm:4317
     ports:
-      - "5000:80"
-      - "8080:80" # for OATs
+      - "5000:8080"
+      - "8080:8080" # for OATs
     depends_on:
       - redis
       - mssql
@@ -28,6 +26,8 @@ services:
       retries: 5
   mssql:
     image: mcr.microsoft.com/mssql/server:2022-latest
+    ports:
+      - "1433:1433"
     environment:
     - ACCEPT_EULA=Y
     - MSSQL_SA_PASSWORD=Password12345%%

docker/docker-compose-aspnetcore/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
   aspnetcore:
     image: ${DOCKER_REGISTRY-}aspnetcore
@@ -9,12 +7,16 @@ services:
     depends_on:
       - redis
       - mssql
+    ports:
+      - "8080:8080" # for OATs
   redis:
     image: redis:7.2
     ports:
       - "6379:6379"
   mssql:
     image: mcr.microsoft.com/mssql/server:2022-latest
+    ports:
+      - "1433:1433"
     environment:
     - ACCEPT_EULA=Y
     - MSSQL_SA_PASSWORD=Password12345%%

docker/docker-compose-aspnetcore/oats-template.yml

@@ -9,9 +9,4 @@ matrix:
       generator: docker-lgtm
       files:
         - ./docker-compose.self-contained.oats.yml
-  - name: net8
-    docker-compose:
-      generator: docker-lgtm
-      files:
-        - ./docker-compose.net8.oats.yml
 interval: 500ms

docker/docker-compose-aspnetcore/oats.yaml

@@ -0,0 +1,73 @@
+include:
+  - ./oats-template.yml
+input:
+  - path: /api/HttpClient/Get
+  - path: /api/HttpClient/GetError
+  - path: /api/MsSql/ServerInfo
+  - path: /api/MsSql/Tables
+  - path: /api/Redis/LeftPush
+expected:
+  logs:
+    - logql: '{service_name="aspnetcore"} |~ `Application started.`'
+      contains:
+        - 'Application started'
+  metrics:
+    - promql: http_client_request_duration_seconds_count{}
+      value: '>= 0'
+    - promql: http_client_request_duration_seconds_count{http_request_method="GET", http_response_status_code="200"}
+      value: '>= 0'
+  traces:
+    - traceql: '{ resource.process.pid > 0 }'
+      spans:
+        - name: 'GET'
+    - traceql: '{ span.http.route =~ "api/HttpClient/Get" }'
+      spans:
+        - name: 'GET api/HttpClient/Get'
+          attributes:
+            http.request.method: GET
+        - name: 'GET api/HttpClient/Get'
+          attributes:
+            service.name: aspnetcore
+            service.version: 1.0.0.0
+            telemetry.distro.name: grafana-opentelemetry-dotnet
+            telemetry.distro.version: regex:.+
+            deployment.environment: production
+            process.runtime.description: regex:.NET.+
+            process.runtime.name: .NET
+            process.runtime.version: regex:.+
+            host.name: regex:.+
+            telemetry.sdk.name: opentelemetry
+            telemetry.sdk.language: dotnet
+            telemetry.sdk.version: regex:.+
+    - traceql: '{ span.http.route =~ "api/HttpClient/GetError" }'
+      spans:
+        - name: 'GET api/HttpClient/GetError'
+          attributes:
+            http.request.method: GET
+        - name: 'GET'
+          attributes:
+            error.type: '500'
+            http.request.method: GET
+            http.response.status_code: '500'
+    - traceql: '{ span.http.route =~ "api/MsSql/ServerInfo"}'
+      spans:
+        - name: 'master'
+          attributes:
+            db.system: mssql
+            db.name: master
+            db.statement: sp_server_info
+            otel.library.name: OpenTelemetry.Instrumentation.SqlClient
+    - traceql: '{ span.http.route =~ "api/MsSql/Tables"}'
+      spans:
+        - name: 'master'
+          attributes:
+            db.system: mssql
+            db.name: master
+            otel.library.name: OpenTelemetry.Instrumentation.SqlClient
+    - traceql: '{ span.http.route =~ "api/Redis/LeftPush" }'
+      spans:
+        - name: 'LPUSH'
+          attributes:
+            db.statement: LPUSH
+            db.system: redis
+            net.peer.name: redis