Separate latest and ts history deletion tasks for each key

application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperReprocessingService.java

@@ -18,7 +18,6 @@ package org.thingsboard.server.service.housekeeper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
@@ -49,7 +48,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 @TbCoreComponent
 @Service
 @Slf4j
-@ConditionalOnProperty(name = "queue.core.housekeeper.enabled", havingValue = "true", matchIfMissing = true)
 public class HousekeeperReprocessingService {
 
     private final HousekeeperService housekeeperService;

application/src/main/java/org/thingsboard/server/service/housekeeper/HousekeeperService.java

@@ -17,7 +17,6 @@ package org.thingsboard.server.service.housekeeper;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.common.util.JacksonUtil;
@@ -51,7 +50,6 @@ import java.util.stream.Collectors;
 @TbCoreComponent
 @Service
 @Slf4j
-@ConditionalOnProperty(name = "queue.core.housekeeper.enabled", havingValue = "true", matchIfMissing = true)
 public class HousekeeperService {
 
     private final Map<HousekeeperTaskType, HousekeeperTaskProcessor<?>> taskProcessors;

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsDeletionTaskProcessor.java

@@ -26,7 +26,7 @@ import org.thingsboard.server.dao.alarm.AlarmService;
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class AlarmsDeletionTaskProcessor implements HousekeeperTaskProcessor<HousekeeperTask> {
+public class AlarmsDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
 
     private final AlarmService alarmService;
 

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AlarmsUnassignTaskProcessor.java

@@ -29,7 +29,7 @@ import java.util.List;
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class AlarmsUnassignTaskProcessor implements HousekeeperTaskProcessor<AlarmsUnassignHousekeeperTask> {
+public class AlarmsUnassignTaskProcessor extends HousekeeperTaskProcessor<AlarmsUnassignHousekeeperTask> {
 
     private final TbAlarmService alarmService;
 

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/AttributesDeletionTaskProcessor.java

@@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class AttributesDeletionTaskProcessor implements HousekeeperTaskProcessor<HousekeeperTask> {
+public class AttributesDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
 
     private final AttributesService attributesService;
 

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EntitiesDeletionTaskProcessor.java

@@ -24,7 +24,7 @@ import org.thingsboard.server.dao.entity.EntityServiceRegistry;
 
 @Component
 @RequiredArgsConstructor
-public class EntitiesDeletionTaskProcessor implements HousekeeperTaskProcessor<EntitiesDeletionHousekeeperTask> {
+public class EntitiesDeletionTaskProcessor extends HousekeeperTaskProcessor<EntitiesDeletionHousekeeperTask> {
 
     private final EntityServiceRegistry entityServiceRegistry;
 

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/EventsDeletionTaskProcessor.java

@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
 
 @Component
 @RequiredArgsConstructor
-public class EventsDeletionTaskProcessor implements HousekeeperTaskProcessor<HousekeeperTask> {
+public class EventsDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
 
     private final EventService eventService;
 

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/HousekeeperTaskProcessor.java

@@ -15,13 +15,18 @@
  */
 package org.thingsboard.server.service.housekeeper.processor;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
 import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.msg.housekeeper.HousekeeperClient;
 
-public interface HousekeeperTaskProcessor<T extends HousekeeperTask> {
+public abstract class HousekeeperTaskProcessor<T extends HousekeeperTask> {
 
-    void process(T task) throws Exception;
+    @Autowired
+    protected HousekeeperClient housekeeperClient;
 
-    HousekeeperTaskType getTaskType();
+    public abstract void process(T task) throws Exception;
+
+    public abstract HousekeeperTaskType getTaskType();
 
 }

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/LatestTsDeletionTaskProcessor.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.LatestTsDeletionHousekeeperTask;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LatestTsDeletionTaskProcessor extends HousekeeperTaskProcessor<LatestTsDeletionHousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(LatestTsDeletionHousekeeperTask task) throws Exception {
+        timeseriesService.removeLatest(task.getTenantId(), task.getEntityId(), List.of(task.getKey())).get();
+        log.debug("[{}][{}][{}] Deleted latest telemetry for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_LATEST_TS;
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TelemetryDeletionTaskProcessor.java

@@ -18,10 +18,12 @@ package org.thingsboard.server.service.housekeeper.processor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.kv.BaseDeleteTsKvQuery;
-import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
 import org.thingsboard.server.common.data.housekeeper.HousekeeperTask;
 import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.LatestTsDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.housekeeper.TsHistoryDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 
 import java.util.List;
@@ -29,18 +31,25 @@ import java.util.List;
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class TelemetryDeletionTaskProcessor implements HousekeeperTaskProcessor<HousekeeperTask> {
+public class TelemetryDeletionTaskProcessor extends HousekeeperTaskProcessor<HousekeeperTask> {
 
     private final TimeseriesService timeseriesService;
 
     @Override
     public void process(HousekeeperTask task) throws Exception {
-        List<String> keys = timeseriesService.findAllKeysByEntityIds(task.getTenantId(), List.of(task.getEntityId()));
+        TenantId tenantId = task.getTenantId();
+        EntityId entityId = task.getEntityId();
+        List<String> keys = timeseriesService.findAllKeysByEntityIds(tenantId, List.of(entityId));
+
         for (String key : keys) {
-            DeleteTsKvQuery deleteQuery = new BaseDeleteTsKvQuery(key, 0, System.currentTimeMillis(), false, true);
-            timeseriesService.remove(task.getTenantId(), task.getEntityId(), List.of(deleteQuery)).get();
+            var latestTsDeletionTask = new LatestTsDeletionHousekeeperTask(tenantId, entityId, key);
+            housekeeperClient.submitTask(latestTsDeletionTask);
+
+            var tsHistoryDeletionTask = new TsHistoryDeletionHousekeeperTask(tenantId, entityId, key);
+            housekeeperClient.submitTask(tsHistoryDeletionTask);
         }
-        log.debug("[{}][{}][{}] Deleted {} telemetry keys", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), keys.size());
+
+        log.trace("[{}][{}][{}] Submitted latest and ts history deletion tasks for {} keys", tenantId, entityId.getEntityType(), entityId, keys.size());
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/housekeeper/processor/TsHistoryDeletionTaskProcessor.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.housekeeper.processor;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.housekeeper.HousekeeperTaskType;
+import org.thingsboard.server.common.data.housekeeper.TsHistoryDeletionHousekeeperTask;
+import org.thingsboard.server.common.data.kv.BaseDeleteTsKvQuery;
+import org.thingsboard.server.common.data.kv.DeleteTsKvQuery;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class TsHistoryDeletionTaskProcessor extends HousekeeperTaskProcessor<TsHistoryDeletionHousekeeperTask> {
+
+    private final TimeseriesService timeseriesService;
+
+    @Override
+    public void process(TsHistoryDeletionHousekeeperTask task) throws Exception {
+        DeleteTsKvQuery deleteQuery = new BaseDeleteTsKvQuery(task.getKey(), 0, System.currentTimeMillis(), false, false);
+        timeseriesService.remove(task.getTenantId(), task.getEntityId(), List.of(deleteQuery)).get();
+        log.debug("[{}][{}][{}] Deleted timeseries history for key '{}'", task.getTenantId(), task.getEntityId().getEntityType(), task.getEntityId(), task.getKey());
+    }
+
+    @Override
+    public HousekeeperTaskType getTaskType() {
+        return HousekeeperTaskType.DELETE_TS_HISTORY;
+    }
+
+}

application/src/main/resources/thingsboard.yml

@@ -1624,8 +1624,6 @@ queue:
       # Statistics printing interval for Core microservices
       print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
     housekeeper:
-      # Enabled/disable Housekeeping service, which does cleanup of telemetry, attributes, events, etc.
-      enabled: "${TB_HOUSEKEEPER_ENABLED:true}"
       # Topic name for Housekeeper tasks
       topic: "${TB_HOUSEKEEPER_TOPIC:tb_housekeeper}"
       # Topic name for Housekeeper tasks to be reprocessed

application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java

@@ -29,6 +29,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
 import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EventInfo;
@@ -78,6 +79,7 @@ import org.thingsboard.server.dao.usagerecord.ApiUsageStateDao;
 import org.thingsboard.server.gen.transport.TransportProtos.HousekeeperTaskProto;
 import org.thingsboard.server.gen.transport.TransportProtos.ToHousekeeperServiceMsg;
 import org.thingsboard.server.service.housekeeper.processor.TelemetryDeletionTaskProcessor;
+import org.thingsboard.server.service.housekeeper.processor.TsHistoryDeletionTaskProcessor;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -134,7 +136,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
     @Autowired
     private EntityServiceRegistry entityServiceRegistry;
     @SpyBean
-    private TelemetryDeletionTaskProcessor telemetryDeletionTaskProcessor;
+    private TsHistoryDeletionTaskProcessor tsHistoryDeletionTaskProcessor;
 
     private TenantId tenantId;
 
@@ -258,7 +260,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
     @Test
     public void whenTaskProcessingFails_thenReprocessUntilSuccessful() throws Exception {
         TimeoutException error = new TimeoutException("Test timeout");
-        doThrow(error).when(telemetryDeletionTaskProcessor).process(any());
+        doThrow(error).when(tsHistoryDeletionTaskProcessor).process(any());
 
         Device device = createDevice("vep9ruv32", "vep9ruv32");
         createRelatedData(device.getId());
@@ -267,17 +269,17 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
 
         int attempts = 3;
         await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
-            verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TELEMETRY, 0);
+            verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, 0);
             for (int i = 1; i <= attempts; i++) {
                 int attempt = i;
-                verify(housekeeperReprocessingService).submitForReprocessing(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TELEMETRY,
+                verify(housekeeperReprocessingService).submitForReprocessing(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY,
                         task -> task.getErrorsCount() > 0 && task.getAttempt() == attempt)), argThat(e -> e.getMessage().equals(error.getMessage())));
-                verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TELEMETRY, attempt);
+                verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, attempt);
             }
         });
 
         assertThat(getTimeseriesHistory(device.getId())).isNotEmpty();
-        doCallRealMethod().when(telemetryDeletionTaskProcessor).process(any()); // fixing the code
+        doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any()); // fixing the code
         await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             assertThat(getTimeseriesHistory(device.getId())).isEmpty();
         });
@@ -286,7 +288,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
     @Test
     public void whenReprocessingAttemptsExceeded_thenReprocessOnNextStartUp() throws Exception {
         TimeoutException error = new TimeoutException("Test timeout");
-        doThrow(error).when(telemetryDeletionTaskProcessor).process(any());
+        doThrow(error).when(tsHistoryDeletionTaskProcessor).process(any());
 
         Device device = createDevice("woeifjiowejf", "woeifjiowejf");
         createRelatedData(device.getId());
@@ -296,18 +298,18 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         int maxAttempts = 5;
         await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
             for (int i = 1; i <= maxAttempts; i++) {
-                verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TELEMETRY, i);
+                verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, i);
             }
         });
 
         Mockito.clearInvocations(housekeeperService);
-        doCallRealMethod().when(telemetryDeletionTaskProcessor).process(any());
+        doCallRealMethod().when(tsHistoryDeletionTaskProcessor).process(any());
         TimeUnit.SECONDS.sleep(2);
-        verify(housekeeperService, never()).processTask(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TELEMETRY, null)));
+        verify(housekeeperService, never()).processTask(argThat(getTaskMatcher(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, null)));
 
         housekeeperReprocessingService.cycle.set(0); // imitating start-up
         await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
