From d0b7cea328e7ecf6e4bcbaf5dd1e328b82d08ebd Mon Sep 17 00:00:00 2001 From: ipatini Date: Fri, 24 May 2024 08:45:04 +0300 Subject: [PATCH] Improved PrometheusCollector2 collector Change-Id: I1e4cb6d19073dd4628da23a55abbf4eb0bdf8286 --- .../collector/prometheus/PrometheusCollector2.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nebulous/ems-core/baguette-client/src/main/java/gr/iccs/imu/ems/baguette/client/collector/prometheus/PrometheusCollector2.java b/nebulous/ems-core/baguette-client/src/main/java/gr/iccs/imu/ems/baguette/client/collector/prometheus/PrometheusCollector2.java index 1a7aa0c..3eb0c1d 100644 --- a/nebulous/ems-core/baguette-client/src/main/java/gr/iccs/imu/ems/baguette/client/collector/prometheus/PrometheusCollector2.java +++ b/nebulous/ems-core/baguette-client/src/main/java/gr/iccs/imu/ems/baguette/client/collector/prometheus/PrometheusCollector2.java @@ -38,6 +38,11 @@ import java.util.concurrent.ScheduledFuture; @Slf4j @Component public class PrometheusCollector2 extends AbstractEndpointCollector implements Collector { + public final static String DEFAULT_PROMETHEUS_PORT = "9090"; + public final static String DEFAULT_DELAY = "0"; + public final static String DEFAULT_INTERVAL = "60"; + public final static String DEFAULT_INTERVAL_UNIT = "SECONDS"; + private final PrometheusCollectorProperties properties; private List> configurations = List.of(); private final List> scrapingTasks = new LinkedList<>(); @@ -181,7 +186,7 @@ public class PrometheusCollector2 extends AbstractEndpointCollector impl private String getUrlPattern(Map config) { if (config.get("configuration") instanceof Map configMap) { - int port = Integer.parseInt( configMap.getOrDefault("port", "0").toString() ); + int port = Integer.parseInt( configMap.getOrDefault("port", DEFAULT_PROMETHEUS_PORT).toString() ); String endpoint = configMap.getOrDefault("endpoint", "/").toString(); return "http://%s:"+port+endpoint; } @@ -190,7 +195,7 @@ public class PrometheusCollector2 extends AbstractEndpointCollector impl private Duration getDelay(Map config) { if (config.get("configuration") instanceof Map configMap) { - long delay = Long.parseLong(configMap.getOrDefault("delay", "0").toString()); + long delay = Long.parseLong(configMap.getOrDefault("delay", DEFAULT_DELAY).toString()); if (delay>=0) return Duration.ofSeconds(delay); } @@ -199,8 +204,8 @@ public class PrometheusCollector2 extends AbstractEndpointCollector impl private Duration getInterval(Map config) { if (config.get("interval") instanceof Map intervalMap) { - long period = Long.parseLong(intervalMap.getOrDefault("period", "60").toString()); - ChronoUnit unit = ChronoUnit.valueOf(intervalMap.getOrDefault("unit", "SECONDS").toString().toUpperCase()); + long period = Long.parseLong(intervalMap.getOrDefault("period", DEFAULT_INTERVAL).toString()); + ChronoUnit unit = ChronoUnit.valueOf(intervalMap.getOrDefault("unit", DEFAULT_INTERVAL_UNIT).toString().toUpperCase()); if (period>0) return Duration.of(period, unit); }