Merge branch 'main' into renovate/featureflagservice

open-telemetry · Nov 6, 2023 · e45eeba · e45eeba
2 parents 99d1d8c + 2cf42d2
commit e45eeba
Show file tree

Hide file tree

Showing 28 changed files with 5,090 additions and 6,101 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -105,7 +105,7 @@ jobs:
         id: check_changes
         run: |
           DOCKERFILE_DIR=$(dirname ${{ matrix.file_tag.file }})
-          FILES_CHANGED=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- $DOCKERFILE_DIR)
+          FILES_CHANGED=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} -- $DOCKERFILE_DIR)
           FORCE_PUSH=${{ inputs.push }}
           if [ "$FORCE_PUSH" = true ]; then
             echo "Force push is enabled, proceeding with build."

diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
@@ -463,7 +463,7 @@ services:
   # ********************
   # Jaeger
   jaeger:
-    image: jaegertracing/all-in-one:1.50
+    image: jaegertracing/all-in-one:1.51
     container_name: jaeger
     command:
       - "--memory.max-traces=8000"
@@ -485,7 +485,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:10.1.2
+    image: grafana/grafana:10.2.0
     container_name: grafana
     deploy:
       resources:
@@ -502,7 +502,7 @@ services:
 
   # OpenTelemetry Collector
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.86.0
+    image: otel/opentelemetry-collector-contrib:0.88.0
     container_name: otel-col
     deploy:
       resources:
@@ -524,7 +524,7 @@ services:
 
   # Prometheus
   prometheus:
-    image: quay.io/prometheus/prometheus:v2.47.0
+    image: quay.io/prometheus/prometheus:v2.47.2
     container_name: prometheus
     command:
       - --web.console.templates=/etc/prometheus/consoles
@@ -685,7 +685,7 @@ services:
         condition: service_started
 
   tracetest-server:
-    image: kubeshop/tracetest:v0.13.10
+    image: kubeshop/tracetest:v0.14.5
     platform: linux/amd64
     container_name: tracetest-server
     profiles:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -607,7 +607,7 @@ services:
   # ********************
   # Jaeger
   jaeger:
-    image: jaegertracing/all-in-one:1.50
+    image: jaegertracing/all-in-one:1.51
     container_name: jaeger
     command:
       - "--memory.max-traces=8000"
@@ -629,7 +629,7 @@ services:
 
   # Grafana
   grafana:
-    image: grafana/grafana:10.1.2
+    image: grafana/grafana:10.2.0
     container_name: grafana
     deploy:
       resources:
@@ -646,7 +646,7 @@ services:
 
   # OpenTelemetry Collector
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.86.0
+    image: otel/opentelemetry-collector-contrib:0.88.0
     container_name: otel-col
     deploy:
       resources:
@@ -668,7 +668,7 @@ services:
 
   # Prometheus
   prometheus:
-    image: quay.io/prometheus/prometheus:v2.47.0
+    image: quay.io/prometheus/prometheus:v2.47.2
     container_name: prometheus
     command:
       - --web.console.templates=/etc/prometheus/consoles
@@ -832,7 +832,7 @@ services:
         condition: service_started
 
   tracetest-server:
-    image: kubeshop/tracetest:v0.13.10
+    image: kubeshop/tracetest:v0.14.5
     platform: linux/amd64
     container_name: tracetest-server
     profiles: