feat : adds observation

rajadilipkolli · Dec 8, 2023 · b8acdf0 · b8acdf0
1 parent 284a7ac
commit b8acdf0
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 2 deletions.
diff --git a/order-service/pom.xml b/order-service/pom.xml
@@ -180,6 +180,16 @@
             <artifactId>spring-boot-testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-observation-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka-test</artifactId>

diff --git a/order-service/src/main/java/com/example/orderservice/config/ObservedAspectConfiguration.java b/order-service/src/main/java/com/example/orderservice/config/ObservedAspectConfiguration.java
@@ -0,0 +1,21 @@
+/***
+<p>
+    Licensed under MIT License Copyright (c) 2023 Raja Kolli.
+</p>
+***/
+
+package com.example.orderservice.config;
+
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.aop.ObservedAspect;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ObservedAspectConfiguration {
+
+    @Bean
+    public ObservedAspect observedAspect(ObservationRegistry observationRegistry) {
+        return new ObservedAspect(observationRegistry);
+    }
+}
diff --git a/order-service/src/main/java/com/example/orderservice/services/OrderService.java b/order-service/src/main/java/com/example/orderservice/services/OrderService.java
@@ -16,6 +16,7 @@ Licensed under MIT License Copyright (c) 2021-2023 Raja Kolli.
 import com.example.orderservice.model.response.OrderResponse;
 import com.example.orderservice.model.response.PagedResult;
 import com.example.orderservice.repositories.OrderRepository;
+import io.micrometer.observation.annotation.Observed;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -33,6 +34,7 @@ Licensed under MIT License Copyright (c) 2021-2023 Raja Kolli.
 @RequiredArgsConstructor
 @Loggable
 @Slf4j
+@Observed(name = "orderService")
 public class OrderService {
 
     private final OrderRepository orderRepository;

diff --git a/order-service/src/test/java/com/example/orderservice/common/AbstractIntegrationTest.java b/order-service/src/test/java/com/example/orderservice/common/AbstractIntegrationTest.java
@@ -9,9 +9,14 @@ Licensed under MIT License Copyright (c) 2021-2023 Raja Kolli.
 import com.example.orderservice.TestOrderServiceApplication;
 import com.example.orderservice.utils.AppConstants;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.observation.tck.TestObservationRegistry;
+import io.micrometer.tracing.test.simple.SimpleTracer;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -21,9 +26,23 @@ Licensed under MIT License Copyright (c) 2021-2023 Raja Kolli.
         properties = {"spring.cloud.config.enabled=false"},
         classes = TestOrderServiceApplication.class)
 @AutoConfigureMockMvc
+@AutoConfigureObservability
 public abstract class AbstractIntegrationTest extends ContainerInitializer {
 
     @Autowired protected MockMvc mockMvc;
 
     @Autowired protected ObjectMapper objectMapper;
+
+    @TestConfiguration
+    static class ObservationTestConfiguration {
+        @Bean
+        TestObservationRegistry observationRegistry() {
+            return TestObservationRegistry.create();
+        }
+
+        @Bean
+        SimpleTracer simpleTracer() {
+            return new SimpleTracer();
+        }
+    }
 }
diff --git a/payment-service/src/test/java/com/example/paymentservice/TestPaymentApplication.java b/payment-service/src/test/java/com/example/paymentservice/TestPaymentApplication.java
@@ -32,7 +32,8 @@ GenericContainer<?> zipkContainer() {
     @ServiceConnection
     KafkaContainer kafkaContainer() {
         return new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.5.2"))
-                .withKraft();
+                .withKraft()
+                .withReuse(true);
     }
 
     public static void main(String[] args) {

diff --git a/test-em-all.sh b/test-em-all.sh
@@ -143,7 +143,7 @@ function setupTestData() {
     # Verify that communication between catalog-service and inventory service is established
     assertCurl 200 "curl  -k http://$HOST:$PORT/catalog-service/api/catalog/productCode/$PROD_CODE_1?fetchInStock=true"
     assertEqual \"${PROD_CODE_1}\" $(echo ${RESPONSE} | jq .code)
-    assertEqual \"true\" $(echo ${RESPONSE} | jq .inStock)
+    assertEqual true $(echo ${RESPONSE} | jq .inStock)
 
     body="{\"name\": \"$CUSTOMER_NAME"
     body+=\