From 1602eb60ad5d819a93bafb6422c7ad0424a26827 Mon Sep 17 00:00:00 2001 From: David Pequegnot Date: Mon, 9 Jun 2025 21:51:13 +0200 Subject: [PATCH 1/4] fix(business-metrics): wrong imports in exemple code --- docs/content/metrics/business-metrics.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/content/metrics/business-metrics.md b/docs/content/metrics/business-metrics.md index d2c41be..39f6bb3 100644 --- a/docs/content/metrics/business-metrics.md +++ b/docs/content/metrics/business-metrics.md @@ -60,12 +60,10 @@ We need to declare two timers in our code: ```java // ... -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.Timer; import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.GlobalOpenTelemetry; - @Service public class PaymentService { // ... From 3c3aa225bd79d05f9bf16a3c4ae834967296e0b5 Mon Sep 17 00:00:00 2001 From: David Pequegnot Date: Mon, 9 Jun 2025 21:53:30 +0200 Subject: [PATCH 2/4] fix(business-metrics): remove old micrometer Counter --- docs/content/metrics/business-metrics.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/content/metrics/business-metrics.md b/docs/content/metrics/business-metrics.md index 39f6bb3..3db3cf9 100644 --- a/docs/content/metrics/business-metrics.md +++ b/docs/content/metrics/business-metrics.md @@ -142,7 +142,6 @@ private void store(PaymentProcessingContext context) { ```java // ... -import io.micrometer.core.instrument.Counter; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongHistogram; From 5356bd5045a2557ebc8f24ef90135f847936f2c5 Mon Sep 17 00:00:00 2001 From: David Pequegnot Date: Mon, 9 Jun 2025 22:09:43 +0200 Subject: [PATCH 3/4] chore(Dockerfile): disable tests during build to speed up startup --- api-gateway/src/main/docker/Dockerfile | 2 +- config-server/src/main/docker/Dockerfile | 2 +- discovery-server/src/main/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api-gateway/src/main/docker/Dockerfile b/api-gateway/src/main/docker/Dockerfile index 019025c..b4f38cf 100644 --- a/api-gateway/src/main/docker/Dockerfile +++ b/api-gateway/src/main/docker/Dockerfile @@ -10,7 +10,7 @@ COPY gradle gradle COPY gradlew . COPY settings.gradle.kts . -RUN --mount=type=cache,target=/root/.gradle ./gradlew :${SERVICE}:clean :${SERVICE}:build -x test --info +RUN --mount=type=cache,target=/root/.gradle ./gradlew :${SERVICE}:clean :${SERVICE}:build -x test RUN mkdir -p ${SERVICE}/build/dependency && (cd ${SERVICE}/build/dependency && jar -xf ../libs/*-SNAPSHOT.jar) FROM eclipse-temurin:21-jre-alpine diff --git a/config-server/src/main/docker/Dockerfile b/config-server/src/main/docker/Dockerfile index 0e80680..dde4d67 100644 --- a/config-server/src/main/docker/Dockerfile +++ b/config-server/src/main/docker/Dockerfile @@ -10,7 +10,7 @@ COPY gradle gradle COPY gradlew . COPY settings.gradle.kts . -RUN --mount=type=cache,target=/root/.gradle ./gradlew :${SERVICE}:clean :${SERVICE}:build +RUN --mount=type=cache,target=/root/.gradle ./gradlew :${SERVICE}:clean :${SERVICE}:build -x test RUN mkdir -p ${SERVICE}/build/dependency && (cd ${SERVICE}/build/dependency && jar -xf ../libs/*-SNAPSHOT.jar) FROM eclipse-temurin:21-jre-alpine diff --git a/discovery-server/src/main/docker/Dockerfile b/discovery-server/src/main/docker/Dockerfile index beaf836..54f2f0c 100644 --- a/discovery-server/src/main/docker/Dockerfile +++ b/discovery-server/src/main/docker/Dockerfile @@ -10,7 +10,7 @@ COPY gradle gradle COPY gradlew . COPY settings.gradle.kts . -RUN --mount=type=cache,target=/root/.gradle ./gradlew :${SERVICE}:clean :${SERVICE}:build +RUN --mount=type=cache,target=/root/.gradle ./gradlew :${SERVICE}:clean :${SERVICE}:build -x test RUN mkdir -p ${SERVICE}/build/dependency && (cd ${SERVICE}/build/dependency && jar -xf ../libs/*-SNAPSHOT.jar) FROM eclipse-temurin:21-jre-alpine From 6a6a4125ccfb3a9413f404a92f33f1cabd61a80d Mon Sep 17 00:00:00 2001 From: David Pequegnot Date: Mon, 9 Jun 2025 22:16:46 +0200 Subject: [PATCH 4/4] chore: add temporary link for devoxxpl on main README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 360ce28..8bb821e 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ Make your Java application be truly observable! Let's dive into logs, traces and ## Workshop Go to https://worldline.github.io/observability-workshop/ + +**Devoxx Poland**: https://worldline.github.io/observability-workshop/devoxxpl \ No newline at end of file