Merge pull request #12882 from dashevchenko/edqs-apiUsage-Fix

Edqs bug: jsonNode fields are not synced

application/src/main/resources/thingsboard.yml

@@ -1757,8 +1757,6 @@ queue:
     stats:
       # Enable/disable statistics for EDQS
       enabled: "${TB_EDQS_STATS_ENABLED:true}"
-      # Statistics printing interval for EDQS
-      print-interval-ms: "${TB_EDQS_STATS_PRINT_INTERVAL_MS:300000}"
   vc:
     # Default topic name
     topic: "${TB_QUEUE_VC_TOPIC:tb_version_control}"

common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/FieldsUtil.java

@@ -289,7 +289,7 @@ public class FieldsUtil {
     }
 
     public static String getText(JsonNode node) {
-        return node != null ? node.asText() : "";
+        return node != null ? node.toString() : "";
     }
 
     private static UUID getCustomerId(CustomerId customerId) {

common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java

@@ -430,6 +430,9 @@ public class TenantRepo {
 
     private String getEntityName(EntityId entityId) {
         EntityType entityType = entityId.getEntityType();
+        if (entityType == EntityType.TENANT && entityId.getId().equals(TenantId.NULL_UUID)) {
+            return "";
+        }
         return switch (entityType) {
             case CUSTOMER, TENANT -> getEntityMap(entityType).get(entityId.getId()).getFields().getName();
             default -> throw new RuntimeException("Unsupported entity type: " + entityType);

common/edqs/src/main/java/org/thingsboard/server/edqs/stats/EdqsStatsService.java

@@ -20,7 +20,6 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.ObjectType;
 import org.thingsboard.server.common.data.edqs.EdqsEventType;
@@ -43,18 +42,6 @@ public class EdqsStatsService {
     private final ConcurrentHashMap<TenantId, EdqsStats> statsMap = new ConcurrentHashMap<>();
     private final StatsFactory statsFactory;
 
-    @Scheduled(initialDelayString = "${queue.edqs.stats.print-interval-ms:300000}",
-            fixedDelayString = "${queue.edqs.stats.print-interval-ms:300000}")
-    private void reportStats() {
-        if (statsMap.isEmpty()) {
-            return;
-        }
-        String values = statsMap.entrySet().stream()
-                .map(kv -> "TenantId [" + kv.getKey() + "] stats [" + kv.getValue() + "]")
-                .collect(Collectors.joining(System.lineSeparator()));
-        log.info("EDQS Stats: {}", values);
-    }
-
     public void reportEvent(TenantId tenantId, ObjectType objectType, EdqsEventType eventType) {
         statsMap.computeIfAbsent(tenantId, id -> new EdqsStats(tenantId, statsFactory))
                 .reportEvent(objectType, eventType);

edqs/src/main/resources/edqs.yml

@@ -70,8 +70,6 @@ queue:
     stats:
       # Enable/disable statistics for EDQS
       enabled: "${TB_EDQS_STATS_ENABLED:true}"
-      # Statistics printing interval for EDQS
-      print-interval-ms: "${TB_EDQS_STATS_PRINT_INTERVAL_MS:300000}"
 
   kafka:
     # Kafka Bootstrap nodes in "host:port" format