rough update

Author: Kunal Kak

dialogue-clients/src/main/java/com/palantir/dialogue/clients/ChannelCache.java

@@ -21,7 +21,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.palantir.conjure.java.api.config.service.ServiceConfiguration;
 import com.palantir.conjure.java.client.config.ClientConfiguration;
-import com.palantir.deadlines.Deadlines.Enforcement;
 import com.palantir.dialogue.core.DialogueChannel;
 import com.palantir.dialogue.core.DialogueDnsResolver;
 import com.palantir.dialogue.core.TargetUri;
@@ -138,7 +137,6 @@ DialogueChannel getNonReloadingChannel(
                 .dnsResolver(reloadingParams.dnsResolver())
                 .dnsRefreshInterval(reloadingParams.dnsRefreshInterval())
                 .dnsNodeDiscovery(overrideHostIndex.isEmpty() && reloadingParams.dnsNodeDiscovery())
-                .deadlineEnforcement(reloadingParams.deadlineEnforcement())
                 .build());
     }
 
@@ -185,7 +183,6 @@ private DialogueChannel createNonLiveReloadingChannel(ChannelCacheKey channelCac
                 .overrideHostIndex(channelCacheRequest.overrideHostIndex().stream()
                         .mapToInt(OverrideHostIndex::index)
                         .findAny())
-                .deadlineEnforcement(channelCacheRequest.deadlineEnforcement())
                 .build();
     }
 
@@ -277,8 +274,6 @@ interface ChannelCacheKey extends AugmentClientConfig {
         Duration dnsRefreshInterval();
 
         boolean dnsNodeDiscovery();
-
-        Enforcement deadlineEnforcement();
     }
 
     @Unsafe

dialogue-clients/src/main/java/com/palantir/dialogue/clients/ReloadingClientFactory.java

@@ -30,14 +30,14 @@
 import com.palantir.conjure.java.client.config.HostEventsSink;
 import com.palantir.conjure.java.client.config.NodeSelectionStrategy;
 import com.palantir.conjure.java.dialogue.serde.DefaultConjureRuntime;
-import com.palantir.deadlines.Deadlines.Enforcement;
 import com.palantir.dialogue.Channel;
 import com.palantir.dialogue.Clients;
 import com.palantir.dialogue.ConjureRuntime;
 import com.palantir.dialogue.Endpoint;
 import com.palantir.dialogue.EndpointChannel;
 import com.palantir.dialogue.EndpointChannelFactory;
 import com.palantir.dialogue.Request;
+import com.palantir.dialogue.RequestAttachmentKey;
 import com.palantir.dialogue.Response;
 import com.palantir.dialogue.clients.ChannelCache.OverrideHostIndex;
 import com.palantir.dialogue.clients.DialogueClients.DeadlineEnforcementFactory;
@@ -136,11 +136,6 @@ default boolean dnsNodeDiscovery() {
             return true;
         }
 
-        @Value.Default
-        default Enforcement deadlineEnforcement() {
-            return Enforcement.DEFER;
-        }
-
         Optional<ExecutorService> blockingExecutor();
     }
 
@@ -616,16 +611,17 @@ public <T> T get(Class<T> serviceClass, String serviceName) {
         }
 
         private Channel getDeadlineEnforcedChannel(String serviceName) {
-            Enforcement enforcement = enforce ? Enforcement.ENFORCE : Enforcement.DISABLE;
+            Channel internalDialogueChannel =
+                    delegate.getInternalDialogueChannel(serviceName).get();
 
-            ReloadingClientFactory factory = new ReloadingClientFactory(
-                    ImmutableReloadingParams.builder()
-                            .from(delegate.params)
-                            .deadlineEnforcement(enforcement)
-                            .build(),
-                    delegate.cache);
+            Channel deadlineEnforcingChannel = (endpoint, request) -> {
+                request.attachments().put(RequestAttachmentKey.create(Boolean.class), enforce);
+                return internalDialogueChannel.execute(endpoint, request);
+            };
 
-            return factory.getChannel(serviceName);
+            return new LiveReloadingChannel(
+                    Refreshable.only(deadlineEnforcingChannel),
+                    delegate.params.runtime().clients());
         }
     }
 }

dialogue-core/src/main/java/com/palantir/dialogue/core/Config.java

@@ -19,7 +19,6 @@
 import com.github.benmanes.caffeine.cache.Ticker;
 import com.palantir.conjure.java.client.config.ClientConfiguration;
 import com.palantir.conjure.java.client.config.ClientConfiguration.ClientQoS;
-import com.palantir.deadlines.Deadlines.Enforcement;
 import com.palantir.logsafe.DoNotLog;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.SafeArg;
