Merge pull request #13093 from irynamatveieva/debug-events-fixes

Calculated fields: fixes

application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java

@@ -107,7 +107,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
 
     public void process(CalculatedFieldStateRestoreMsg msg) {
         CalculatedFieldId cfId = msg.getId().cfId();
-        log.info("[{}] [{}] Processing CF state restore msg.", msg.getId().entityId(), cfId);
+        log.debug("[{}] [{}] Processing CF state restore msg.", msg.getId().entityId(), cfId);
         if (msg.getState() != null) {
             states.put(cfId, msg.getState());
         } else {
@@ -116,10 +116,10 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
     }
 
     public void process(EntityInitCalculatedFieldMsg msg) throws CalculatedFieldException {
-        log.info("[{}] Processing entity init CF msg.", msg.getCtx().getCfId());
+        log.debug("[{}] Processing entity init CF msg.", msg.getCtx().getCfId());
         var ctx = msg.getCtx();
         if (msg.isForceReinit()) {
-            log.info("Force reinitialization of CF: [{}].", ctx.getCfId());
+            log.debug("Force reinitialization of CF: [{}].", ctx.getCfId());
             states.remove(ctx.getCfId());
         }
         try {
@@ -138,7 +138,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
     }
 
     public void process(CalculatedFieldEntityDeleteMsg msg) {
-        log.info("[{}] Processing CF entity delete msg.", msg.getEntityId());
+        log.debug("[{}] Processing CF entity delete msg.", msg.getEntityId());
         if (this.entityId.equals(msg.getEntityId())) {
             if (states.isEmpty()) {
                 msg.getCallback().onSuccess();
@@ -244,7 +244,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
     private void processArgumentValuesUpdate(CalculatedFieldCtx ctx, List<CalculatedFieldId> cfIdList, MultipleTbCallback callback,
                                              Map<String, ArgumentEntry> newArgValues, UUID tbMsgId, TbMsgType tbMsgType) throws CalculatedFieldException {
         if (newArgValues.isEmpty()) {
-            log.info("[{}] No new argument values to process for CF.", ctx.getCfId());
+            log.debug("[{}] No new argument values to process for CF.", ctx.getCfId());
             callback.onSuccess(CALLBACKS_PER_CF);
         }
         CalculatedFieldState state = states.get(ctx.getCfId());

application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldManagerMessageProcessor.java

@@ -236,12 +236,12 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
     private void onCfCreated(ComponentLifecycleMsg msg, TbCallback callback) throws CalculatedFieldException {
         var cfId = new CalculatedFieldId(msg.getEntityId().getId());
         if (calculatedFields.containsKey(cfId)) {
-            log.warn("[{}] CF was already initialized [{}]", tenantId, cfId);
+            log.debug("[{}] CF was already initialized [{}]", tenantId, cfId);
             callback.onSuccess();
         } else {
             var cf = cfDaoService.findById(msg.getTenantId(), cfId);
             if (cf == null) {
-                log.warn("[{}] Failed to lookup CF by id [{}]", tenantId, cfId);
+                log.debug("[{}] Failed to lookup CF by id [{}]", tenantId, cfId);
                 callback.onSuccess();
             } else {
                 var cfCtx = new CalculatedFieldCtx(cf, systemContext.getTbelInvokeService(), systemContext.getApiLimitService());
@@ -268,7 +268,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         } else {
             var newCf = cfDaoService.findById(msg.getTenantId(), cfId);
             if (newCf == null) {
-                log.warn("[{}] Failed to lookup CF by id [{}]", tenantId, cfId);
+                log.debug("[{}] Failed to lookup CF by id [{}]", tenantId, cfId);
                 callback.onSuccess();
             } else {
                 var newCfCtx = new CalculatedFieldCtx(newCf, systemContext.getTbelInvokeService(), systemContext.getApiLimitService());
@@ -313,7 +313,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         var cfId = new CalculatedFieldId(msg.getEntityId().getId());
         var cfCtx = calculatedFields.remove(cfId);
         if (cfCtx == null) {
-            log.warn("[{}] CF was already deleted [{}]", tenantId, cfId);
+            log.debug("[{}] CF was already deleted [{}]", tenantId, cfId);
             callback.onSuccess();
         } else {
             entityIdCalculatedFields.get(cfCtx.getEntityId()).remove(cfCtx);
@@ -390,9 +390,11 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                     msg.getCallback().onSuccess();
                 }
             } else {
-                log.debug("Pushing linked telemetry msg to specific actor [{}]", targetEntityId);
-                var newMsg = new EntityCalculatedFieldLinkedTelemetryMsg(tenantId, sourceEntityId, proto.getMsg(), cf, msg.getCallback());
-                getOrCreateActor(targetEntityId).tell(newMsg);
+                if (isMyPartition(targetEntityId, msg.getCallback())) {
+                    log.debug("Pushing linked telemetry msg to specific actor [{}]", targetEntityId);
+                    var newMsg = new EntityCalculatedFieldLinkedTelemetryMsg(tenantId, sourceEntityId, proto.getMsg(), cf, msg.getCallback());
+                    getOrCreateActor(targetEntityId).tell(newMsg);
+                }
             }
         }
     }

application/src/main/java/org/thingsboard/server/controller/ControllerConstants.java

@@ -189,6 +189,29 @@ public class ControllerConstants {
     protected static final String EVENT_DEBUG_RULE_CHAIN_FILTER_OBJ = MARKDOWN_CODE_BLOCK_START + "{\n" +
             "   \"eventType\":\"DEBUG_RULE_CHAIN\",\n" + DEBUG_FILTER_OBJ + MARKDOWN_CODE_BLOCK_END;
 
+    protected static final String EVENT_DEBUG_CALCULATED_FIELD_FILTER_OBJ = MARKDOWN_CODE_BLOCK_START + "{\n" +
+            "   \"eventType\":\"DEBUG_CALCULATED_FIELD\",\n" +
+            "   \"server\":\"ip-172-31-24-152\",\n" +
+            "   \"isError\":\"false\",\n" +
+            "   \"errorStr\":\"Error Message\"\n" +
+            "   \"entityId\":\"cf4b8741-f618-471f-ae08-d881ca7f9fe9\",\n" +
+            "   \"msgId\":\"5cf7d3a0-aee7-40dd-a737-ade05528e7eb\",\n" +
+            "   \"msgType\":\"POST_TELEMETRY_REQUEST\",\n" +
+            "   \"arguments\":\"{\n" +
+            "    \"x\": {\n" +
+            "      \"ts\": 1739432016629,\n" +
+            "      \"value\": 20\n" +
+            "    },\n" +
+            "    \"y\": {\n" +
+            "      \"ts\": 1739429717656,\n" +
+            "      \"value\": 12\n" +
+            "    }\n" +
+            "  }\",\n" +
+            "   \"result\":\"{\n" +
+            "    \"x + y\": 32\n" +
+            "  }\",\n" +
+            "}" + MARKDOWN_CODE_BLOCK_END;
+
     protected static final String IS_BOOTSTRAP_SERVER_PARAM_DESCRIPTION = "A Boolean value representing the Server SecurityInfo for future Bootstrap client mode settings. Values: 'true' for Bootstrap Server; 'false' for Lwm2m Server. ";
 
     protected static final String DEVICE_WITH_DEVICE_CREDENTIALS_ACCESS_TOKEN_PARAM_DESCRIPTION =

application/src/main/java/org/thingsboard/server/controller/EventController.java

@@ -47,6 +47,7 @@ import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_TYPE;
 import static org.thingsboard.server.controller.ControllerConstants.ENTITY_TYPE_PARAM_DESCRIPTION;
+import static org.thingsboard.server.controller.ControllerConstants.EVENT_DEBUG_CALCULATED_FIELD_FILTER_OBJ;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_DEBUG_RULE_CHAIN_FILTER_OBJ;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_DEBUG_RULE_NODE_FILTER_OBJ;
 import static org.thingsboard.server.controller.ControllerConstants.EVENT_END_TIME_DESCRIPTION;
@@ -70,7 +71,7 @@ import static org.thingsboard.server.controller.ControllerConstants.TENANT_ID_PA
 public class EventController extends BaseController {
 
     private static final String EVENT_FILTER_DEFINITION = "# Event Filter Definition" + NEW_LINE +
-            "5 different eventFilter objects could be set for different event types. " +
+            "6 different eventFilter objects could be set for different event types. " +
             "The eventType field is required. Others are optional. If some of them are set, the filtering will be applied according to them. " +
             "See the examples below for all the fields used for each event type filtering. " + NEW_LINE +
             "Note," + NEW_LINE +
@@ -98,6 +99,15 @@ public class EventController extends BaseController {
             " * 'relationType' - string value representing the type of message routing;\n" +
             " * 'entityId' - string value representing the entity id in the event body (originator of the message);\n" +
             " * 'msgType' - string value representing the message type;\n" +
+            " * 'isError' - boolean value to filter the errors." + NEW_LINE +
+            "## Debug Calculated Field Event Filter" + NEW_LINE +
+            EVENT_DEBUG_CALCULATED_FIELD_FILTER_OBJ + NEW_LINE +
+            " * 'entityId' - string value representing the entity id in the event body;\n" +
+            " * 'entityType' - string value representing the entity type;\n" +
+            " * 'msgId' - string value representing the message id in the rule engine;\n" +
+            " * 'msgType' - string value representing the message type;\n" +
+            " * 'arguments' - string value representing the arguments that were used in the calculation performed;\n" +
+            " * 'result' - string value representing the result of a calculation;\n" +
             " * 'isError' - boolean value to filter the errors." + NEW_LINE;
 
     @Autowired

common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java

@@ -37,10 +37,9 @@ public class CalculatedFieldDebugEventFilter extends DebugEventFilter {
             example = "{\"x\":{\"ts\":1739432016629,\"value\":20},\"y\":{\"ts\":1739429717656,\"value\":12}}")
     protected String arguments;
     @Schema(description = "String value representing the result of a calculation",
-            example = "{\"x + y\":54}")
+            example = "{\"x + y\":32}")
     protected String result;
 
-
     @Override
     public EventType getEventType() {
         return EventType.DEBUG_CALCULATED_FIELD;

dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java

@@ -200,6 +200,7 @@ public class JpaBaseEventDao implements EventDao {
                     break;
                 case DEBUG_CALCULATED_FIELD:
                     removeEventsByFilter(tenantId, entityId, (CalculatedFieldDebugEventFilter) eventFilter, startTime, endTime);
+                    break;
                 default:
                     throw new RuntimeException("Not supported event type: " + eventFilter.getEventType());
             }