removed cf name from telemetry result

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

@@ -492,7 +492,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
                 stateSizeChecked = true;
                 if (state.isSizeOk()) {
                     if (!calculationResult.isEmpty()) {
-                        cfService.processResult(tenantId, entityId, calculationResult, cfIdList, callback);
+                        cfService.processResult(tenantId, entityId, ctx.getCfName(), calculationResult, cfIdList, callback);
                     } else {
                         callback.onSuccess();
                     }

application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java

@@ -422,13 +422,13 @@ public abstract class AbstractCalculatedFieldProcessingService {
         }
     }
 
-    protected void saveTelemetryResult(TenantId tenantId, EntityId entityId, TelemetryCalculatedFieldResult cfResult, List<CalculatedFieldId> cfIds, TbCallback callback) {
+    protected void saveTelemetryResult(TenantId tenantId, EntityId entityId, String cfName, TelemetryCalculatedFieldResult cfResult, List<CalculatedFieldId> cfIds, TbCallback callback) {
         OutputType type = cfResult.getType();
         JsonElement jsonResult = JsonParser.parseString(Objects.requireNonNull(cfResult.stringValue()));
 
         log.trace("[{}][{}] Saving CF result: {}", tenantId, entityId, jsonResult);
         switch (type) {
-            case ATTRIBUTES -> saveAttributes(tenantId, entityId, jsonResult, cfResult.getOutputStrategy(), cfResult.getScope(), cfResult.getCalculatedFieldName(), cfIds, callback);
+            case ATTRIBUTES -> saveAttributes(tenantId, entityId, jsonResult, cfResult.getOutputStrategy(), cfResult.getScope(), cfName, cfIds, callback);
             case TIME_SERIES -> saveTimeSeries(tenantId, entityId, jsonResult, cfResult.getOutputStrategy(), cfIds, System.currentTimeMillis(), callback);
         }
     }
@@ -477,18 +477,20 @@ public abstract class AbstractCalculatedFieldProcessingService {
                 .entries(entries)
                 .strategy(strategy)
                 .previousCalculatedFieldIds(cfIds)
-                .callback(new FutureCallback<Void>() {
+                .callback(new FutureCallback<>() {
                     @Override
                     public void onSuccess(Void result) {
                         if (sendAttributesUpdatedNotification) {
                             sendAttributesUpdatedMsg(tenantId, entityId, scope, cfName, entries);
                         }
                         callback.onSuccess();
+                        log.debug("[{}][{}] Saved CF result: {}", tenantId, entityId, entries);
                     }
 
                     @Override
                     public void onFailure(Throwable t) {
                         callback.onFailure(t);
+                        log.error("[{}][{}] Failed to save CF result {}", tenantId, entityId, entries, t);
                     }
                 })
                 .build());
@@ -515,15 +517,17 @@ public abstract class AbstractCalculatedFieldProcessingService {
                 .entityId(entityId)
                 .entries(tsEntries)
                 .strategy(strategy)
-                .callback(new FutureCallback<Void>() {
+                .callback(new FutureCallback<>() {
                     @Override
                     public void onSuccess(Void result) {
                         callback.onSuccess();
+                        log.debug("[{}][{}] Saved CF result: {}", tenantId, entityId, tsEntries);
                     }
 
                     @Override
                     public void onFailure(Throwable t) {
                         callback.onFailure(t);
+                        log.error("[{}][{}] Failed to save CF result {}", tenantId, entityId, tsEntries, t);
                     }
                 });
         if (ttl != null) {

application/src/main/java/org/thingsboard/server/service/cf/AlarmCalculatedFieldResult.java

@@ -37,7 +37,7 @@ public class AlarmCalculatedFieldResult implements CalculatedFieldResult {
     private final TbAlarmResult alarmResult;
 
     @Override
-    public TbMsg toTbMsg(EntityId entityId, List<CalculatedFieldId> cfIds) {
+    public TbMsg toTbMsg(EntityId entityId, String cfName, List<CalculatedFieldId> cfIds) {
         TbMsgType msgType;
         TbMsgMetaData metaData = new TbMsgMetaData();
         if (alarmResult.isCreated()) {

application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldProcessingService.java

@@ -41,7 +41,7 @@ public interface CalculatedFieldProcessingService {
 
     Map<String, ArgumentEntry> fetchArgsFromDb(TenantId tenantId, EntityId entityId, Map<String, Argument> arguments);
 
-    void processResult(TenantId tenantId, EntityId entityId, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback);
+    void processResult(TenantId tenantId, EntityId entityId, String cfName, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback);
 
     ArgumentEntry fetchMetricDuringInterval(TenantId tenantId, EntityId entityId, String argKey, AggMetric metric, AggIntervalEntry interval);
 

application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldResult.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 public interface CalculatedFieldResult {
 
-    TbMsg toTbMsg(EntityId entityId, List<CalculatedFieldId> cfIds);
+    TbMsg toTbMsg(EntityId entityId, String cfName, List<CalculatedFieldId> cfIds);
 
     String stringValue();
 

application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java

@@ -133,40 +133,40 @@ public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedF
         return super.fetchMetricDuringInterval(tenantId, entityId, argKey, metric, interval);
     }
 
-    public void processResult(TenantId tenantId, EntityId entityId, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback) {
+    public void processResult(TenantId tenantId, EntityId entityId, String cfName, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback) {
         if (result instanceof AlarmCalculatedFieldResult) {
-            sendMsgToRuleEngine(tenantId, entityId, callback, result.toTbMsg(entityId, cfIds));
+            sendMsgToRuleEngine(tenantId, entityId, callback, result.toTbMsg(entityId, cfName, cfIds));
             return;
         }
         TelemetryCalculatedFieldResult telemetryResult = result instanceof TelemetryCalculatedFieldResult telemetryRes
                 ? telemetryRes : ((PropagationCalculatedFieldResult) result).getResult();
         switch (telemetryResult.getOutputStrategy().getType()) {
-            case IMMEDIATE -> processImmediately(tenantId, entityId, result, cfIds, callback);
+            case IMMEDIATE -> processImmediately(tenantId, entityId, cfName, result, cfIds, callback);
-            case RULE_CHAIN -> pushMsgToRuleEngine(tenantId, entityId, result, cfIds, callback);
+            case RULE_CHAIN -> pushMsgToRuleEngine(tenantId, entityId, cfName, result, cfIds, callback);
         }
     }
 
-    private void processImmediately(TenantId tenantId, EntityId entityId, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback) {
+    private void processImmediately(TenantId tenantId, EntityId entityId, String cfName, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback) {
         if (result instanceof TelemetryCalculatedFieldResult telemetryResult) {
-            saveTelemetryResult(tenantId, entityId, telemetryResult, cfIds, callback);
+            saveTelemetryResult(tenantId, entityId, cfName, telemetryResult, cfIds, callback);
             return;
         }
         if (result instanceof PropagationCalculatedFieldResult propagationResult) {
             handlePropagationResults(propagationResult, callback,
-                    (entity, res, cb) -> saveTelemetryResult(tenantId, entity, res, cfIds, cb));
+                    (entity, res, cb) -> saveTelemetryResult(tenantId, entity, cfName, res, cfIds, cb));
             return;
         }
         callback.onSuccess();
     }
 
-    private void pushMsgToRuleEngine(TenantId tenantId, EntityId entityId, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback) {
+    private void pushMsgToRuleEngine(TenantId tenantId, EntityId entityId, String cfName, CalculatedFieldResult result, List<CalculatedFieldId> cfIds, TbCallback callback) {
         if (result instanceof PropagationCalculatedFieldResult propagationResult) {
             handlePropagationResults(propagationResult, callback,
-                    (entity, res, cb) -> sendMsgToRuleEngine(tenantId, entity, cb, res.toTbMsg(entity, cfIds)));
+                    (entity, res, cb) -> sendMsgToRuleEngine(tenantId, entity, cb, res.toTbMsg(entity, cfName, cfIds)));
             return;
         }
 
-        sendMsgToRuleEngine(tenantId, entityId, callback, result.toTbMsg(entityId, cfIds));
+        sendMsgToRuleEngine(tenantId, entityId, callback, result.toTbMsg(entityId, cfName, cfIds));
     }
 
     private void handlePropagationResults(PropagationCalculatedFieldResult propagationResult, TbCallback callback,

application/src/main/java/org/thingsboard/server/service/cf/PropagationCalculatedFieldResult.java

@@ -32,8 +32,8 @@ public final class PropagationCalculatedFieldResult implements CalculatedFieldRe
     private final TelemetryCalculatedFieldResult result;
 
     @Override
-    public TbMsg toTbMsg(EntityId entityId, List<CalculatedFieldId> cfIds) {
+    public TbMsg toTbMsg(EntityId entityId, String cfName, List<CalculatedFieldId> cfIds) {
-        return result.toTbMsg(entityId, cfIds);
+        return result.toTbMsg(entityId, cfName, cfIds);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/cf/TelemetryCalculatedFieldResult.java

@@ -36,7 +36,6 @@ import static org.thingsboard.server.common.data.DataConstants.SCOPE;
 @Builder
 public final class TelemetryCalculatedFieldResult implements CalculatedFieldResult {
 
-    private final String calculatedFieldName;
     private final OutputType type;
     private final AttributeScope scope;
     private final OutputStrategy outputStrategy;
@@ -45,13 +44,13 @@ public final class TelemetryCalculatedFieldResult implements CalculatedFieldResu
     public static final TelemetryCalculatedFieldResult EMPTY = TelemetryCalculatedFieldResult.builder().result(null).build();
 
     @Override
-    public TbMsg toTbMsg(EntityId entityId, List<CalculatedFieldId> cfIds) {
+    public TbMsg toTbMsg(EntityId entityId, String cfName, List<CalculatedFieldId> cfIds) {
         TbMsgType msgType = switch (type) {
             case ATTRIBUTES -> TbMsgType.POST_ATTRIBUTES_REQUEST;
             case TIME_SERIES -> TbMsgType.POST_TELEMETRY_REQUEST;
         };
         TbMsgMetaData metaData = new TbMsgMetaData();
-        metaData.putValue(CF_NAME_METADATA_KEY, calculatedFieldName);
+        metaData.putValue(CF_NAME_METADATA_KEY, cfName);
         if (OutputType.ATTRIBUTES == type) {
             metaData.putValue(SCOPE, scope.name());
         }

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java

@@ -86,6 +86,7 @@ public class CalculatedFieldCtx implements Closeable {
     private CalculatedField calculatedField;
 
     private CalculatedFieldId cfId;
+    private String cfName;
     private TenantId tenantId;
     private EntityId entityId;
     private CalculatedFieldType cfType;
@@ -130,6 +131,7 @@ public class CalculatedFieldCtx implements Closeable {
         this.calculatedField = calculatedField;
 
         this.cfId = calculatedField.getId();
+        this.cfName = calculatedField.getName();
         this.tenantId = calculatedField.getTenantId();
         this.entityId = calculatedField.getEntityId();
         this.cfType = calculatedField.getType();

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java

@@ -52,7 +52,6 @@ public class ScriptCalculatedFieldState extends BaseCalculatedFieldState {
         Output output = ctx.getOutput();
         return Futures.transform(resultFuture,
                 result -> TelemetryCalculatedFieldResult.builder()
-                        .calculatedFieldName(ctx.getCalculatedField().getName())
                         .outputStrategy(output.getStrategy())
                         .type(output.getType())
                         .scope(output.getScope())

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java

@@ -56,7 +56,6 @@ public class SimpleCalculatedFieldState extends BaseCalculatedFieldState {
         JsonNode outputResult = createResultJson(ctx.isUseLatestTs(), output.getName(), result);
 
         return Futures.immediateFuture(TelemetryCalculatedFieldResult.builder()
-                .calculatedFieldName(ctx.getCalculatedField().getName())
                 .outputStrategy(output.getStrategy())
                 .type(output.getType())
                 .scope(output.getScope())

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/RelatedEntitiesAggregationCalculatedFieldState.java

@@ -182,7 +182,6 @@ public class RelatedEntitiesAggregationCalculatedFieldState extends BaseCalculat
             lastMetricsEvalTs = System.currentTimeMillis();
             scheduleReevaluation();
             return Futures.immediateFuture(TelemetryCalculatedFieldResult.builder()
-                    .calculatedFieldName(ctx.getCalculatedField().getName())
                     .outputStrategy(output.getStrategy())
                     .type(output.getType())
                     .scope(output.getScope())

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/single/EntityAggregationCalculatedFieldState.java

@@ -123,7 +123,6 @@ public class EntityAggregationCalculatedFieldState extends BaseCalculatedFieldSt
             return Futures.immediateFuture(TelemetryCalculatedFieldResult.EMPTY);
         }
         return Futures.immediateFuture(TelemetryCalculatedFieldResult.builder()
-                .calculatedFieldName(ctx.getCalculatedField().getName())
                 .outputStrategy(output.getStrategy())
                 .type(output.getType())
                 .scope(output.getScope())

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingCalculatedFieldState.java

@@ -133,7 +133,6 @@ public class GeofencingCalculatedFieldState extends BaseCalculatedFieldState {
 
         OutputType outputType = ctx.getOutput().getType();
         var result = TelemetryCalculatedFieldResult.builder()
-                .calculatedFieldName(ctx.getCalculatedField().getName())
                 .outputStrategy(ctx.getOutput().getStrategy())
                 .type(outputType)
                 .scope(ctx.getOutput().getScope())

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/propagation/PropagationCalculatedFieldState.java

@@ -85,7 +85,6 @@ public class PropagationCalculatedFieldState extends ScriptCalculatedFieldState
         Output output = ctx.getOutput();
         TelemetryCalculatedFieldResult.TelemetryCalculatedFieldResultBuilder telemetryCfBuilder =
                 TelemetryCalculatedFieldResult.builder()
-                        .calculatedFieldName(ctx.getCalculatedField().getName())
                         .outputStrategy(output.getStrategy())
                         .type(output.getType())
                         .scope(output.getScope());