Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc-snippets/exporters/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id("java")
id("org.springframework.boot") version "4.1.0"
id("org.springframework.boot") version "4.1.1"
}

extra.set("moduleName", "io.opentelemetry.examples.docs.exporters")
Expand Down
2 changes: 1 addition & 1 deletion doc-snippets/extensions-minimal/oats/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e
FROM eclipse-temurin:25.0.4_7-jre@sha256:f9e65324a37f28209ce7dd0e5149a7aa954520ed936fb87813cf6ded2400a112

WORKDIR /usr/src/app/

Expand Down
2 changes: 1 addition & 1 deletion doc-snippets/getting-started/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id("java")
id("org.springframework.boot") version "4.1.0"
id("org.springframework.boot") version "4.1.1"
}

extra.set("moduleName", "io.opentelemetry.examples.docs.getting-started")
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions grpc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ java {
}

var grpcVersion = "1.83.1"
var protobufVersion = "4.35.1"
var protobufVersion = "4.36.0"
var protocVersion = protobufVersion

dependencies {
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion javaagent-declarative-configuration/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
id("java")
id("org.springframework.boot") version "4.1.0"
id("org.springframework.boot") version "4.1.1"
}

java {
Expand Down
2 changes: 1 addition & 1 deletion javaagent-declarative-configuration/oats/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e
FROM eclipse-temurin:25.0.4_7-jre@sha256:f9e65324a37f28209ce7dd0e5149a7aa954520ed936fb87813cf6ded2400a112

WORKDIR /usr/src/app/

Expand Down
2 changes: 1 addition & 1 deletion javaagent/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e
FROM eclipse-temurin:25.0.4_7-jre@sha256:f9e65324a37f28209ce7dd0e5149a7aa954520ed936fb87813cf6ded2400a112

ADD build/libs/app.jar /app.jar
ADD build/agent/opentelemetry-javaagent.jar /opentelemetry-javaagent.jar
Expand Down
2 changes: 1 addition & 1 deletion javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
id("java")
id("org.springframework.boot") version "4.1.0"
id("org.springframework.boot") version "4.1.1"
}

description = "OpenTelemetry Example for Java Agent"
Expand Down
2 changes: 1 addition & 1 deletion javaagent/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions log-appender/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion log-appender/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion logging-k8s-stdout-otlp-json/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e
FROM eclipse-temurin:25.0.4_7-jre@sha256:f9e65324a37f28209ce7dd0e5149a7aa954520ed936fb87813cf6ded2400a112

WORKDIR /usr/src/app/

Expand Down
2 changes: 1 addition & 1 deletion logging-k8s-stdout-otlp-json/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
id("java")
id("org.springframework.boot") version "4.1.0"
id("org.springframework.boot") version "4.1.1"
}

description = "OpenTelemetry Example for Java Agent with Stdout logging"
Expand Down
2 changes: 1 addition & 1 deletion logging-k8s-stdout-otlp-json/k8s/lgtm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
spec:
containers:
- name: lgtm
image: grafana/otel-lgtm:0.30.1@sha256:bb182ac3174a20923fa58f00d1790fa71eb06cc0150078c0b0e8feb9e6611492
image: grafana/otel-lgtm:0.31.0@sha256:f1e548c20c99d2678744be9d90955c0ab208ecc273db2a7a0b5dc5673d0b57fd
ports:
- containerPort: 3000
- containerPort: 4317
Expand Down
2 changes: 1 addition & 1 deletion micrometer-shim/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
id("java")
id("org.springframework.boot") version "4.1.0"
id("org.springframework.boot") version "4.1.1"
}

description = "OpenTelemetry Example for Micrometer Shim"
Expand Down
8 changes: 4 additions & 4 deletions mise.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[tools]
"aqua:grafana/gcx" = "v1.0.0"
"aqua:grafana/gcx" = "v1.1.0"
"aqua:grafana/oats" = "0.8.0"
k3d = "5.9.0"
kubectl = "1.36.3"
kubectl = "1.36.4"

# Linters
"aqua:grafana/flint" = "0.22.10"
"aqua:grafana/flint" = "0.22.11"
dotenv-linter = "4.0.0"
lychee = "0.24.2"
rumdl = "0.2.53"
rumdl = "0.2.60"

[env]
FLINT_CONFIG_DIR = ".github/config"
Expand Down
2 changes: 1 addition & 1 deletion otlp/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion prometheus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e
FROM eclipse-temurin:25.0.4_7-jre@sha256:f9e65324a37f28209ce7dd0e5149a7aa954520ed936fb87813cf6ded2400a112

ADD build/libs/opentelemetry-examples-prometheus-*-SNAPSHOT-all.jar /app.jar

Expand Down
2 changes: 1 addition & 1 deletion prometheus/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion spring-declarative-configuration/oats/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:25.0.3_9-jre@sha256:f19dbf0a22d0b3658fda48ce7d7181df05ad14bda151dd5ad12cc09d1451c70e
FROM eclipse-temurin:25.0.4_7-jre@sha256:f9e65324a37f28209ce7dd0e5149a7aa954520ed936fb87813cf6ded2400a112

WORKDIR /usr/src/app/

Expand Down
2 changes: 1 addition & 1 deletion spring-native/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion spring-native/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion telemetry-testing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
id("java")
id("org.springframework.boot") version "4.1.0"
id("org.springframework.boot") version "4.1.1"
}

description = "OpenTelemetry Example for Telemetry Testing"
Expand Down
Loading