only retain state for per host channel

palantir · Nov 8, 2024 · 1495e17 · 1495e17
1 parent bed8cd1
commit 1495e17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/ConcurrencyLimitedChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/ConcurrencyLimitedChannel.java
@@ -61,12 +61,10 @@ static LimitedChannel createForHost(Config cf, Channel channel, int uriIndex, St
      * Creates a concurrency limited channel for per-endpoint limiting.
      * Metrics are not reported by this component per-endpoint, only by the per-endpoint queue.
      */
-    static LimitedChannel createForEndpoint(
-            Channel channel, String channelName, int uriIndex, Endpoint endpoint, StateHolder stateHolder) {
-        ConcurrencyLimitedChannelState state = stateHolder.getState(STATE_HOLDER_KEY);
+    static LimitedChannel createForEndpoint(Channel channel, String channelName, int uriIndex, Endpoint endpoint) {
         return new ConcurrencyLimitedChannel(
                 channel,
-                state.endpointLimiter(),
+                new CautiousIncreaseAggressiveDecreaseConcurrencyLimiter(Behavior.ENDPOINT_LEVEL),
                 new EndpointConcurrencyLimitedChannelInstrumentation(channelName, uriIndex, endpoint));
     }
 
@@ -82,7 +80,6 @@ static LimitedChannel createForEndpoint(
     static ConcurrencyLimitedChannelState createState() {
         return ImmutableConcurrencyLimitedChannelState.builder()
                 .hostLimiter(new CautiousIncreaseAggressiveDecreaseConcurrencyLimiter(Behavior.HOST_LEVEL))
-                .endpointLimiter(new CautiousIncreaseAggressiveDecreaseConcurrencyLimiter(Behavior.ENDPOINT_LEVEL))
                 .build();
     }
 
@@ -193,7 +190,5 @@ public String channelNameForLogging() {
     @Value.Immutable
     interface ConcurrencyLimitedChannelState {
         CautiousIncreaseAggressiveDecreaseConcurrencyLimiter hostLimiter();
-
-        CautiousIncreaseAggressiveDecreaseConcurrencyLimiter endpointLimiter();
     }
 }
diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/DialogueChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/DialogueChannel.java
@@ -290,7 +290,7 @@ private static ImmutableList<LimitedChannel> createHostChannels(
                             return unlimited;
                         }
                         LimitedChannel limited = ConcurrencyLimitedChannel.createForEndpoint(
-                                unlimited, cf.channelName(), uriIndexForInstrumentation, endpoint, stateHolder);
+                                unlimited, cf.channelName(), uriIndexForInstrumentation, endpoint);
                         return QueuedChannel.create(cf, endpoint, limited);
                     });
                     limitedChannel = ConcurrencyLimitedChannel.createForHost(