From 6d006d16c7522d8c59e1f51f4627c7f47f98430d Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Wed, 24 Nov 2021 10:38:45 +0200
Subject: [PATCH] Improved rate limits message for MQTT session events

---
 .../server/common/msg/tools/TbRateLimitsException.java          | 1 +
 .../thingsboard/server/transport/mqtt/MqttTransportHandler.java | 2 +-
 .../transport/limits/DefaultTransportRateLimitService.java      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimitsException.java b/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimitsException.java
index 89b2c7b527..35d5ad63c4 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimitsException.java
+++ b/common/message/src/main/java/org/thingsboard/server/common/msg/tools/TbRateLimitsException.java
@@ -26,6 +26,7 @@ public class TbRateLimitsException extends RuntimeException {
     private final EntityType entityType;
 
     public TbRateLimitsException(EntityType entityType) {
+        super(entityType.name() + " rate limits reached!");
         this.entityType = entityType;
     }
 }
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index 61638052c0..693b47d42f 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -951,7 +951,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
                 @Override
                 public void onError(Throwable e) {
                     if (e instanceof TbRateLimitsException) {
-                        log.trace("[{}] Failed to submit session event", sessionId, e);
+                        log.trace("[{}] Failed to submit session event: {}", sessionId, e.getMessage());
                     } else {
                         log.warn("[{}] Failed to submit session event", sessionId, e);
                     }
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java
index e7d6cddc3c..5ee4064466 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/limits/DefaultTransportRateLimitService.java
@@ -57,7 +57,7 @@ public class DefaultTransportRateLimitService implements TransportRateLimitServi
     @Override
     public EntityType checkLimits(TenantId tenantId, DeviceId deviceId, int dataPoints) {
         if (!tenantAllowed.getOrDefault(tenantId, Boolean.TRUE)) {
-            return EntityType.TENANT;
+            return EntityType.API_USAGE_STATE;
         }
         if (!checkEntityRateLimit(dataPoints, getTenantRateLimits(tenantId))) {
             return EntityType.TENANT;