diff --git a/bff/opentelemetry-javaagent.jar b/bff/opentelemetry-javaagent.jar index 210804b..ec7a4c8 100644 Binary files a/bff/opentelemetry-javaagent.jar and b/bff/opentelemetry-javaagent.jar differ diff --git a/bff/pom.xml b/bff/pom.xml index 7303115..d5ac45a 100644 --- a/bff/pom.xml +++ b/bff/pom.xml @@ -18,7 +18,7 @@ UTF-8 - 24 + 25 2.8.6 diff --git a/bff/src/main/java/se/su/dsv/studentportalen/bff/TestController.java b/bff/src/main/java/se/su/dsv/studentportalen/bff/TestController.java index ac8e1c4..950a214 100644 --- a/bff/src/main/java/se/su/dsv/studentportalen/bff/TestController.java +++ b/bff/src/main/java/se/su/dsv/studentportalen/bff/TestController.java @@ -28,7 +28,7 @@ public class TestController { @RequestMapping public String helloWorld() throws InterruptedException, ExecutionException { // Pick the scope based on the desired behaviour - try (var scope = new StructuredTaskScope.ShutdownOnFailure()) { + try (var scope = StructuredTaskScope.open()) { Subtask nameTask = scope.fork(() -> { String name = restClient.get() .uri("/test/name") @@ -58,9 +58,6 @@ public class TestController { // Wait for all tasks to complete (either success or failure) scope.join(); - // Error if any task failed (or check each individual subtask for partial responses) - scope.throwIfFailed(); - return "Hello, I am %s and my email is %s. My Daisy profile is: %s".formatted( nameTask.get(), emailTask.get(), diff --git a/branch-bff.Dockerfile b/branch-bff.Dockerfile index 4be8b54..11697e9 100644 --- a/branch-bff.Dockerfile +++ b/branch-bff.Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:24 AS build +FROM eclipse-temurin:25 AS build WORKDIR /build @@ -17,7 +17,7 @@ RUN ./mvnw package \ --fail-fast \ -DskipTests -FROM eclipse-temurin:24 AS runtime +FROM eclipse-temurin:25 AS runtime WORKDIR /bff