Bring back 500ms interval for retries and log for waitForSidecar

Signed-off-by: Artur Souza <[email protected]>

Author: artursouza

sdk-tests/src/test/java/io/dapr/it/resiliency/WaitForSidecarIT.java

@@ -13,23 +13,14 @@
 
 package io.dapr.it.resiliency;
 
-import io.dapr.client.DaprClient;
-import io.dapr.client.DaprClientImpl;
-import io.dapr.client.resiliency.ResiliencyOptions;
 import io.dapr.it.BaseIT;
 import io.dapr.it.DaprRun;
 import io.dapr.it.ToxiProxyRun;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import java.util.Base64;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 

sdk/src/main/java/io/dapr/client/DaprClientImpl.java

@@ -81,6 +81,8 @@
 import io.grpc.stub.AbstractStub;
 import io.grpc.stub.StreamObserver;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
@@ -97,7 +99,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -114,6 +115,8 @@
  */
 public class DaprClientImpl extends AbstractDaprClient {
 
+  private final Logger logger;
+
   /**
    * The GRPC managed channel to be used.
    */
@@ -235,6 +238,7 @@ private DaprClientImpl(
     this.httpClient = httpClient;
     this.retryPolicy = retryPolicy;
     this.grpcInterceptors = new DaprClientGrpcInterceptors(daprApiToken, timeoutPolicy);
+    this.logger = LoggerFactory.getLogger(DaprClientImpl.class);
   }
 
   private CommonProtos.StateOptions.StateConsistency getGrpcStateConsistency(StateOptions options) {
@@ -279,7 +283,15 @@ public Mono<Void> waitForSidecar(int timeoutInMilliseconds) {
         null, "", null, null);
 
     return responseMono
-        .retryWhen(Retry.indefinitely())
+        // No method to "retry forever every 500ms", so we make it practically forever.
+        // 9223372036854775807 * 500 ms = 1.46235604 x 10^11 years
+        // If anyone needs to wait for the sidecar for longer than that, sorry.
+        .retryWhen(
+            Retry
+                .fixedDelay(Long.MAX_VALUE, Duration.ofMillis(500))
+                .doBeforeRetry(s -> {
+                  this.logger.info("Retrying sidecar health check ...");
+                }))
         .timeout(Duration.ofMillis(timeoutInMilliseconds))
         .onErrorResume(DaprException.class, e ->
             Mono.error(new RuntimeException(e)))