diff --git a/Dockerfile b/Dockerfile index b6f44cfdcca84c296430ea51d85aad099883cb87..a5d090948579c4ea2632193c153ef49bf6840da0 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.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 e64f8eab6ca3d3051c0863ce3632ce220208a743..e972f25d0d6c6b3fadad362aaf52eeaa6ef8884d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.etsi.osl org.etsi.osl.main - 2025Q2 + 2025Q4 ../org.etsi.osl.main 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 985aec7c301c977be6603cf8fc997c4dd6f46948..ac04b88578169559547db05b92a1320a8b81932b 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");