prometeus add

rota-utic-client/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-aop'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
 
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0'
     implementation 'com.oracle:ojdbc7:12.1.0.2'

rota-utic-client/src/main/java/com/its/rota/utic/client/RotaUticClientApplication.java

@@ -80,7 +80,9 @@ public class RotaUticClientApplication implements CommandLineRunner, Application
 
     public void terminateApplication() {
         ItsAsnClientCommService itsAsnClientCommService = SpringUtils.getBean(ItsAsnClientCommService.class);
-        itsAsnClientCommService.shutdown();
+        if (itsAsnClientCommService != null) {
+            itsAsnClientCommService.shutdown();
+        }
     }
 
     @Override

rota-utic-client/src/main/java/com/its/rota/utic/client/controller/RotaUticClientController.java

@@ -1,5 +1,6 @@
 package com.its.rota.utic.client.controller;
 
+import com.its.common.utils.TimeUtils;
 import com.its.rota.utic.client.config.ApplicationConfig;
 import com.its.rota.utic.client.dto.CenterDto;
 import com.its.rota.utic.client.dto.NET;
@@ -29,16 +30,17 @@ public class RotaUticClientController {
         CenterDto center = ApplicationRepository.center;
 
         StringBuilder sb = new StringBuilder();
-        sb.append(heading + sep);
-        sb.append("ITS Rota Client Running Information" + sep);
-        sb.append(heading + sep);
-        sb.append(String.format("%s, %s", center.getCenterId(), center.getIpAddress()) + sep);
-        sb.append(heading + sep);
+        sb.append(heading).append(sep);
+        sb.append("ROTA UTIC Client Running Information").append(sep);
+        sb.append(heading).append(sep);
+        sb.append(String.format("Process Id: %s, %s, %s", this.config.getProcessId(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
+        sb.append(String.format("%s, %s", center.getCenterId(), center.getIpAddress())).append(sep);
+        sb.append(heading).append(sep);
         sb.append(String.format("%s %-15.15s %-8.8s %-20.20s %-20.20s %-20.20s %7s %s",
                 "---", "IP Address", "Network",
                 "Connect Time", "Disconnect Time",
-                "Last Recv Time", "Count", "Center Name") + sep);
-        sb.append(heading + sep);
+                "Last Recv Time", "Count", "Center Name")).append(sep);
+        sb.append(heading).append(sep);
         int total = 0;
         int onLine = 0;
         List<String> keySet = new ArrayList<>(this.repo.getRegionCenterMap().keySet());
@@ -58,12 +60,12 @@ public class RotaUticClientController {
                     region.getCenterId(), region.getIpAddress(), commStatus,
                     region.getNetState().getConnectTimeString(), region.getNetState().getDisconnectTimeString(),
                     region.getTraffic().getLastRecvTime(), region.getTraffic().getTotalRecv(),
-                    region.getCenterInfo()) + sep);
+                    region.getCenterInfo())).append(sep);
 
         }
-        sb.append(heading + sep);
-        sb.append(String.format("Total : %d, OnLine(Connect): %d", total, onLine) + sep);
-        sb.append(heading + sep);
+        sb.append(heading).append(sep);
+        sb.append(String.format("Total : %d, OnLine(Connect): %d", total, onLine)).append(sep);
+        sb.append(heading).append(sep);
         return sb.toString();
     }
 

rota-utic-client/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
       import:
         - optional:file:${user.dir}/conf/rota-utic-client.yml
   application:
-    name: its-rota-client
+    name: rota-utic-client
   main:
 #    web-application-type: none
     log-startup-info: true
@@ -31,12 +31,18 @@ server:
   shutdown: graceful
 management:
   endpoints:
+    prometheus:
+      enabled: true
     web:
       exposure:
-        include: health, metrics
+        include: "*"
+    health:
+      show-details: "always"
+  security:
+    enabled: false
 
 application:
-  process-id: 81020
+  process-id: 61020
   connection-timeout: 5
   retry-connect-seconds: 60
 

