From ab854a662452c1b3636a25d1c554dffc609427e4 Mon Sep 17 00:00:00 2001 From: Konstantinos Spyrou Date: Tue, 4 Apr 2023 18:43:48 +0300 Subject: [PATCH] changed application type and replaced counters with gauges --- .../manager/controllers/PrometheusController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java index 28102ea..b644641 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PrometheusController.java @@ -23,8 +23,8 @@ import java.io.File; @RestController -@RequestMapping("/actuator/prometheus") -public class PrometheusController { // TODO: remove this with migration to Spring Boot 2 +@RequestMapping(value = "/actuator/prometheus", produces = "application/openmetrics-text; version=1.0.0; charset=utf-8") +public class PrometheusController { private static final Logger logger = LoggerFactory.getLogger(PrometheusController.class); private final PiWikService piWikService; @@ -36,12 +36,12 @@ public class PrometheusController { // TODO: remove this with migration to Sprin this.repositoryService = repositoryService; } - @RequestMapping(method = RequestMethod.GET, path = "", produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(method = RequestMethod.GET) public String getPiwikMetrics() { PrometheusMeterRegistry registry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT); - registry.counter("provide_repositories_registered").increment(repositoryService.getTotalRegisteredRepositories()); - registry.counter("provide_usagecounts_repositories_registered").increment(piWikService.getTotal()); - registry.counter("provide_usagecounts_repositories_validated").increment(piWikService.getValidated(true)); + registry.gauge("provide_repositories_registered", repositoryService.getTotalRegisteredRepositories()); + registry.gauge("provide_usagecounts_repositories_registered", piWikService.getTotal()); + registry.gauge("provide_usagecounts_repositories_validated", piWikService.getValidated(true)); return registry.scrape(TextFormat.CONTENT_TYPE_OPENMETRICS_100); }