-            verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TELEMETRY, 6);
+            verifyTaskProcessing(device.getId(), HousekeeperTaskType.DELETE_TS_HISTORY, 6);
         });
     }
 
@@ -325,7 +327,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
 
     private void createRelatedData(EntityId entityId) throws Exception {
         createTelemetry(entityId);
-        for (String scope : List.of(DataConstants.SERVER_SCOPE, DataConstants.SHARED_SCOPE, DataConstants.CLIENT_SCOPE)) {
+        for (AttributeScope scope : List.of(AttributeScope.SERVER_SCOPE, AttributeScope.SHARED_SCOPE, AttributeScope.CLIENT_SCOPE)) {
             createAttribute(entityId, scope, scope + ATTRIBUTE_KEY);
         }
         createEvent(entityId);
@@ -351,7 +353,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
         assertThat(relationService.findByFrom(tenantId, entityId, RelationTypeGroup.COMMON)).isEmpty();
     }
 
-    private void createAttribute(EntityId entityId, String scope, String key) throws Exception {
+    private void createAttribute(EntityId entityId, AttributeScope scope, String key) throws Exception {
         attributesService.save(tenantId, entityId, scope, new BaseAttributeKvEntry(System.currentTimeMillis(), new StringDataEntry(key, KV_VALUE))).get();
     }
 

common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java

@@ -34,6 +34,8 @@ import java.io.Serializable;
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "taskType", visible = true, include = JsonTypeInfo.As.EXISTING_PROPERTY, defaultImpl = HousekeeperTask.class)
 @JsonSubTypes({
+        @Type(name = "DELETE_TS_HISTORY", value = TsHistoryDeletionHousekeeperTask.class),
+        @Type(name = "DELETE_LATEST_TS", value = LatestTsDeletionHousekeeperTask.class),
         @Type(name = "DELETE_ENTITIES", value = EntitiesDeletionHousekeeperTask.class),
         @Type(name = "UNASSIGN_ALARMS", value = AlarmsUnassignHousekeeperTask.class)
 })
@@ -57,10 +59,19 @@ public class HousekeeperTask implements Serializable {
         return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_ATTRIBUTES);
     }
 
