Merge branch 'main' into grafanarenovatebot/grafana-monorepo

grafana · Sep 13, 2024 · 6ed9065 · 6ed9065
2 parents 6bb4091 + 3f85a8e
commit 6ed9065
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -12,13 +12,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: grafana/oats
-          ref: 4e02b327cf997bc21c4b64dea1951ce3f6361c68
+          ref: d07befda3cfa162865d8081aa64501ea26578870
           path: oats
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: '1.21'
           cache-dependency-path: oats/go.sum
+      - name: Build Image for integration tests
+        run: ./build-lgtm.sh
       - name: Run acceptance tests
         run: ./scripts/run-acceptance-tests.sh
       - name: upload log file

diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
@@ -19,7 +19,7 @@ jobs:
           app_id: ${{ secrets.RENOVATEGRAFANABOT_ID }}
           private_key: ${{ secrets.RENOVATEGRAFANABOT_PEM }}
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v39.2.4 #v.39.0.5
+        uses: renovatebot/github-action@v40.2.8 #v.39.0.5
         with:
           renovate-version: 37.5.3@sha256:613fe86ea2730c062a42bf097a02563e35cb0d8df4fef08d2c4e50b8cd2ccdbc
           configurationFile: .github/renovate.json

diff --git a/examples/dotnet/docker-compose.oats.yml b/examples/dotnet/docker-compose.oats.yml
@@ -7,5 +7,5 @@ services:
     ports:
       - 8080:8083
     environment:
-      - Otlp__Endpoint=http://collector:4317
-      - OTEL_METRIC_EXPORT_INTERVAL=5000  # so we don't have to wait 60s for metrics
+      - Otlp__Endpoint=http://lgtm:4317
+      - OTEL_METRIC_EXPORT_INTERVAL=5000  # so we don't have to wait 60s for metrics
diff --git a/examples/dotnet/oats.yaml b/examples/dotnet/oats.yaml
@@ -1,6 +1,6 @@
 # OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
 docker-compose:
-  generator: lgtm
+  generator: docker-lgtm
   files:
     - ./docker-compose.oats.yml
 input:
@@ -17,6 +17,6 @@ expected:
     - promql: 'http_server_active_requests{http_request_method="GET"}'
       value: ">= 0"
   logs:
-    - logql: '{exporter="OTLP"} | json | body =~ `Anonymous player is rolling the dice.*`'
+    - logql: '{service_name="rolldice"} |~ `Anonymous player is rolling the dice.*`'
       contains:
         - 'Anonymous player is rolling the dice'
diff --git a/examples/go/docker-compose.oats.yml b/examples/go/docker-compose.oats.yml
@@ -7,7 +7,7 @@ services:
       context: .
       dockerfile: Dockerfile
     environment:
-      OTEL_EXPORTER_OTLP_ENDPOINT: http://collector:4318
+      OTEL_EXPORTER_OTLP_ENDPOINT: http://lgtm:4318
       OTEL_METRIC_EXPORT_INTERVAL: "5000"  # so we don't have to wait 60s for metrics
     ports:
       - "8080:8081"
diff --git a/examples/go/oats.yaml b/examples/go/oats.yaml
@@ -1,6 +1,6 @@
 # OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
 docker-compose:
-  generator: lgtm
+  generator: docker-lgtm
   files:
     - ./docker-compose.oats.yml
 input:

diff --git a/examples/python/docker-compose.oats.yml b/examples/python/docker-compose.oats.yml
@@ -7,7 +7,8 @@ services:
       context: .
       dockerfile: Dockerfile
     environment:
-      OTEL_EXPORTER_OTLP_ENDPOINT: http://collector:4317
+      OTEL_SERVICE_NAME: "rolldice"
+      OTEL_EXPORTER_OTLP_ENDPOINT: http://lgtm:4317
       OTEL_METRIC_EXPORT_INTERVAL: "5000"  # so we don't have to wait 60s for metrics
     ports:
       - "8080:8082"
diff --git a/examples/python/oats.yaml b/examples/python/oats.yaml
@@ -1,6 +1,6 @@
 # OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml
 docker-compose:
-  generator: lgtm
+  generator: docker-lgtm
   files:
     - ./docker-compose.oats.yml
 input:
@@ -16,6 +16,6 @@ expected:
     - promql: 'http_server_active_requests{http_method="GET"}'
       value: ">= 0"
   logs:
-    - logql: '{exporter="OTLP"} | json | body =~ `Anonymous player is rolling the dice.*`'
+    - logql: '{service_name="rolldice"} |~ `Anonymous player is rolling the dice.*`'
       contains:
         - 'Anonymous player is rolling the dice'