From a1676c1ac62aa9c89519d37eae9df9ac128c2c8b Mon Sep 17 00:00:00 2001 From: trantzas Date: Mon, 18 Aug 2025 17:53:11 +0000 Subject: [PATCH 1/3] Preparing the develop branch for 2025Q4 Release Cycle --- Dockerfile | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b6f44cf..1662c52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ -COPY target/org.etsi.osl.metrico-1.0.0-exec.jar /opt/openslice/lib/ -CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.metrico-1.0.0-exec.jar"] +COPY target/org.etsi.osl.metrico-1.0.1-SNAPSHOT-exec.jar /opt/openslice/lib/ +CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.metrico-1.0.1-SNAPSHOT-exec.jar"] diff --git a/pom.xml b/pom.xml index e64f8ea..afb6cf3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.etsi.osl org.etsi.osl.main - 2025Q2 + 2025Q4-SNAPSHOT ../org.etsi.osl.main -- GitLab From 4a13f9b213feabd19f41f35b670b6f4aba08ca5e Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Fri, 5 Dec 2025 17:09:11 +0200 Subject: [PATCH 2/3] fix for #15 --- .../metrico/prometheus/PrometheusQueries.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/etsi/osl/metrico/prometheus/PrometheusQueries.java b/src/main/java/org/etsi/osl/metrico/prometheus/PrometheusQueries.java index 985aec7..ac04b88 100644 --- a/src/main/java/org/etsi/osl/metrico/prometheus/PrometheusQueries.java +++ b/src/main/java/org/etsi/osl/metrico/prometheus/PrometheusQueries.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.util.UriComponentsBuilder; import reactor.core.publisher.Mono; - +import java.net.URI; import java.time.Duration; import java.time.OffsetDateTime; import java.util.concurrent.TimeUnit; @@ -37,25 +37,31 @@ public class PrometheusQueries { public String sendQueryToPrometheus(String prometheusUrl, String query, MeasurementCollectionJob mcj, Job job) { UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(prometheusUrl).path("/api/v1/query").query(query); + String url = builder.toUriString(); + URI uri = builder.build().toUri(); + logger.atInfo().log("Sent query at prometheus with URL: " + prometheusUrl + " with query: " + query); - logger.atInfo().log("Sent query builder.toUriString(): " + builder.toUriString()); + logger.atInfo().log("Sent query builder.toUriString(): " + url); + logger.atInfo().log("Sent query builder.build().toUri(): " + uri.toString() ); WebClient webclient = WebClient.create(); String response; if (webclient != null) { try { - String url = builder.toUriString(); - response = webclient.get().uri(url) + + response = webclient.get().uri( uri ) //.header("Authorization", "Basic " + encodedClientData) //.attributes( ServletOAuth2AuthorizedClientExchangeFilterFunction.clientRegistrationId("authOpensliceProvider")) - .retrieve().onStatus(HttpStatusCode::is4xxClientError, r -> { - logger.error("4xx eror"); - return Mono.error(new RuntimeException("4xx")); - }).onStatus(HttpStatusCode::is5xxServerError, r -> { - logger.error("5xx eror"); - return Mono.error(new RuntimeException("5xx")); - }).bodyToMono(new ParameterizedTypeReference() { + .retrieve() +// .onStatus(HttpStatusCode::is4xxClientError, r -> { +// logger.error("4xx eror"); +// return Mono.error(new RuntimeException("4xx")); +// }).onStatus(HttpStatusCode::is5xxServerError, r -> { +// logger.error("5xx eror"); +// return Mono.error(new RuntimeException("5xx")); +// }) + .bodyToMono(new ParameterizedTypeReference() { }).block(); logger.atDebug().log("Received " + response); String[] promResponse = response.split("\n"); -- GitLab From 2030611b99e8761e9882adf51c476b3c5171a3b6 Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Sat, 24 Jan 2026 21:36:45 +0000 Subject: [PATCH 3/3] Preparation for Release 2025Q4 --- Dockerfile | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1662c52..a5d0909 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ -COPY target/org.etsi.osl.metrico-1.0.1-SNAPSHOT-exec.jar /opt/openslice/lib/ -CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.metrico-1.0.1-SNAPSHOT-exec.jar"] +COPY target/org.etsi.osl.metrico-1.1.0-exec.jar /opt/openslice/lib/ +CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.metrico-1.1.0-exec.jar"] diff --git a/pom.xml b/pom.xml index afb6cf3..e972f25 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.etsi.osl org.etsi.osl.main - 2025Q4-SNAPSHOT + 2025Q4 ../org.etsi.osl.main -- GitLab