From 70906101683eddb1afa178cbde0c17c543b657a9 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Thu, 10 Apr 2025 14:54:42 +0300 Subject: [PATCH] Fix EDQS stats collector names --- .../stats/HousekeeperStatsService.java | 2 +- .../edqs/stats/DefaultEdqsStatsService.java | 15 +++++++-------- .../server/common/stats/DefaultStatsFactory.java | 12 ++++++------ .../server/common/stats/StatsFactory.java | 6 +++--- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java b/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java index 5da5fa2be0..5946b84d09 100644 --- a/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java +++ b/application/src/main/java/org/thingsboard/server/service/housekeeper/stats/HousekeeperStatsService.java @@ -106,7 +106,7 @@ public class HousekeeperStatsService { this.failedProcessingCounter = register("failedProcessing", statsFactory); this.reprocessedCounter = register("reprocessed", statsFactory); this.failedReprocessingCounter = register("failedReprocessing", statsFactory); - this.processingTimer = statsFactory.createTimer(StatsType.HOUSEKEEPER, "processingTime", "taskType", taskType.name()); + this.processingTimer = statsFactory.createStatsTimer(StatsType.HOUSEKEEPER.getName(), "processingTime", "taskType", taskType.name()); } private StatsCounter register(String statsName, StatsFactory statsFactory) { diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/stats/DefaultEdqsStatsService.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/stats/DefaultEdqsStatsService.java index 46fb153771..4853920c44 100644 --- a/common/edqs/src/main/java/org/thingsboard/server/edqs/stats/DefaultEdqsStatsService.java +++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/stats/DefaultEdqsStatsService.java @@ -31,7 +31,6 @@ import org.thingsboard.server.common.stats.EdqsStatsService; import org.thingsboard.server.common.stats.StatsCounter; import org.thingsboard.server.common.stats.StatsFactory; import org.thingsboard.server.common.stats.StatsTimer; -import org.thingsboard.server.common.stats.StatsType; import org.thingsboard.server.edqs.repo.DefaultEdqsRepository; import java.util.Map; @@ -58,9 +57,9 @@ public class DefaultEdqsStatsService implements EdqsStatsService { @PostConstruct private void init() { - statsFactory.createGauge(StatsType.EDQS, "stringPoolSize", TbStringPool.getPool(), Map::size); - statsFactory.createGauge(StatsType.EDQS, "bytePoolSize", TbBytePool.getPool(), Map::size); - statsFactory.createGauge(StatsType.EDQS, "tenantReposSize", DefaultEdqsRepository.getRepos(), Map::size); + statsFactory.createGauge("edqsGauges", "stringPoolSize", TbStringPool.getPool(), Map::size); + statsFactory.createGauge("edqsGauges", "bytePoolSize", TbBytePool.getPool(), Map::size); + statsFactory.createGauge("edqsGauges", "tenantReposSize", DefaultEdqsRepository.getRepos(), Map::size); } @Override @@ -118,20 +117,20 @@ public class DefaultEdqsStatsService implements EdqsStatsService { } private StatsTimer getTimer(String name) { - return timers.computeIfAbsent(name, __ -> statsFactory.createTimer(StatsType.EDQS, name)); + return timers.computeIfAbsent(name, __ -> statsFactory.createStatsTimer("edqsTimers", name)); } private StatsCounter getCounter(String name) { - return counters.computeIfAbsent(name, __ -> statsFactory.createStatsCounter(StatsType.EDQS.getName(), name)); + return counters.computeIfAbsent(name, __ -> statsFactory.createStatsCounter("edqsCounters", name)); } private AtomicInteger getGauge(String name) { - return gauges.computeIfAbsent(name, __ -> statsFactory.createGauge(StatsType.EDQS, name, new AtomicInteger())); + return gauges.computeIfAbsent(name, __ -> statsFactory.createGauge("edqsGauges", name, new AtomicInteger())); } private AtomicInteger getObjectGauge(ObjectType objectType) { return objectCounters.computeIfAbsent(objectType, type -> - statsFactory.createGauge(StatsType.EDQS, "objectsCount", new AtomicInteger(), "objectType", type.name())); + statsFactory.createGauge("edqsGauges", "objectsCount", new AtomicInteger(), "objectType", type.name())); } } diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java index 15c155ecfd..4d858be4bb 100644 --- a/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java +++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/DefaultStatsFactory.java @@ -88,13 +88,13 @@ public class DefaultStatsFactory implements StatsFactory { } @Override - public T createGauge(StatsType statsType, String name, T number, String... tags) { - return createGauge(statsType.getName(), number, getTags(name, tags)); + public T createGauge(String type, String name, T number, String... tags) { + return createGauge(type, number, getTags(name, tags)); } @Override - public void createGauge(StatsType statsType, String name, S stateObject, ToDoubleFunction numberProvider, String... tags) { - meterRegistry.gauge(statsType.getName(), Tags.of(getTags(name, tags)), stateObject, numberProvider); + public void createGauge(String type, String name, S stateObject, ToDoubleFunction numberProvider, String... tags) { + meterRegistry.gauge(type, Tags.of(getTags(name, tags)), stateObject, numberProvider); } @Override @@ -117,8 +117,8 @@ public class DefaultStatsFactory implements StatsFactory { } @Override - public StatsTimer createTimer(StatsType type, String name, String... tags) { - return new StatsTimer(name, Timer.builder(type.getName()) + public StatsTimer createStatsTimer(String type, String name, String... tags) { + return new StatsTimer(name, Timer.builder(type) .tags(getTags(name, tags)) .register(meterRegistry)); } diff --git a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java index e438af3ad7..291b95e25a 100644 --- a/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java +++ b/common/stats/src/main/java/org/thingsboard/server/common/stats/StatsFactory.java @@ -27,14 +27,14 @@ public interface StatsFactory { T createGauge(String key, T number, String... tags); - T createGauge(StatsType statsType, String name, T number, String... tags); + T createGauge(String type, String name, T number, String... tags); - void createGauge(StatsType statsType, String name, S stateObject, ToDoubleFunction numberProvider, String... tags); + void createGauge(String type, String name, S stateObject, ToDoubleFunction numberProvider, String... tags); MessagesStats createMessagesStats(String key); Timer createTimer(String key, String... tags); - StatsTimer createTimer(StatsType type, String name, String... tags); + StatsTimer createStatsTimer(String type, String name, String... tags); }