Merge branch 'main' into experimental-service-resource

open-telemetry · Jun 21, 2024 · 103537e · 103537e
2 parents ce5d217 + eb6bd28
commit 103537e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -21,6 +21,7 @@ linters:
     - misspell
     - revive
     - staticcheck
+    - tenv
     - typecheck
     - unused
 

diff --git a/example/otel-collector/docker-compose.yaml b/example/otel-collector/docker-compose.yaml
@@ -3,15 +3,15 @@
 
 services:
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.102.1
+    image: otel/opentelemetry-collector-contrib:0.103.0
     command: ["--config=/etc/otel-collector.yaml"]
     volumes:
       - ./otel-collector.yaml:/etc/otel-collector.yaml
     ports:
       - 4317:4317
 
   prometheus:
-    image: prom/prometheus:v2.52.0
+    image: prom/prometheus:v2.53.0
     volumes:
       - ./prometheus.yaml:/etc/prometheus/prometheus.yml
     ports: