added active ssl sessions count stats

thingsboard · Jun 21, 2024 · bc3d850 · bc3d850
1 parent af7f7f1
commit bc3d850
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/.../org/thingsboard/mqtt/broker/service/mqtt/client/session/ClientSessionCtxServiceImpl.java b/.../org/thingsboard/mqtt/broker/service/mqtt/client/session/ClientSessionCtxServiceImpl.java
@@ -26,6 +26,7 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
 
 @Service
 @Slf4j
@@ -37,9 +38,12 @@ public class ClientSessionCtxServiceImpl implements ClientSessionCtxService {
  private final StatsManager statsManager;
  private final boolean isTraceEnabled = log.isTraceEnabled();
 
+ private AtomicLong sslSessionCounter;
+
  @PostConstruct
  public void init() {
  statsManager.registerActiveSessionsStats(clientContextMap);
+ sslSessionCounter = statsManager.registerActiveSslSessionsStats();
  }
 
  @Override
@@ -49,14 +53,20 @@ public void registerSession(ClientSessionCtx clientSessionCtx) throws MqttExcept
  log.trace("Executing registerSession: {}. Current size: {}", clientId, clientContextMap.size());
  }
  clientContextMap.put(clientId, clientSessionCtx);
+ if (clientSessionCtx.getSslHandler() != null) {
+ sslSessionCounter.incrementAndGet();
+ }
  }
 
  @Override
  public void unregisterSession(String clientId) {
  if (isTraceEnabled) {
  log.trace("Executing unregisterSession: {}. Current size: {}", clientId, clientContextMap.size());
  }
- clientContextMap.remove(clientId);
+ ClientSessionCtx remove = clientContextMap.remove(clientId);
+ if (remove != null && remove.getSslHandler() != null) {
+ sslSessionCounter.decrementAndGet();
+ }
  }
 
  @Override

diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsManager.java b/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsManager.java
@@ -66,6 +66,8 @@ public interface StatsManager {
 
  void registerActiveSessionsStats(Map<?, ?> sessionsMap);
 
+ AtomicLong registerActiveSslSessionsStats();
+
  void registerAllClientSessionsStats(Map<?, ?> clientSessionsMap);
 
  void registerClientSubscriptionsStats(Map<?, ?> clientSubscriptionsMap);

diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsManagerImpl.java b/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsManagerImpl.java
@@ -271,12 +271,22 @@ public void registerLastWillStats(Map<?, ?> lastWillMsgsMap) {
  @Override
  public void registerActiveSessionsStats(Map<?, ?> sessionsMap) {
  if (log.isTraceEnabled()) {
- log.trace("Registering SessionsStats.");
+ log.trace("Registering ActiveSessionsStats.");
  }
  statsFactory.createGauge(StatsType.CONNECTED_SESSIONS.getPrintName(), sessionsMap, Map::size);
  gauges.add(new Gauge(StatsType.CONNECTED_SESSIONS.getPrintName(), sessionsMap::size));
  }
 
+ @Override
+ public AtomicLong registerActiveSslSessionsStats() {
+ if (log.isTraceEnabled()) {
+ log.trace("Creating ActiveSslSessionsStats.");
+ }
+ AtomicLong sizeGauge = statsFactory.createGauge(StatsType.CONNECTED_SSL_SESSIONS.getPrintName(), new AtomicLong(0));
+ gauges.add(new Gauge(StatsType.CONNECTED_SSL_SESSIONS.getPrintName(), sizeGauge::get));
+ return sizeGauge;
+ }
+
  @Override
  public void registerAllClientSessionsStats(Map<?, ?> clientSessionsMap) {
  if (log.isTraceEnabled()) {

diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsManagerStub.java b/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsManagerStub.java
@@ -121,6 +121,11 @@ public void registerLastWillStats(Map<?, ?> lastWillMsgsMap) {
  public void registerActiveSessionsStats(Map<?, ?> sessionsMap) {
  }
 
+ @Override
+ public AtomicLong registerActiveSslSessionsStats() {
+ return new AtomicLong(0);
+ }
+
  @Override
  public void registerAllClientSessionsStats(Map<?, ?> clientSessionsMap) {
  }

diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsType.java b/application/src/main/java/org/thingsboard/mqtt/broker/service/stats/StatsType.java
@@ -23,6 +23,7 @@ public enum StatsType {
  RETAIN_MSG_TRIE_SIZE("retainMsgTrieSize"),
  LAST_WILL_CLIENTS("lastWillClients"),
  CONNECTED_SESSIONS("connectedSessions"),
+ CONNECTED_SSL_SESSIONS("connectedSslSessions"),
  ALL_CLIENT_SESSIONS("allClientSessions"),
  CLIENT_SUBSCRIPTIONS("clientSubscriptions"),
  RETAINED_MESSAGES("retainedMessages"),