优化会话统计

jetlinks · May 28, 2021 · ca8735e · ca8735e
1 parent 76652c7
commit ca8735e
Showing 1 changed file with 23 additions and 11 deletions.
diff --git a/src/main/java/org/jetlinks/supports/server/monitor/MicrometerGatewayServerMetrics.java b/src/main/java/org/jetlinks/supports/server/monitor/MicrometerGatewayServerMetrics.java
@@ -6,11 +6,17 @@
 import org.jetlinks.core.server.monitor.GatewayServerMetrics;
 import org.jetlinks.core.server.session.DeviceSession;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
 public class MicrometerGatewayServerMetrics implements GatewayServerMetrics {
 
-    private String serverId;
+    private final String serverId;
+
+    private final MeterRegistry registry;
 
-    private MeterRegistry registry;
+    private final Map<String, AtomicLong> sessionRecord = new ConcurrentHashMap<>();
 
     public MicrometerGatewayServerMetrics(String serverId) {
         this(serverId, null);
@@ -23,6 +29,14 @@ public MicrometerGatewayServerMetrics(String serverId, MeterRegistry registry) {
             registry = Metrics.globalRegistry;
         }
         this.registry = registry;
+
+        Gauge.builder("gateway-server-session", sessionRecord, sessionRecord -> sessionRecord
+                .values()
+                .stream()
+                .mapToLong(Number::longValue)
+                .sum())
+             .tag("server", getServerId())
+             .register(registry);
     }
 
     public String getServerId() {
@@ -31,11 +45,9 @@ public String getServerId() {
 
     @Override
     public void reportSession(String transport, int sessionTotal) {
-        Gauge.builder("gateway-server-session", sessionTotal, Number::doubleValue)
-                .tag("transport", transport)
-                .tag("server", getServerId())
-                .description("当前" + transport + "会话数量")
-                .register(registry);
+        sessionRecord
+                .computeIfAbsent(transport, key -> new AtomicLong())
+                .set(sessionTotal);
     }
 
     @Override
@@ -65,9 +77,9 @@ public void rejectedConnection(String transport) {
     @Override
     public void receiveFromDeviceMessage(DeviceSession session) {
         registry.counter("received_messages",
-                "transport", session.getTransport().getId(),
-                "deviceId", session.getDeviceId(),
-                "server", getServerId())
-                .increment(-1);
+                         "transport", session.getTransport().getId(),
+                         "deviceId", session.getDeviceId(),
+                         "server", getServerId())
+                .increment(1);
     }
 }