OK-611 Refaktoroitu lisää virheenkäsittelyä

Author: jkorri

src/main/java/fi/vm/sade/valinta/kooste/external/resource/HttpClients.java

@@ -274,6 +274,7 @@ public RestCasClient getSuoritusrekisteriCasClient(
     return new RestCasClient(
         new CasConfig.CasConfigBuilder(
                 username, password, ticketsUrl, service, CSRF_VALUE, CALLER_ID, "")
+            .setNumberOfRetries(0)
             .setJsessionName("JSESSIONID")
             .build());
   }

src/main/java/fi/vm/sade/valinta/kooste/valintalaskenta/actor/ConcurrencyLimiter.java

@@ -20,8 +20,9 @@ public class ConcurrencyLimiter {
 
   private static final Logger LOG = LoggerFactory.getLogger(ConcurrencyLimiter.class);
 
-  public static final Duration TIMEOUT = Duration.ofMillis(Long.MIN_VALUE + 1);
-  public static final Duration ERROR = Duration.ofMillis(Long.MIN_VALUE + 2);
+  public static final Duration ONGOING = Duration.ofMillis(Long.MIN_VALUE + 1);
+  public static final Duration TIMEOUT = Duration.ofMillis(Long.MIN_VALUE + 2);
+  public static final Duration ERROR = Duration.ofMillis(Long.MIN_VALUE + 3);
 
   private int maxPermits;
   private final String nimi;
@@ -95,7 +96,9 @@ public String getNimi() {
   }
 
   public static String asDurationString(Duration duration) {
-    if (duration == TIMEOUT) {
+    if (duration == ONGOING) {
+      return "ongoing";
+    } else if (duration == TIMEOUT) {
       return "timeout";
     } else if (duration == ERROR) {
       return "error";
@@ -136,16 +139,19 @@ public <T> CompletableFuture<T> withConcurrencyLimit(
           // suoritetaan pyyntö
           this.active.incrementAndGet();
           try {
+            invokeDurations.put(this.nimi, ONGOING);
             T result = supplier.get().get();
             invokeDurations.put(this.nimi, Duration.between(invokeStart, Instant.now()));
             future.complete(result);
           } catch (ExecutionException e) {
-            if (e.getCause() instanceof TimeoutException) {
+            Throwable underlyingCause = getUnderlyingCause(e);
+            if (underlyingCause instanceof TimeoutException) {
               invokeDurations.put(this.nimi, TIMEOUT);
+              future.completeExceptionally(underlyingCause);
             } else {
               invokeDurations.put(this.nimi, ERROR);
+              future.completeExceptionally(e);
             }
-            future.completeExceptionally(e.getCause());
           } catch (Exception e) {
             invokeDurations.put(this.nimi, ERROR);
             future.completeExceptionally(e);
@@ -157,4 +163,11 @@ public <T> CompletableFuture<T> withConcurrencyLimit(
 
     return future;
   }
+
+  private static Throwable getUnderlyingCause(Throwable t) {
+    if (t.getCause() != null) {
+      return getUnderlyingCause(t.getCause());
+    }
+    return t;
+  }
 }

src/main/java/fi/vm/sade/valinta/kooste/valintalaskenta/actor/LaskentaResurssiProvider.java

@@ -641,17 +641,25 @@ public CompletableFuture<LaskeDTO> fetchResourcesForOneLaskenta(
         .orTimeout(9 * 60 * 1000l, TimeUnit.MILLISECONDS)
         .exceptionallyAsync(
             ex -> {
-              if (ex instanceof TimeoutException) {
-                invokeDurations.put("Total (timeout)", Duration.between(start, Instant.now()));
-                this.tallennaLokitJaMetriikat(hakukohdeOid, waitDurations, invokeDurations);
-              }
-              result.completeExceptionally(ex);
+              Throwable underlyingCause = getUnderlyingCause(ex);
+              invokeDurations.put(
+                  "Total" + (underlyingCause instanceof TimeoutException ? " (timeout)" : ""),
+                  Duration.between(start, Instant.now()));
+              this.tallennaLokitJaMetriikat(hakukohdeOid, waitDurations, invokeDurations);
+              result.completeExceptionally(underlyingCause);
               return null;
             },
             this.executor);
     return result;
   }
 
+  private static Throwable getUnderlyingCause(Throwable t) {
+    if (t.getCause() != null) {
+      return getUnderlyingCause(t.getCause());
+    }
+    return t;
+  }
+
   private <T> CompletableFuture<T> createResurssiFuture(
       LaskentaResurssinhakuWrapper.PyynnonTunniste tunniste,
       String resurssi,