Merge pull request #24608 from geoand/#23829

Don't record start time when Reactive REST Client returns a Multi
quarkusio · Mar 30, 2022 · 0de2c19 · 0de2c19
2 parents b82d849 + 57cfcd7
commit 0de2c19
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...e/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java b/...e/src/main/java/org/jboss/resteasy/reactive/client/handlers/ClientSendRequestHandler.java
@@ -2,6 +2,7 @@
 
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.handler.codec.http.multipart.InterfaceHttpData;
+import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.stork.Stork;
 import io.smallrye.stork.api.ServiceInstance;
@@ -408,15 +409,15 @@ public Uni<HttpClientRequest> createRequest(RestClientRequestContext state) {
             try {
                 serviceInstance = Stork.getInstance()
                         .getService(serviceName)
-                        .selectInstanceAndRecordStart(true);
+                        .selectInstanceAndRecordStart(shouldMeasureTime(state));
             } catch (Throwable e) {
                 log.error("Error selecting service instance for serviceName: " + serviceName, e);
                 return Uni.createFrom().failure(e);
             }
             requestOptions = serviceInstance.onItem().transform(new Function<>() {
                 @Override
                 public RequestOptions apply(ServiceInstance serviceInstance) {
-                    if (serviceInstance.gatherStatistics()) {
+                    if (serviceInstance.gatherStatistics() && shouldMeasureTime(state)) {
                         state.setCallStatsCollector(serviceInstance);
                     }
                     return new RequestOptions()
@@ -457,6 +458,10 @@ public Uni<? extends HttpClientRequest> apply(RequestOptions options) {
                 });
     }
 
+    private boolean shouldMeasureTime(RestClientRequestContext state) {
+        return !Multi.class.equals(state.getResponseType().getRawType());
+    }
+
     private int getPort(boolean isHttps, int specifiedPort) {
         return specifiedPort != -1 ? specifiedPort : defaultPort(isHttps);
     }