tolldemo: working on the slow query (#887)

markxnelson · web-flow · commit 85c5f09663ae · 2024-05-05T11:09:19.000-04:00
* working on slow query and metrics 
---

Signed-off-by: Mark Nelson &lt;mark.x.nelson@oracle.com&gt;
diff --git a/tolldemo/queue-reader/pom.xml b/tolldemo/queue-reader/pom.xml
@@ -17,8 +17,8 @@
         <java.version>11</java.version>
         <spring-cloud.version>2021.0.8</spring-cloud.version>
         <oracle-springboot-starter.version>2.7.12</oracle-springboot-starter.version>
-        <micrometer-core.version>1.12.5</micrometer-core.version>
-        <datasource-micrometer-spring-boot.version>1.0.3</datasource-micrometer-spring-boot.version>
+        <!-- <micrometer-core.version>1.12.5</micrometer-core.version>
+        <datasource-micrometer-spring-boot.version>1.0.3</datasource-micrometer-spring-boot.version> -->
     </properties>
     <dependencies>
         <dependency>
@@ -29,10 +29,24 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.database.spring</groupId>
+            <artifactId>oracle-spring-boot-starter-ucp</artifactId>
+            <version>${oracle-springboot-starter.version}</version>
+            <type>pom</type>
+        </dependency>
         <dependency>
             <groupId>com.oracle.database.spring</groupId>
             <artifactId>oracle-spring-boot-starter-aqjms</artifactId>
@@ -44,44 +58,44 @@
             <version>2.17.0</version>
         </dependency>
          <!-- Core module of Micrometer -->
-        <dependency>
+        <!-- <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-core</artifactId>
             <version>${micrometer-core.version}</version>
-        </dependency>
+        </dependency> -->
         <!-- Prometheues-->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
         <!-- Adds the Tracer Implementation -->
-        <dependency>
+        <!-- <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-otel</artifactId>
             <version>1.2.5</version>
-        </dependency>
+        </dependency> -->
         <!-- Adds an exporter to store the traces -->
-        <dependency>
+        <!-- <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-exporter-otlp</artifactId>
             <version>1.37.0</version>
-        </dependency>
+        </dependency> -->
         <!-- Adds the Tracing API -->
-        <dependency>
+        <!-- <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing</artifactId>
             <version>1.2.5</version>
-        </dependency>
+        </dependency> -->
         <!-- Eureka client-->
-        <dependency>
+        <!-- <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-        <dependency>
+        </dependency> -->
+        <!-- <dependency>
 			<groupId>net.ttddyy.observation</groupId>
 			<artifactId>datasource-micrometer-spring-boot</artifactId>
 			<version>${datasource-micrometer-spring-boot.version}</version>
-		</dependency>
+		</dependency> -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -93,6 +107,11 @@
             <groupId>com.oracle.oci.sdk</groupId>
             <artifactId>oci-java-sdk-common-httpclient-jersey</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>1.19.4</version>
+        </dependency>
         <dependency>
             <groupId>com.oracle.oci.sdk</groupId>
             <artifactId>oci-java-sdk-core</artifactId>
diff --git a/tolldemo/queue-reader/src/main/java/com/example/queuereader/client/AIVisionClient.java b/tolldemo/queue-reader/src/main/java/com/example/queuereader/client/AIVisionClient.java
@@ -1,22 +1,19 @@
 package com.example.queuereader.client;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.stereotype.Component;
 
-import com.oracle.bmc.ConfigFileReader;
 import com.oracle.bmc.aivision.AIServiceVisionClient;
 import com.oracle.bmc.aivision.model.AnalyzeImageDetails;
 import com.oracle.bmc.aivision.model.ImageClassificationFeature;
 import com.oracle.bmc.aivision.model.Label;
 import com.oracle.bmc.aivision.model.ObjectStorageImageDetails;
 import com.oracle.bmc.aivision.requests.AnalyzeImageRequest;
 import com.oracle.bmc.aivision.responses.AnalyzeImageResponse;
-import com.oracle.bmc.auth.AuthenticationDetailsProvider;
-import com.oracle.bmc.auth.ConfigFileAuthenticationDetailsProvider;
+import com.oracle.bmc.auth.InstancePrincipalsAuthenticationDetailsProvider;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -25,16 +22,24 @@
 public class AIVisionClient {
 
     public String analyzeImage(String imageUrl) {
-        ConfigFileReader.ConfigFile configFile = null;
+        // ConfigFileReader.ConfigFile configFile = null;
+        // try {
+        //     configFile = ConfigFileReader.parseDefault();
+        // } catch (IOException ioe) {
+        //     return null;
+        // }
+        // AuthenticationDetailsProvider provider = new ConfigFileAuthenticationDetailsProvider(configFile);
+        final InstancePrincipalsAuthenticationDetailsProvider provider;
         try {
-            configFile = ConfigFileReader.parseDefault();
-        } catch (IOException ioe) {
+            provider = InstancePrincipalsAuthenticationDetailsProvider.builder().build();
+        } catch (Exception e) {
+            log.error("Could not create Instance Principal Auth Provider", e);
             return null;
         }
-        AuthenticationDetailsProvider provider = new ConfigFileAuthenticationDetailsProvider(configFile);
+
         AIServiceVisionClient client = AIServiceVisionClient.builder().build(provider);
 
-        String objectName = "cars-images/htsngg9tpc-2/" + imageUrl;
+        String objectName = "cars-images/" + imageUrl;
         log.info("object name: " + objectName);
 
         AnalyzeImageDetails analyzeImageDetails = AnalyzeImageDetails.builder()
diff --git a/tolldemo/queue-reader/src/main/java/com/example/queuereader/client/JournalClient.java b/tolldemo/queue-reader/src/main/java/com/example/queuereader/client/JournalClient.java
@@ -4,11 +4,14 @@
 package com.example.queuereader.client;
 
 import com.fasterxml.jackson.databind.JsonNode;
+
+import io.micrometer.core.annotation.Timed;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "journal", url = "http://localhost:8080")
+@FeignClient(name = "journal", url = "http://journal-app:8080")
 public interface JournalClient {
 
     @PostMapping("/api/v1/journal")
diff --git a/tolldemo/queue-reader/src/main/java/com/example/queuereader/controller/TollReaderReceiver.java b/tolldemo/queue-reader/src/main/java/com/example/queuereader/controller/TollReaderReceiver.java
@@ -3,14 +3,23 @@
 
 package com.example.queuereader.controller;
 
+import com.example.queuereader.model.AccountDetails;
 import com.example.queuereader.service.AIVisionService;
+import com.example.queuereader.service.CustomerDataService;
 import com.example.queuereader.service.JournalService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
 import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.stereotype.Component;
 
@@ -22,19 +31,50 @@ public class TollReaderReceiver {
 
     private JournalService journalService;
     private AIVisionService aiVisionService;
+    private CustomerDataService customerDataService;
+    private Timer timer;
 
-    public TollReaderReceiver(JournalService journalService, AIVisionService aiVisionService) {
+    public TollReaderReceiver(
+        JournalService journalService, 
+        AIVisionService aiVisionService,
+        CustomerDataService customerDataService,
+        PrometheusMeterRegistry registry
+    ) {
         this.journalService = journalService;
         this.aiVisionService = aiVisionService;
+        this.customerDataService = customerDataService;
+        timer = registry.timer("process.toll.read", Tags.empty());
     }
 
     @JmsListener(destination = "TollGate")
     public void receiveTollData(String tollData) {
+        Timer.Sample sample = Timer.start();
         log.info("Received message {}", tollData);
         try {
             JsonNode tollDataJson = objectMapper.readTree(tollData);
             log.info(String.valueOf(tollDataJson));
+
+            // check account
+            log.info("Check that the tag, licensePlate and accountNumber match up");
+            String tagId = tollDataJson.get("tagId").asText();
+            String accountId = tollDataJson.get("accountNumber").asText();
+            String licensePlate = tollDataJson.get("licensePlate").asText().split("-")[1];
+
+            List<AccountDetails> accountDetails = customerDataService.getAccountDetails(licensePlate);
+            boolean found = false;
+            for (AccountDetails a : accountDetails) {
+                if (a.getAccountNumber().equalsIgnoreCase(accountId) && a.getTagId().equalsIgnoreCase(tagId)) {
+                    found = true; 
+                }
+            }
+            if (found) {
+                log.info("Details match, proceeding...");
+            } else {
+                log.info("Details do not match - so ignoring this message");
+            }
+
             // call ai vision model to detect vehicle type
+            log.info("Call the Vision AI Service to check if the vehicle photo matches the registration...");
             String aiResult = aiVisionService.analyzeImage(tollDataJson.get("image").asText());
             log.info("result from ai (type,confidence): " + aiResult);
             String detectedVehicleType = aiResult.split(",")[0];
@@ -44,6 +84,8 @@ public void receiveTollData(String tollData) {
             journalService.journal(updatedTollDataJson);
         } catch (JsonProcessingException e) {
             e.printStackTrace();
+        } finally {
+            timer.record(() -> sample.stop(timer) / 1_000_000);
         }
     }
 }
diff --git a/tolldemo/queue-reader/src/main/java/com/example/queuereader/model/AccountDetails.java b/tolldemo/queue-reader/src/main/java/com/example/queuereader/model/AccountDetails.java
@@ -0,0 +1,23 @@
+package com.example.queuereader.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AccountDetails {
+    private String customerId;
+    private String accountNumber;
+    private String firstName;
+    private String lastName;
+    private String address;
+    private String city;
+    private String zipcode;
+    private String vehicleId;
+    private String tagId;
+    private String state;
+    private String licensePlate;
+    private String vehicleType;
+}
diff --git a/tolldemo/queue-reader/src/main/java/com/example/queuereader/service/AIVisionService.java b/tolldemo/queue-reader/src/main/java/com/example/queuereader/service/AIVisionService.java
@@ -4,17 +4,26 @@
 
 import com.example.queuereader.client.AIVisionClient;
 
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
+
 @Service
 public class AIVisionService {
     
     private AIVisionClient client; 
+    private Timer timer;
 
-    AIVisionService(AIVisionClient client) {
+    AIVisionService(AIVisionClient client, PrometheusMeterRegistry registry) {
         this.client = client;
+        timer = registry.timer("ai.vision", Tags.empty());
     }
 
     public String analyzeImage(String imageUrl) {
-        return client.analyzeImage(imageUrl);
+        Timer.Sample sample = Timer.start();
+        String response = client.analyzeImage(imageUrl);
+        timer.record(() -> sample.stop(timer) / 1_000_000);
+        return response;
     }
 
 }
diff --git a/tolldemo/queue-reader/src/main/java/com/example/queuereader/service/CustomerDataService.java b/tolldemo/queue-reader/src/main/java/com/example/queuereader/service/CustomerDataService.java
@@ -0,0 +1,62 @@
+package com.example.queuereader.service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import com.example.queuereader.model.AccountDetails;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@Slf4j
+public class CustomerDataService {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    public CustomerDataService(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+    
+
+    final String accountDetailsQuery = 
+    "select c.customer_id, c.account_number, c.first_name, c.last_name, c.address, c.city, c.zipcode, "
+    + "v.vehicle_id, v.tag_id, v.state, v.license_plate, v.vehicle_type "
+    + "from customer c, vehicle v " 
+    + "where c.customer_id like '%'||v.customer_id||'%' "
+    + "and c.customer_id like ("
+    + "  select '%'||customer_id||'%' "
+    + "  from vehicle "
+    + "  where license_plate like '%XXXXXX%'"
+    + ")";
+
+
+    public List<AccountDetails> getAccountDetails(String licensePlate) {
+        List<AccountDetails> result = new ArrayList<AccountDetails>();
+        long startTime = System.currentTimeMillis();
+        jdbcTemplate.query(accountDetailsQuery.replace("XXXXXX", licensePlate),
+        (rs, rowNum) -> new AccountDetails(
+            rs.getString("customer_id"),
+            rs.getString("account_number"),
+            rs.getString("first_name"),
+            rs.getString("last_name"),
+            rs.getString("address"),
+            rs.getString("city"),
+            rs.getString("zipcode"),
+            rs.getString("vehicle_id"),
+            rs.getString("tag_id"),
+            rs.getString("state"),
+            rs.getString("license_plate"),
+            rs.getString("vehicle_type")
+        )).forEach(accountDetails -> result.add(accountDetails));
+        long endTime = System.currentTimeMillis();
+        log.info("The query took " + (endTime - startTime) + "ms");
+
+        log.info("returning " + result.size() + " account detail rows");
+        return result;
+    }
+
+}
diff --git a/tolldemo/queue-reader/src/main/java/com/example/queuereader/service/JournalService.java b/tolldemo/queue-reader/src/main/java/com/example/queuereader/service/JournalService.java
diff --git a/tolldemo/queue-reader/src/main/resources/application.yaml b/tolldemo/queue-reader/src/main/resources/application.yaml
