feat: allow configuring grpc deadline (#178)

feat: allow setting deadline

Author: nicklasl

openfeature-provider/src/test/java/com/spotify/confidence/FeatureProviderTest.java

@@ -76,7 +76,7 @@ void beforeEach() {
         new TelemetryClientInterceptor(telemetry);
     final FlagResolverClientImpl flagResolver =
         new FlagResolverClientImpl(
-            new GrpcFlagResolver("fake-secret", channel, telemetryInterceptor), telemetry);
+            new GrpcFlagResolver("fake-secret", channel, telemetryInterceptor, 1_000), telemetry);
     final Confidence confidence = Confidence.create(fakeEventSender, flagResolver, "clientKey");
     final FeatureProvider featureProvider = new ConfidenceFeatureProvider(confidence);
 

sdk-java/src/main/java/com/spotify/confidence/Confidence.java

@@ -334,12 +334,24 @@ public static class Builder {
     private ManagedChannel flagResolverManagedChannel = DEFAULT_CHANNEL;
     private boolean disableTelemetry = false;
     private boolean isProvider = false;
+    private int resolveDeadlineMs = 10_000;
+    private int eventSenderDeadlineMs = 5_000;
 
     public Builder(@Nonnull String clientSecret) {
       this.clientSecret = clientSecret;
       registerChannelForShutdown(DEFAULT_CHANNEL);
     }
 
+    public Builder resolveDeadlineMs(int resolveDeadlineMs) {
+      this.resolveDeadlineMs = resolveDeadlineMs;
+      return this;
+    }
+
+    public Builder eventSenderDeadlineMs(int eventSenderDeadlineMs) {
+      this.eventSenderDeadlineMs = eventSenderDeadlineMs;
+      return this;
+    }
+
     public Builder flagResolverManagedChannel(String host, int port) {
       this.flagResolverManagedChannel =
           ManagedChannelBuilder.forAddress(host, port).usePlaintext().build();
@@ -368,12 +380,14 @@ public Confidence build() {
       final TelemetryClientInterceptor telemetryInterceptor =
           new TelemetryClientInterceptor(telemetry);
       final GrpcFlagResolver flagResolver =
-          new GrpcFlagResolver(clientSecret, flagResolverManagedChannel, telemetryInterceptor);
+          new GrpcFlagResolver(
+              clientSecret, flagResolverManagedChannel, telemetryInterceptor, resolveDeadlineMs);
 
       flagResolverClient = new FlagResolverClientImpl(flagResolver, telemetry);
 
       final EventSenderEngine eventSenderEngine =
-          new EventSenderEngineImpl(clientSecret, DEFAULT_CHANNEL, Instant::now);
+          new EventSenderEngineImpl(
+              clientSecret, DEFAULT_CHANNEL, Instant::now, eventSenderDeadlineMs);
       closer.register(flagResolverClient);
       closer.register(eventSenderEngine);
       return new RootInstance(

sdk-java/src/main/java/com/spotify/confidence/EventSenderEngineImpl.java

@@ -64,10 +64,11 @@ class EventSenderEngineImpl implements EventSenderEngine {
     pollingThread.start();
   }
 
-  EventSenderEngineImpl(String clientSecret, ManagedChannel channel, Clock clock) {
+  EventSenderEngineImpl(
+      String clientSecret, ManagedChannel channel, Clock clock, int deadlineMillis) {
     this(
         DEFAULT_BATCH_SIZE,
-        new GrpcEventUploader(clientSecret, clock, channel),
+        new GrpcEventUploader(clientSecret, clock, channel, deadlineMillis),
         clock,
         DEFAULT_MAX_FLUSH_INTERVAL,
         DEFAULT_MAX_MEMORY_CONSUMPTION);

sdk-java/src/main/java/com/spotify/confidence/GrpcEventUploader.java

@@ -31,14 +31,17 @@ class GrpcEventUploader implements EventUploader {
   private final ManagedChannel managedChannel;
   private final EventsServiceGrpc.EventsServiceFutureStub stub;
   private final Clock clock;
+  private final int deadlineMillis;
 
   private static final Logger log = org.slf4j.LoggerFactory.getLogger(GrpcEventUploader.class);
 
-  GrpcEventUploader(String clientSecret, Clock clock, ManagedChannel managedChannel) {
+  GrpcEventUploader(
+      String clientSecret, Clock clock, ManagedChannel managedChannel, int deadlineMillis) {
     this.clientSecret = clientSecret;
     this.managedChannel = managedChannel;
     this.stub = EventsServiceGrpc.newFutureStub(managedChannel);
     this.clock = clock;
+    this.deadlineMillis = deadlineMillis;
     this.sdk =
         Sdk.newBuilder()
             .setId(SdkId.SDK_ID_JAVA_CONFIDENCE)
@@ -57,7 +60,7 @@ public CompletableFuture<Boolean> upload(List<Event> events) {
             .build();
 
     return GrpcUtil.toCompletableFuture(
-            stub.withDeadlineAfter(5, TimeUnit.SECONDS).publishEvents(request))
+            stub.withDeadlineAfter(deadlineMillis, TimeUnit.MILLISECONDS).publishEvents(request))
         .thenApply(
             publishEventsResponse -> {
               final List<Event> eventsInRequest = request.getEventsList();

sdk-java/src/main/java/com/spotify/confidence/GrpcFlagResolver.java

@@ -15,16 +15,19 @@ public class GrpcFlagResolver implements FlagResolver {
   private final Builder sdkBuilder = Sdk.newBuilder().setVersion(ConfidenceUtils.getSdkVersion());
 
   private final FlagResolverServiceGrpc.FlagResolverServiceFutureStub stub;
+  private final int deadlineMillis;
 
   public GrpcFlagResolver(
       String clientSecret,
       ManagedChannel managedChannel,
-      TelemetryClientInterceptor telemetryInterceptor) {
+      TelemetryClientInterceptor telemetryInterceptor,
+      int deadlineMillis) {
     if (Strings.isNullOrEmpty(clientSecret)) {
       throw new IllegalArgumentException("clientSecret must be a non-empty string.");
     }
     this.clientSecret = clientSecret;
     this.managedChannel = managedChannel;
+    this.deadlineMillis = deadlineMillis;
     this.stub =
         FlagResolverServiceGrpc.newFutureStub(managedChannel)
             .withInterceptors(telemetryInterceptor);
@@ -33,7 +36,7 @@ public GrpcFlagResolver(
   public CompletableFuture<ResolveFlagsResponse> resolve(
       String flag, Struct context, Boolean isProvider) {
     return GrpcUtil.toCompletableFuture(
-        stub.withDeadlineAfter(10, TimeUnit.SECONDS)
+        stub.withDeadlineAfter(deadlineMillis, TimeUnit.MILLISECONDS)
             .resolveFlags(
                 ResolveFlagsRequest.newBuilder()
                     .setClientSecret(this.clientSecret)

sdk-java/src/test/java/com/spotify/confidence/ConfidenceIntegrationTest.java

@@ -78,7 +78,7 @@ void beforeEach() {
     telemetryInterceptor = new FakeTelemetryClientInterceptor(telemetry);
     final FlagResolverClientImpl flagResolver =
         new FlagResolverClientImpl(
-            new GrpcFlagResolver("fake-secret", channel, telemetryInterceptor), telemetry);
+            new GrpcFlagResolver("fake-secret", channel, telemetryInterceptor, 1_000), telemetry);
     confidence = Confidence.create(fakeEventSender, flagResolver, "");
   }
 
@@ -477,7 +477,7 @@ public void resolveDoesNotContainHeaderWithTelemetryDataWhenDisabled() {
         new FakeTelemetryClientInterceptor(null);
     final FlagResolverClientImpl flagResolver =
         new FlagResolverClientImpl(
-            new GrpcFlagResolver("fake-secret", channel, nullTelemetryInterceptor));
+            new GrpcFlagResolver("fake-secret", channel, nullTelemetryInterceptor, 1_000));
     confidence = Confidence.create(fakeEventSender, flagResolver, "clientKey");
 
     mockSampleResponse();

sdk-java/src/test/java/com/spotify/confidence/GrpcEventUploaderTest.java

@@ -54,7 +54,7 @@ public void setUp() throws IOException {
     fakeClock.setCurrentTimeSeconds(1337);
 
     // Create a client that uses the channel
-    uploader = new GrpcEventUploader("my-client-secret", fakeClock, channel);
+    uploader = new GrpcEventUploader("my-client-secret", fakeClock, channel, 5_000);
   }
 
   @AfterEach