diff --git a/doc-snippets/extensions-minimal/oats/Dockerfile b/doc-snippets/extensions-minimal/oats/Dockerfile index 19a33d5a07..c31425d7c3 100644 --- a/doc-snippets/extensions-minimal/oats/Dockerfile +++ b/doc-snippets/extensions-minimal/oats/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e +FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311 WORKDIR /usr/src/app/ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84c5a9c661..760c45969c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip +distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts index 9ac93275c9..b856d7f6cf 100644 --- a/grpc/build.gradle.kts +++ b/grpc/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { implementation ("io.grpc:grpc-stub:${grpcVersion}") implementation ("com.google.protobuf:protobuf-java-util:${protobufVersion}") implementation ("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:2.30.0-alpha") - implementation ("com.google.guava:guava:33.7.0-jre") + implementation ("com.google.guava:guava:33.7.1-jre") implementation("io.opentelemetry:opentelemetry-api") implementation("io.opentelemetry:opentelemetry-sdk") diff --git a/javaagent-declarative-configuration/oats/Dockerfile b/javaagent-declarative-configuration/oats/Dockerfile index 84fb83a53b..eae9aeb3fb 100644 --- a/javaagent-declarative-configuration/oats/Dockerfile +++ b/javaagent-declarative-configuration/oats/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e +FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311 WORKDIR /usr/src/app/ diff --git a/javaagent/Dockerfile b/javaagent/Dockerfile index 081eea3348..10c57cfe51 100644 --- a/javaagent/Dockerfile +++ b/javaagent/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e +FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311 ADD build/libs/app.jar /app.jar ADD build/agent/opentelemetry-javaagent.jar /opentelemetry-javaagent.jar diff --git a/javaagent/docker-compose.yml b/javaagent/docker-compose.yml index f51f77ec08..21a8a1c981 100644 --- a/javaagent/docker-compose.yml +++ b/javaagent/docker-compose.yml @@ -10,7 +10,7 @@ services: depends_on: - collector collector: - image: otel/opentelemetry-collector-contrib:0.158.0@sha256:c5918f78992ee73b0d6f0e599423ac5ec52dd5d9726733114d6eca53d5a32ed5 + image: otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc volumes: - ./collector-config.yaml:/collector-config.yaml command: ["--config=/collector-config.yaml"] diff --git a/log-appender/build.gradle.kts b/log-appender/build.gradle.kts index 98ec23d3b8..731d11c3f2 100644 --- a/log-appender/build.gradle.kts +++ b/log-appender/build.gradle.kts @@ -16,8 +16,8 @@ java { dependencies { // Slf4J / logback implementation("org.slf4j:slf4j-api:2.0.18") - implementation("ch.qos.logback:logback-core:1.6.1") - implementation("ch.qos.logback:logback-classic:1.6.1") + implementation("ch.qos.logback:logback-core:1.6.3") + implementation("ch.qos.logback:logback-classic:1.6.3") // JUL to SLF4J bridge implementation("org.slf4j:jul-to-slf4j:2.0.18") diff --git a/log-appender/docker-compose.yml b/log-appender/docker-compose.yml index b25555dab6..3238db9528 100644 --- a/log-appender/docker-compose.yml +++ b/log-appender/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: collector: - image: otel/opentelemetry-collector-contrib:0.158.0@sha256:c5918f78992ee73b0d6f0e599423ac5ec52dd5d9726733114d6eca53d5a32ed5 + image: otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc volumes: - ./otel-config.yaml:/otel-config.yaml command: ["--config=/otel-config.yaml"] diff --git a/logging-k8s-stdout-otlp-json/Dockerfile b/logging-k8s-stdout-otlp-json/Dockerfile index 834a1ba6bf..488652ac90 100644 --- a/logging-k8s-stdout-otlp-json/Dockerfile +++ b/logging-k8s-stdout-otlp-json/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e +FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311 WORKDIR /usr/src/app/ diff --git a/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml b/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml index 2f9303eeac..32907ea899 100644 --- a/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml +++ b/logging-k8s-stdout-otlp-json/k8s/lgtm.yaml @@ -51,7 +51,7 @@ spec: spec: containers: - name: lgtm - image: grafana/otel-lgtm:0.30.1@sha256:bb182ac3174a20923fa58f00d1790fa71eb06cc0150078c0b0e8feb9e6611492 + image: grafana/otel-lgtm:0.30.2@sha256:069e79be4fcc648b13f22ded28146f0b2d94f7f48681a55aa4995566a0bbdd02 ports: - containerPort: 3000 - containerPort: 4317 diff --git a/mise.toml b/mise.toml index 06dfcf0ff1..02b33b2319 100644 --- a/mise.toml +++ b/mise.toml @@ -1,14 +1,14 @@ [tools] -"aqua:grafana/gcx" = "v1.0.0" -"aqua:grafana/oats" = "0.8.0" +"aqua:grafana/gcx" = "v1.1.0" +"aqua:grafana/oats" = "0.10.0" k3d = "5.9.0" -kubectl = "1.36.3" +kubectl = "1.36.4" # Linters "aqua:grafana/flint" = "0.22.10" dotenv-linter = "4.0.0" lychee = "0.24.2" -rumdl = "0.2.53" +rumdl = "0.2.58" [env] FLINT_CONFIG_DIR = ".github/config" diff --git a/otlp/docker/docker-compose.yaml b/otlp/docker/docker-compose.yaml index bf0e498fe9..9fa3da8be2 100644 --- a/otlp/docker/docker-compose.yaml +++ b/otlp/docker/docker-compose.yaml @@ -36,7 +36,7 @@ services: prometheus: container_name: prometheus - image: prom/prometheus:v3.13.2@sha256:508729e0e2d18e11fd742a5a5ca70e557b940a93948c3c95fd0123a6fd538b69 + image: prom/prometheus:v3.14.0@sha256:5ce7540c3c00ef4ab0c9d2c995c6a5b9c421f44b4a115d97a2c7af3b1c21cbb0 volumes: - ./prometheus.yaml:/etc/prometheus/prometheus.yml ports: diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile index e5c6d9edb5..d669d8f7af 100644 --- a/prometheus/Dockerfile +++ b/prometheus/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e +FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311 ADD build/libs/opentelemetry-examples-prometheus-*-SNAPSHOT-all.jar /app.jar diff --git a/prometheus/docker-compose.yml b/prometheus/docker-compose.yml index 9df13f37cc..17e986a28b 100644 --- a/prometheus/docker-compose.yml +++ b/prometheus/docker-compose.yml @@ -4,7 +4,7 @@ services: ports: - '19090:19090' prometheus: - image: prom/prometheus@sha256:508729e0e2d18e11fd742a5a5ca70e557b940a93948c3c95fd0123a6fd538b69 + image: prom/prometheus@sha256:5ce7540c3c00ef4ab0c9d2c995c6a5b9c421f44b4a115d97a2c7af3b1c21cbb0 volumes: - ./prometheus.yml:/etc/prometheus/prometheus.yml depends_on: diff --git a/spring-declarative-configuration/oats/Dockerfile b/spring-declarative-configuration/oats/Dockerfile index 9bf25b31fe..799773c5f2 100644 --- a/spring-declarative-configuration/oats/Dockerfile +++ b/spring-declarative-configuration/oats/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e +FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311 WORKDIR /usr/src/app/ diff --git a/spring-native/build.gradle.kts b/spring-native/build.gradle.kts index 41c108b61a..6f5822e690 100644 --- a/spring-native/build.gradle.kts +++ b/spring-native/build.gradle.kts @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin plugins { id("java") id("org.springframework.boot") version "3.5.16" - id("org.graalvm.buildtools.native") version "1.1.8" + id("org.graalvm.buildtools.native") version "1.1.10" } description = "OpenTelemetry Example for Spring native images" diff --git a/spring-native/docker-compose.yml b/spring-native/docker-compose.yml index d1d33feb94..d578fbdeda 100644 --- a/spring-native/docker-compose.yml +++ b/spring-native/docker-compose.yml @@ -10,7 +10,7 @@ services: depends_on: - collector collector: - image: otel/opentelemetry-collector-contrib:0.158.0@sha256:c5918f78992ee73b0d6f0e599423ac5ec52dd5d9726733114d6eca53d5a32ed5 + image: otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc volumes: - ./collector-spring-native-config.yaml:/collector-spring-native-config.yaml command: ["--config=/collector-spring-native-config.yaml"]