Commit cafaaf03 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2025Q4_RC' into 'main' 

Creating 2025Q4 Release

See merge request !16
parents 42e5e9b7 2030611b

Dockerfile

+2 −2
Original line number Diff line number Diff line 
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"]

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>org.etsi.osl</groupId>

		<artifactId>org.etsi.osl.main</artifactId>

		<version>2025Q2</version>

		<version>2025Q4</version>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>

src/main/java/org/etsi/osl/metrico/prometheus/PrometheusQueries.java

+17 −11
Original line number Diff line number Diff line
@@ -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<String>() {

                        .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<String>() {

                        }).block();

                logger.atDebug().log("Received " + response);

                String[] promResponse = response.split("\n");