From 39782cea98a5ea71bd8ed65c290dce4cab8eebf4 Mon Sep 17 00:00:00 2001 From: petrelevich Date: Tue, 15 Apr 2025 09:26:45 +0300 Subject: [PATCH] spring-35-36-cloud --- .../main/java/ru/demo/controller/ErrorHandler.java | 2 +- .../spring-35-36-spring-cloud/gradle.properties | 2 +- .../main/java/ru/appender/kafka/LogProducer.java | 3 +-- .../service-client-info/build.gradle.kts | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100755 2024-11/spring-35-36-spring-cloud/service-client-info/build.gradle.kts diff --git a/2024-11/spring-35-36-spring-cloud/api-gateway/src/main/java/ru/demo/controller/ErrorHandler.java b/2024-11/spring-35-36-spring-cloud/api-gateway/src/main/java/ru/demo/controller/ErrorHandler.java index 34fb8f5f..79f779be 100755 --- a/2024-11/spring-35-36-spring-cloud/api-gateway/src/main/java/ru/demo/controller/ErrorHandler.java +++ b/2024-11/spring-35-36-spring-cloud/api-gateway/src/main/java/ru/demo/controller/ErrorHandler.java @@ -18,7 +18,7 @@ public class ErrorHandler implements ErrorWebExceptionHandler { private static final Logger log = LoggerFactory.getLogger(ErrorHandler.class); @Override - public Mono handle(@NonNull ServerWebExchange serverWebExchange, @NonNull Throwable thr) { + public @NonNull Mono handle(@NonNull ServerWebExchange serverWebExchange, @NonNull Throwable thr) { var bufferFactory = serverWebExchange.getResponse().bufferFactory(); var response = serverWebExchange.getResponse(); response.getHeaders().setContentType(MediaType.APPLICATION_JSON); diff --git a/2024-11/spring-35-36-spring-cloud/gradle.properties b/2024-11/spring-35-36-spring-cloud/gradle.properties index ec293240..157d79a8 100755 --- a/2024-11/spring-35-36-spring-cloud/gradle.properties +++ b/2024-11/spring-35-36-spring-cloud/gradle.properties @@ -10,6 +10,6 @@ springCloudVersion=2023.0.3 sonarlint=4.2.4 spotless=6.25.0 -jib=3.4.3 +jib=3.4.5 # -------Versions-------- logbackEncoder=8.0 diff --git a/2024-11/spring-35-36-spring-cloud/kafka-log-appender/src/main/java/ru/appender/kafka/LogProducer.java b/2024-11/spring-35-36-spring-cloud/kafka-log-appender/src/main/java/ru/appender/kafka/LogProducer.java index 656a9fff..72c03095 100755 --- a/2024-11/spring-35-36-spring-cloud/kafka-log-appender/src/main/java/ru/appender/kafka/LogProducer.java +++ b/2024-11/spring-35-36-spring-cloud/kafka-log-appender/src/main/java/ru/appender/kafka/LogProducer.java @@ -38,8 +38,7 @@ public class LogProducer { kafkaProducer = new KafkaProducer<>(props); - var shutdownHook = new Thread(this::close); - Runtime.getRuntime().addShutdownHook(shutdownHook); + Runtime.getRuntime().addShutdownHook(new Thread(this::close)); } public void send(String value, Consumer errorCallback) { diff --git a/2024-11/spring-35-36-spring-cloud/service-client-info/build.gradle.kts b/2024-11/spring-35-36-spring-cloud/service-client-info/build.gradle.kts new file mode 100755 index 00000000..d931e6d2 --- /dev/null +++ b/2024-11/spring-35-36-spring-cloud/service-client-info/build.gradle.kts @@ -0,0 +1,14 @@ +dependencies { + implementation(project(":kafka-log-appender")) + implementation("net.logstash.logback:logstash-logback-encoder") + + implementation ("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("io.micrometer:micrometer-registry-prometheus") + + implementation("org.springframework.cloud:spring-cloud-starter-config") + implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client") + + implementation("io.micrometer:micrometer-tracing-bridge-otel") // bridges the Micrometer Observation API to OpenTelemetry. + implementation("io.opentelemetry:opentelemetry-exporter-zipkin") // reports traces to Zipkin. +}