@@ -80,11 +79,6 @@ default int maxQueueSize() {
 
     OptionalInt overrideSingleHostIndex();
 
-    @Value.Default
-    default Enforcement clientDeadlineEnforcement() {
-        return Enforcement.DEFER;
-    }
-
     @Value.Check
     default void check() {
         Preconditions.checkArgument(maxQueueSize() > 0, "maxQueueSize must be positive");

dialogue-core/src/main/java/com/palantir/dialogue/core/DeadlineAdvertisementChannel.java

@@ -24,37 +24,33 @@
 import com.palantir.dialogue.Channel;
 import com.palantir.dialogue.Endpoint;
 import com.palantir.dialogue.Request;
+import com.palantir.dialogue.RequestAttachmentKey;
 import com.palantir.dialogue.Response;
 import java.time.Duration;
 
 final class DeadlineAdvertisementChannel implements Channel {
 
     private final Channel delegate;
     private final Duration readTimeout;
-    private final Enforcement enforcement;
 
     static DeadlineAdvertisementChannel create(Channel delegate, Duration readTimeout) {
-        return new DeadlineAdvertisementChannel(delegate, readTimeout, Deadlines.Enforcement.DEFER);
+        return new DeadlineAdvertisementChannel(delegate, readTimeout);
     }
 
-    static DeadlineAdvertisementChannel create(Channel delegate, Duration readTimeout, Enforcement enforcement) {
-        return new DeadlineAdvertisementChannel(delegate, readTimeout, enforcement);
-    }
-
-    DeadlineAdvertisementChannel(Channel delegate, Duration readTimeout, Enforcement enforcement) {
+    DeadlineAdvertisementChannel(Channel delegate, Duration readTimeout) {
         this.delegate = delegate;
         // a readTimeout of zero effectively means "no timeout", but we don't want to put 0 on the wire,
         // so set a very large value instead
         // this matches the behavior in ApacheHttpClientChannels
         // see:
         // https://github.com/palantir/dialogue/blob/develop/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientChannels.java#L641-L648
         this.readTimeout = readTimeout.isNegative() || readTimeout.isZero() ? Duration.ofDays(1) : readTimeout;
-        this.enforcement = enforcement;
     }
 
     @Override
     public ListenableFuture<Response> execute(Endpoint endpoint, Request request) {
         Request.Builder requestBuilder = Request.builder().from(request);
+        Enforcement enforcement = getEnforcementFromAttachments(request);
         try {
             Deadlines.encodeToRequest(readTimeout, requestBuilder, RequestBuilderEncodingAdapter.INSTANCE, enforcement);
         } catch (DeadlineExpiredException e) {
@@ -63,6 +59,15 @@ public ListenableFuture<Response> execute(Endpoint endpoint, Request request) {
         return delegate.execute(endpoint, requestBuilder.build());
     }
 
+    private Enforcement getEnforcementFromAttachments(Request request) {
+        Boolean clientEnforcement =
+                request.attachments().getOrDefault(RequestAttachmentKey.create(Boolean.class), null);
+        if (clientEnforcement == null) {
+            return Enforcement.DEFER;
+        }
+        return clientEnforcement ? Enforcement.ENFORCE : Enforcement.DISABLE;
+    }
+
     private enum RequestBuilderEncodingAdapter implements Deadlines.RequestEncodingAdapter<Request.Builder> {
         INSTANCE;
 

dialogue-core/src/main/java/com/palantir/dialogue/core/DialogueChannel.java

@@ -25,7 +25,6 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.errorprone.annotations.CheckReturnValue;
 import com.palantir.conjure.java.client.config.ClientConfiguration;
-import com.palantir.deadlines.Deadlines.Enforcement;
 import com.palantir.dialogue.Channel;
 import com.palantir.dialogue.Endpoint;
 import com.palantir.dialogue.EndpointChannel;
@@ -142,14 +141,6 @@ public Builder overrideHostIndex(OptionalInt maybeUriIndex) {
             return this;
         }
 
-        /**
-         * Sets client-side deadline enforcement state.
-         */
-        public Builder deadlineEnforcement(Enforcement value) {
-            builder.clientDeadlineEnforcement(value);
-            return this;
-        }
-
         @VisibleForTesting
         Builder random(Random value) {
             builder.random(value);
@@ -252,7 +243,7 @@ private static ImmutableList<LimitedChannel> createHostChannels(
                 channel =
                         new TraceEnrichingChannel(channel, DialogueTracing.tracingTags(cf, uriIndexForInstrumentation));
                 channel = DeadlineAdvertisementChannel.create(
-                        channel, cf.clientConf().readTimeout(), cf.clientDeadlineEnforcement());
+                        channel, cf.clientConf().readTimeout());
 
                 ChannelState channelState = state.get(targetUri);
                 Preconditions.checkNotNull(channelState, "no ChannelState exists for this TargetUri");