rota-utic-server/build.gradle

@@ -27,6 +27,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-aop'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
 
     implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0'
     implementation 'com.oracle:ojdbc7:12.1.0.2'

rota-utic-server/src/main/java/com/its/rota/utic/server/RotaUticServerApplication.java

@@ -83,7 +83,9 @@ public class RotaUticServerApplication implements CommandLineRunner, Application
         applicationRepository.terminate();
 
         ItsAsnCommServerService itsAsnCommServerService = SpringUtils.getBean(ItsAsnCommServerService.class);
-        itsAsnCommServerService.shutdown();
+        if (itsAsnCommServerService != null) {
+            itsAsnCommServerService.shutdown();
+        }
     }
 
     @Override

rota-utic-server/src/main/java/com/its/rota/utic/server/controller/RotaUticServerController.java

@@ -1,5 +1,6 @@
 package com.its.rota.utic.server.controller;
 
+import com.its.common.utils.TimeUtils;
 import com.its.rota.utic.server.config.ApplicationConfig;
 import com.its.rota.utic.server.dto.CenterDto;
 import com.its.rota.utic.server.dto.NET;
@@ -29,17 +30,18 @@ public class RotaUticServerController {
         CenterDto center = ApplicationRepository.center;
 
         StringBuilder sb = new StringBuilder();
-        sb.append(heading + sep);
-        sb.append("ITS Rota Server Running Information" + sep);
-        sb.append(heading + sep);
+        sb.append(heading).append(sep);
+        sb.append("ROTA UTIC Server Running Information").append(sep);
+        sb.append(heading).append(sep);
+        sb.append(String.format("Process Id: %s, %s, %s", this.config.getProcessId(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
         sb.append(String.format("%s, %s:%d, Traffic Time: %s",
-                center.getCenterId(), center.getIpAddress(), center.getCommPort(), ApplicationRepository.checkTrafficTime) + sep);
-        sb.append(heading + sep);
+                center.getCenterId(), center.getIpAddress(), center.getCommPort(), ApplicationRepository.checkTrafficTime)).append(sep);
+        sb.append(heading).append(sep);
         sb.append(String.format("%s %-15.15s %-8.8s %-20.20s %-20.20s %-20.20s %7s %s",
                 "---", "IP Address", "Network",
                 "Connect Time", "Disconnect Time",
-                "Last Send Time", "Count", "Center Name") + sep);
-        sb.append(heading + sep);
+                "Last Send Time", "Count", "Center Name")).append(sep);
+        sb.append(heading).append(sep);
         int total = 0;
         int onLine = 0;
         List<String> keySet = new ArrayList<>(this.repo.getCenterMap().keySet());
@@ -59,12 +61,12 @@ public class RotaUticServerController {
                     region.getCenterId(), region.getIpAddress(), commStatus,
                     region.getNetState().getConnectTimeString(), region.getNetState().getDisconnectTimeString(),
                     region.getTraffic().getLastSendTime(), region.getTraffic().getTotalSends(),
-                    region.getCenterInfo()) + sep);
+                    region.getCenterInfo())).append(sep);
 
         }
-        sb.append(heading + sep);
-        sb.append(String.format("Total : %d, OnLine(Connect): %d", total, onLine) + sep);
-        sb.append(heading + sep);
+        sb.append(heading).append(sep);
+        sb.append(String.format("Total : %d, OnLine(Connect): %d", total, onLine)).append(sep);
+        sb.append(heading).append(sep);
         return sb.toString();
     }
 

rota-utic-server/src/main/resources/application.yml

@@ -31,12 +31,18 @@ server:
   shutdown: graceful
 management:
   endpoints:
+    prometheus:
+      enabled: true
     web:
       exposure:
-        include: health, metrics
+        include: "*"
+    health:
+      show-details: "always"
+  security:
+    enabled: false
 
 application:
-  process-id: 81010
+  process-id: 61010
   packet-workers: 30
   packet-queue-size: 0
   dbms-workers: 5