Merge pull request #196 from jeevanjoseph/feature/orders-metrics

Feature/orders metrics

Author: jeevanjoseph

deploy/complete/docker-compose/docker-compose.yml

@@ -132,7 +132,7 @@ services:
 
   # OCI Orders service
   orders:
-    image: iad.ocir.io/oracle/ateam/mushop-orders:2.2.1
+    image: iad.ocir.io/oracle/ateam/mushop-orders:2.2.2
     ports:
       - 8085:80
     hostname: orders

deploy/complete/helm-chart/mushop/charts/orders/values.yaml

@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: iad.ocir.io/oracle/ateam/mushop-orders
-  tag: 2.2.1
+  tag: 2.2.2
   pullPolicy: IfNotPresent
 
 dbtools:

src/orders/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

src/orders/src/main/java/mushop/orders/services/MessagingService.java

@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.core.instrument.MeterRegistry;
 import io.nats.client.Connection;
 import io.nats.client.Dispatcher;
 import io.nats.client.Message;
@@ -30,6 +31,8 @@
 public class MessagingService {
     @Autowired
     private CustomerOrderRepository customerOrderRepository;
+    @Autowired
+    private MeterRegistry meterRegistry;
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final ObjectMapper objectMapper = new ObjectMapper();
     private Connection nc;
@@ -82,6 +85,7 @@ public void dispatchToFulfillment(OrderUpdate order) throws JsonProcessingExcept
         String msg = objectMapper.writeValueAsString(order);
         log.debug("Sending order over to fulfillment {}", order);
         this.nc.publish(this.mushopOrdersSubject, msg.getBytes(StandardCharsets.UTF_8));
+        meterRegistry.counter("orders.fulfillment_sent").increment();
     }
 
     private void handleMessage(Message message) {
@@ -94,6 +98,8 @@ private void handleMessage(Message message) {
                                     order.setShipment(update.getShipment());
                                     customerOrderRepository.save(order);
                                     log.info("order {} is now {}", order.getId(), update.getShipment().getName());
+                                    meterRegistry.counter("orders.fulfillment_ack").increment();
+
                                 }
                         );
 

src/orders/src/main/java/mushop/orders/services/OrdersService.java

@@ -1,5 +1,7 @@
 package mushop.orders.services;
 
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.MeterRegistry;
 import mushop.orders.config.OrdersConfigurationProperties;
 import mushop.orders.entities.*;
 import mushop.orders.repositories.CustomerOrderRepository;
@@ -38,6 +40,9 @@ public class OrdersService {
     @Autowired
     private CustomerOrderRepository customerOrderRepository;
 
+    @Autowired
+    private MeterRegistry meterRegistry;
+
     @Value(value = "${http.timeout:5}")
     private long timeout;
 
@@ -47,6 +52,7 @@ public class OrdersService {
     public CustomerOrder createNewOrder(NewOrderResource orderPayload) {
         LOG.info("Creating order {}", orderPayload);
         LOG.debug("Starting calls");
+        meterRegistry.counter("orders.placed").increment();
         try {
             Future<Address> addressFuture = asyncGetService.getObject(orderPayload.address,
                     new ParameterizedTypeReference<Address>() {
@@ -82,9 +88,11 @@ public CustomerOrder createNewOrder(NewOrderResource orderPayload) {
 
             LOG.info("Received payment response: " + paymentResponse);
             if (paymentResponse == null) {
+                meterRegistry.counter("orders.rejected","cause","payment_response_invalid").increment();
                 throw new PaymentDeclinedException("Unable to parse authorisation packet");
             }
             if (!paymentResponse.isAuthorised()) {
+                meterRegistry.counter("orders.rejected","cause","payment_declined").increment();
                 throw new PaymentDeclinedException(paymentResponse.getMessage());
             }
 
@@ -102,12 +110,28 @@ public CustomerOrder createNewOrder(NewOrderResource orderPayload) {
 
             CustomerOrder savedOrder = customerOrderRepository.save(order);
             LOG.debug("Saved order: " + savedOrder);
+            meterRegistry.summary("orders.amount").record(amount);
+            DistributionSummary.builder("order.stats")
+                    .serviceLevelObjectives(10d,20d,30d,40d,50d,60d,70d,80d,90d,100d,110d)
+                    //.publishPercentileHistogram()
+                    .maximumExpectedValue(120d)
+                    .minimumExpectedValue(5d)
+                    .register(meterRegistry)
+                    .record(amount);
             OrderUpdate update = new OrderUpdate(savedOrder.getId(), null);
             messagingService.dispatchToFulfillment(update);
             return savedOrder;
         } catch (TimeoutException e) {
+            meterRegistry.counter("orders.rejected","cause","timeout").increment();
             throw new OrderFailedException("Unable to create order due to timeout from one of the services.", e);
-        } catch (InterruptedException | IOException | ExecutionException e) {
+        } catch (InterruptedException e) {
+            meterRegistry.counter("orders.rejected","cause","interrupted").increment();
+            throw new OrderFailedException("Unable to create order due to unspecified IO error.", e);
+        }catch ( IOException  e) {
+            meterRegistry.counter("orders.rejected","cause","connectivity").increment();
+            throw new OrderFailedException("Unable to create order due to unspecified IO error.", e);
+        }catch (ExecutionException e) {
+            meterRegistry.counter("orders.rejected","cause","task_failed").increment();
             throw new OrderFailedException("Unable to create order due to unspecified IO error.", e);
         }
 

src/orders/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=orders
 server.port=${port:8082}
 server.tomcat.max-threads=2
 
-spring.main.lazy-initialization=false
+spring.main.lazy-initialization=true
 
 management.endpoints.web.exposure.include=*
 management.endpoint.health.show-details=always