+    /**
+     * Task for telemetry deletion, processed by TelemetryDeletionTaskProcessor.
+     * The processor will submit separate tasks for each key for latest and ts history deletion,
+     * processed by LatestTsDeletionTaskProcessor and TsHistoryDeletionTaskProcessor accordingly.
+     * */
     public static HousekeeperTask deleteTelemetry(TenantId tenantId, EntityId entityId) {
         return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_TELEMETRY);
     }
 
+    /**
+     * Task for events deletion, processed by EventsDeletionTaskProcessor.
+     * All types of events will be dropped for this entity.
+     * */
     public static HousekeeperTask deleteEvents(TenantId tenantId, EntityId entityId) {
         return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_EVENTS);
     }

common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java

@@ -25,6 +25,8 @@ public enum HousekeeperTaskType {
     DELETE_ENTITIES("entities deletion"),
     DELETE_ATTRIBUTES("attributes deletion"),
     DELETE_TELEMETRY("telemetry deletion"),
+    DELETE_LATEST_TS("latest telemetry deletion"),
+    DELETE_TS_HISTORY("timeseries history deletion"),
     DELETE_EVENTS("events deletion"),
     DELETE_ALARMS("alarms deletion"),
     UNASSIGN_ALARMS("alarms unassigning");

common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/LatestTsDeletionHousekeeperTask.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class LatestTsDeletionHousekeeperTask extends HousekeeperTask {
+
+    private String key;
+
+    public LatestTsDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, String key) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_LATEST_TS);
+        this.key = key;
+    }
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/TsHistoryDeletionHousekeeperTask.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016-2024 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.housekeeper;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class TsHistoryDeletionHousekeeperTask extends HousekeeperTask {
+
+    private String key;
+
+    public TsHistoryDeletionHousekeeperTask(TenantId tenantId, EntityId entityId, String key) {
+        super(tenantId, entityId, HousekeeperTaskType.DELETE_TS_HISTORY);
+        this.key = key;
+    }
+
+}