refactoring

Author: m.zharinova

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/service/PublicApiServiceTest.java

@@ -26,6 +26,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.resetAllRequests;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
@@ -64,6 +65,7 @@ void getZonedTimeSuccessfully(@Nonnull final CapturedOutput output) throws JsonP
 
     @Test
     void retriesOnceToGetZonedTime(@Nonnull final CapturedOutput output) throws JsonProcessingException {
+        resetAllRequests();
         final String zoneNames = TimeZone.getDefault().getID();
         final RuntimeException exception = new RuntimeException("Retries exhausted");
         stubFor(get(urlPathMatching("/" + zoneNames))
@@ -73,7 +75,7 @@ void retriesOnceToGetZonedTime(@Nonnull final CapturedOutput output) throws Json
             ));
 
         final LocalDateTime result = publicApiService.getZonedTime();
-        verify(getRequestedFor(urlPathMatching("/" + zoneNames)));
+        verify(2, getRequestedFor(urlPathMatching("/" + zoneNames)));
 
         assertThat(result).isNull();
         assertThat(output).contains("Retrying request to ", "Retries exhausted");

spring-boot-3-demo-app/src/main/java/io/github/mfvanek/spring/boot3/test/config/WebClientConfig.java

@@ -7,7 +7,6 @@
 
 package io.github.mfvanek.spring.boot3.test.config;
 
-import io.micrometer.observation.ObservationRegistry;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -20,10 +19,8 @@ public class WebClientConfig {
     private String external;
 
     @Bean
-    public WebClient webClient(ObservationRegistry observationRegistry, WebClient.Builder builder) {
-
+    public WebClient webClient(WebClient.Builder builder) {
         return builder
-            .observationRegistry(observationRegistry)
             .baseUrl(external)
             .build();
     }

spring-boot-3-demo-app/src/main/java/io/github/mfvanek/spring/boot3/test/controllers/TimeController.java

@@ -17,7 +17,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Hooks;
 
 import java.time.Clock;
 import java.time.LocalDateTime;
@@ -48,7 +47,6 @@ public LocalDateTime getNow() {
         kafkaSendingService.sendNotification("Current time = " + now)
             .thenRun(() -> log.info("Awaiting acknowledgement from Kafka"))
             .get();
-        Hooks.disableAutomaticContextPropagation();
         return now;
     }
 }

spring-boot-3-demo-app/src/main/java/io/github/mfvanek/spring/boot3/test/service/PublicApiService.java

@@ -19,7 +19,6 @@
 import org.springframework.retry.ExhaustedRetryException;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Hooks;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
 
@@ -53,7 +52,6 @@ public LocalDateTime getZonedTime() {
     }
 
     private CurrentTime getZonedTimeFromWorldTimeApi() throws JsonProcessingException {
-        Hooks.enableAutomaticContextPropagation();
         final String zoneNames = TimeZone.getDefault().getID();
         final Mono<String> response = webClient.get()
             .uri(String.join("/", zoneNames))

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/controllers/TimeControllerTest.java

@@ -99,6 +99,8 @@ void spanShouldBeReportedInLogs(@Nonnull final CapturedOutput output) {
             .returnResult();
         final String traceId = result.getResponseHeaders().getFirst(TRACE_ID_HEADER_NAME);
         assertThat(traceId).isNotBlank();
+        assertThat(result.getResponseBody())
+            .isBefore(LocalDateTime.now(clock));
         assertThat(output.getAll())
             .contains("Called method getNow. TraceId = " + traceId)
             .contains("Awaiting acknowledgement from Kafka");
@@ -167,7 +169,7 @@ void mdcValuesShouldBeReportedInLogs(@Nonnull final CapturedOutput output) {
 
     @SneakyThrows
     @Test
-    void observationValuesShouldBeReportedInRetryLogs(@Nonnull final CapturedOutput output) {
+    void mdcValuesShouldBeReportedInRetryLogs(@Nonnull final CapturedOutput output) {
         final String zoneNames = TimeZone.getDefault().getID();
         final RuntimeException exception = new RuntimeException("Retries exhausted");
         stubFor(get(urlPathMatching("/" + zoneNames))

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/service/PublicApiServiceTest.java

@@ -26,6 +26,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.resetAllRequests;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
@@ -64,6 +65,7 @@ void printTimeZoneSuccessfully(@Nonnull final CapturedOutput output) throws Json
 
     @Test
     void retriesOnceToGetZonedTime(@Nonnull final CapturedOutput output) throws JsonProcessingException {
+        resetAllRequests();
         final String zoneNames = TimeZone.getDefault().getID();
         final RuntimeException exception = new RuntimeException("Retries exhausted");
         stubFor(get(urlPathMatching("/" + zoneNames))
@@ -73,7 +75,7 @@ void retriesOnceToGetZonedTime(@Nonnull final CapturedOutput output) throws Json
             ));
 
         final LocalDateTime result = publicApiService.getZonedTime();
-        verify(getRequestedFor(urlPathMatching("/" + zoneNames)));
+        verify(2, getRequestedFor(urlPathMatching("/" + zoneNames)));
 
         assertThat(result).isNull();
         assertThat(output).contains("Retrying request to ", "Retries exhausted");