From a5a51d3641d3096078defdc40b250a8fd8de8733 Mon Sep 17 00:00:00 2001 From: marian-marica Date: Sun, 19 Mar 2023 11:51:18 +0200 Subject: [PATCH 1/2] Repair Zipkin Micrometer Tracing --- spring-petclinic-api-gateway/pom.xml | 12 ++++++++++++ .../src/main/resources/application.yml | 8 ++++++++ spring-petclinic-customers-service/pom.xml | 12 ++++++++++++ .../src/main/resources/application.yml | 8 ++++++++ spring-petclinic-vets-service/pom.xml | 12 ++++++++++++ .../src/main/resources/application.yml | 8 ++++++++ spring-petclinic-visits-service/pom.xml | 12 ++++++++++++ .../src/main/resources/application.yml | 8 ++++++++ 8 files changed, 80 insertions(+) diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml index ddba4219f..9d9e8f84a 100644 --- a/spring-petclinic-api-gateway/pom.xml +++ b/spring-petclinic-api-gateway/pom.xml @@ -86,6 +86,18 @@ io.opentelemetry opentelemetry-exporter-zipkin + + io.micrometer + micrometer-observation + + + io.micrometer + micrometer-tracing-bridge-brave + + + io.zipkin.reporter2 + zipkin-reporter-brave + diff --git a/spring-petclinic-api-gateway/src/main/resources/application.yml b/spring-petclinic-api-gateway/src/main/resources/application.yml index 48ead7d0f..7232fe54d 100644 --- a/spring-petclinic-api-gateway/src/main/resources/application.yml +++ b/spring-petclinic-api-gateway/src/main/resources/application.yml @@ -33,3 +33,11 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 + + + +--- +management: + tracing: + sampling: + probability: 1 diff --git a/spring-petclinic-customers-service/pom.xml b/spring-petclinic-customers-service/pom.xml index 2628a06fd..1c687e57f 100644 --- a/spring-petclinic-customers-service/pom.xml +++ b/spring-petclinic-customers-service/pom.xml @@ -82,6 +82,18 @@ io.opentelemetry opentelemetry-exporter-zipkin + + io.micrometer + micrometer-observation + + + io.micrometer + micrometer-tracing-bridge-brave + + + io.zipkin.reporter2 + zipkin-reporter-brave + diff --git a/spring-petclinic-customers-service/src/main/resources/application.yml b/spring-petclinic-customers-service/src/main/resources/application.yml index 7c95adf78..3a7020dbd 100644 --- a/spring-petclinic-customers-service/src/main/resources/application.yml +++ b/spring-petclinic-customers-service/src/main/resources/application.yml @@ -11,3 +11,11 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 + + + +--- +management: + tracing: + sampling: + probability: 1 diff --git a/spring-petclinic-vets-service/pom.xml b/spring-petclinic-vets-service/pom.xml index 1b9419b54..36f20a189 100644 --- a/spring-petclinic-vets-service/pom.xml +++ b/spring-petclinic-vets-service/pom.xml @@ -102,6 +102,18 @@ io.opentelemetry opentelemetry-exporter-zipkin + + io.micrometer + micrometer-observation + + + io.micrometer + micrometer-tracing-bridge-brave + + + io.zipkin.reporter2 + zipkin-reporter-brave + diff --git a/spring-petclinic-vets-service/src/main/resources/application.yml b/spring-petclinic-vets-service/src/main/resources/application.yml index 983a015db..1d2409767 100644 --- a/spring-petclinic-vets-service/src/main/resources/application.yml +++ b/spring-petclinic-vets-service/src/main/resources/application.yml @@ -14,3 +14,11 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 + + + +--- +management: + tracing: + sampling: + probability: 1 diff --git a/spring-petclinic-visits-service/pom.xml b/spring-petclinic-visits-service/pom.xml index 9c0149bdd..101132f28 100644 --- a/spring-petclinic-visits-service/pom.xml +++ b/spring-petclinic-visits-service/pom.xml @@ -81,6 +81,18 @@ io.opentelemetry opentelemetry-exporter-zipkin + + io.micrometer + micrometer-observation + + + io.micrometer + micrometer-tracing-bridge-brave + + + io.zipkin.reporter2 + zipkin-reporter-brave + diff --git a/spring-petclinic-visits-service/src/main/resources/application.yml b/spring-petclinic-visits-service/src/main/resources/application.yml index ada02194c..aa4bc80a9 100644 --- a/spring-petclinic-visits-service/src/main/resources/application.yml +++ b/spring-petclinic-visits-service/src/main/resources/application.yml @@ -11,3 +11,11 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 + + + +--- +management: + tracing: + sampling: + probability: 1 From b5d7a53a39100d94a69c674de6e5803451333a41 Mon Sep 17 00:00:00 2001 From: marian-marica Date: Sun, 2 Jul 2023 22:54:49 +0300 Subject: [PATCH 2/2] Moving management tracing sampling probability to server-config --- .../src/main/resources/application.yml | 8 -------- .../src/main/resources/application.yml | 8 -------- .../src/main/resources/application.yml | 8 -------- .../src/main/resources/application.yml | 8 -------- 4 files changed, 32 deletions(-) diff --git a/spring-petclinic-api-gateway/src/main/resources/application.yml b/spring-petclinic-api-gateway/src/main/resources/application.yml index 7232fe54d..48ead7d0f 100644 --- a/spring-petclinic-api-gateway/src/main/resources/application.yml +++ b/spring-petclinic-api-gateway/src/main/resources/application.yml @@ -33,11 +33,3 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 - - - ---- -management: - tracing: - sampling: - probability: 1 diff --git a/spring-petclinic-customers-service/src/main/resources/application.yml b/spring-petclinic-customers-service/src/main/resources/application.yml index 3a7020dbd..7c95adf78 100644 --- a/spring-petclinic-customers-service/src/main/resources/application.yml +++ b/spring-petclinic-customers-service/src/main/resources/application.yml @@ -11,11 +11,3 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 - - - ---- -management: - tracing: - sampling: - probability: 1 diff --git a/spring-petclinic-vets-service/src/main/resources/application.yml b/spring-petclinic-vets-service/src/main/resources/application.yml index 1d2409767..983a015db 100644 --- a/spring-petclinic-vets-service/src/main/resources/application.yml +++ b/spring-petclinic-vets-service/src/main/resources/application.yml @@ -14,11 +14,3 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 - - - ---- -management: - tracing: - sampling: - probability: 1 diff --git a/spring-petclinic-visits-service/src/main/resources/application.yml b/spring-petclinic-visits-service/src/main/resources/application.yml index aa4bc80a9..ada02194c 100644 --- a/spring-petclinic-visits-service/src/main/resources/application.yml +++ b/spring-petclinic-visits-service/src/main/resources/application.yml @@ -11,11 +11,3 @@ spring: activate: on-profile: docker import: configserver:http://config-server:8888 - - - ---- -management: - tracing: - sampling: - probability: 1