From 036263966e63e928c1c75da958f1d548f5b46b5f Mon Sep 17 00:00:00 2001 From: pmarupaka Date: Tue, 14 Apr 2026 22:52:34 -0400 Subject: [PATCH 1/5] Add queue timeout config --- .../conjure/java/client/config/ClientConfiguration.java | 3 +++ .../conjure/java/client/config/ClientConfigurations.java | 1 + .../java/com/palantir/conjure/java/clients/ConjureClients.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java index 678387066..752193e58 100644 --- a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java +++ b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java @@ -61,6 +61,9 @@ public interface ClientConfiguration { /** See {@link PartialServiceConfiguration#writeTimeout}. */ Duration writeTimeout(); + /** The maximum time a request may spend queued waiting for a concurrency permit before being rejected. */ + Optional queueTimeout(); + /** See {@link PartialServiceConfiguration#enableGcmCipherSuites}. */ boolean enableGcmCipherSuites(); diff --git a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java index 345e07cef..17e5855b8 100644 --- a/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java +++ b/client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java @@ -107,6 +107,7 @@ public static ClientConfiguration of(ServiceConfiguration config, TrustContextFa .nodeSelectionStrategy(DEFAULT_NODE_SELECTION_STRATEGY) .failedUrlCooldown(DEFAULT_FAILED_URL_COOLDOWN) .backoffSlotSize(config.backoffSlotSize().orElse(DEFAULT_BACKOFF_SLOT_SIZE)) + .queueTimeout(config.queueTimeout()) .clientQoS(CLIENT_QOS_DEFAULT) .serverQoS(PROPAGATE_QOS_DEFAULT) .retryOnTimeout(RETRY_ON_TIMEOUT_DEFAULT) diff --git a/client-config/src/main/java/com/palantir/conjure/java/clients/ConjureClients.java b/client-config/src/main/java/com/palantir/conjure/java/clients/ConjureClients.java index fd2ea7382..9ff96eb29 100644 --- a/client-config/src/main/java/com/palantir/conjure/java/clients/ConjureClients.java +++ b/client-config/src/main/java/com/palantir/conjure/java/clients/ConjureClients.java @@ -83,6 +83,8 @@ public interface WithClientOptions { T withMaxNumRetries(int maxNumRetries); + T withQueueTimeout(Duration duration); + T withTaggedMetrics(TaggedMetricRegistry metrics); T withUserAgent(UserAgent agent); From 9dc181a42c39929e360dd609be03da21e27b5cef Mon Sep 17 00:00:00 2001 From: pmarupaka Date: Thu, 30 Apr 2026 10:52:02 -0400 Subject: [PATCH 2/5] use RC cjra --- versions.lock | 6 +++--- versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.lock b/versions.lock index ad27f8581..8c8378aad 100644 --- a/versions.lock +++ b/versions.lock @@ -50,11 +50,11 @@ com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b) com.palantir.conjure.java:conjure-lib:8.82.0 (3 constraints: 6e259552) -com.palantir.conjure.java.api:errors:2.75.0 (5 constraints: f744b2b2) +com.palantir.conjure.java.api:errors:2.75.0 (5 constraints: 27465da6) -com.palantir.conjure.java.api:service-config:2.75.0 (3 constraints: ae28e2e4) +com.palantir.conjure.java.api:service-config:2.75.0 (3 constraints: de292d77) -com.palantir.conjure.java.api:ssl-config:2.75.0 (2 constraints: 07187c87) +com.palantir.conjure.java.api:ssl-config:2.75.0 (2 constraints: 371988df) com.palantir.deadlines:deadlines:0.23.0 (1 constraints: 670f1686) diff --git a/versions.props b/versions.props index add634a0c..6bd75e44e 100644 --- a/versions.props +++ b/versions.props @@ -7,7 +7,7 @@ com.netflix.concurrency-limits:* = 0.2.2 com.netflix.feign:feign-*= 8.18.0 com.palantir.conjure.java:* = 8.77.0 com.palantir.conjure.java:conjure-lib = 8.82.0 -com.palantir.conjure.java.api:* = 2.75.0 +com.palantir.conjure.java.api:* = 2.72.0-rc1 com.palantir.conjure.verification:* = 0.19.0 com.palantir.dialogue:* = 6.32.0 com.palantir.ri:* = 2.20.0 From 0ccf54e7288b4717025c8bdf96706d0f7e2189e4 Mon Sep 17 00:00:00 2001 From: pmarupaka Date: Mon, 1 Jun 2026 15:00:00 -0400 Subject: [PATCH 3/5] force rc version --- build.gradle | 13 +++++++++++++ versions.lock | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index f5347869d..8ce224a3c 100644 --- a/build.gradle +++ b/build.gradle @@ -71,3 +71,16 @@ subprojects { jdks { daemonTarget = 21 } + +// Force conjure-java-api to the RC build. 2.72.0-rc1 sorts below the released 2.72.0 that +// conjure-lib transitively requires, so this is a downgrade past a hard requirement and a strict +// constraint can't satisfy it. A hard force is required to override the platform alignment. +allprojects { + configurations.all { + resolutionStrategy { + force 'com.palantir.conjure.java.api:errors:2.72.0-rc1' + force 'com.palantir.conjure.java.api:service-config:2.72.0-rc1' + force 'com.palantir.conjure.java.api:ssl-config:2.72.0-rc1' + } + } +} diff --git a/versions.lock b/versions.lock index 8c8378aad..eff4a00ab 100644 --- a/versions.lock +++ b/versions.lock @@ -6,7 +6,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.21 (12 constraints: 03de1b79) com.fasterxml.jackson.core:jackson-core:2.21.4 (14 constraints: d1231840) -com.fasterxml.jackson.core:jackson-databind:2.21.4 (18 constraints: c86371a8) +com.fasterxml.jackson.core:jackson-databind:2.21.4 (18 constraints: c26357a4) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.21.4 (2 constraints: 2f204c06) @@ -36,7 +36,7 @@ com.google.errorprone:error_prone_annotations:2.49.0 (18 constraints: 8218b22f) com.google.guava:failureaccess:1.0.3 (1 constraints: 160ae3b4) -com.google.guava:guava:33.6.0-jre (17 constraints: b02ee6d8) +com.google.guava:guava:33.6.0-jre (17 constraints: ae2e68d3) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) @@ -50,11 +50,11 @@ com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b) com.palantir.conjure.java:conjure-lib:8.82.0 (3 constraints: 6e259552) -com.palantir.conjure.java.api:errors:2.75.0 (5 constraints: 27465da6) +com.palantir.conjure.java.api:errors:2.72.0-rc1 (5 constraints: 27465da6) -com.palantir.conjure.java.api:service-config:2.75.0 (3 constraints: de292d77) +com.palantir.conjure.java.api:service-config:2.72.0-rc1 (3 constraints: de292d77) -com.palantir.conjure.java.api:ssl-config:2.75.0 (2 constraints: 371988df) +com.palantir.conjure.java.api:ssl-config:2.72.0-rc1 (2 constraints: 671a5f47) com.palantir.deadlines:deadlines:0.23.0 (1 constraints: 670f1686) @@ -76,19 +76,19 @@ com.palantir.refreshable:refreshable:2.14.0 (2 constraints: a11443ac) com.palantir.ri:resource-identifier:2.20.0 (3 constraints: 3e305cb0) -com.palantir.safe-logging:logger:3.17.0 (15 constraints: fbe5d6c6) +com.palantir.safe-logging:logger:3.17.0 (15 constraints: f7e57ebd) com.palantir.safe-logging:logger-slf4j:3.17.0 (1 constraints: 360e9c50) com.palantir.safe-logging:logger-spi:3.17.0 (2 constraints: 7b1e4eb1) -com.palantir.safe-logging:preconditions:3.17.0 (22 constraints: 1e5c08b4) +com.palantir.safe-logging:preconditions:3.17.0 (22 constraints: 125c688c) -com.palantir.safe-logging:safe-logging:3.17.0 (20 constraints: a93c1337) +com.palantir.safe-logging:safe-logging:3.17.0 (20 constraints: a13cab1e) com.palantir.safethreadlocalrandom:safe-thread-local-random:0.10.0 (1 constraints: 630f0986) -com.palantir.tokens:auth-tokens:4.7.0 (5 constraints: 51472834) +com.palantir.tokens:auth-tokens:4.7.0 (5 constraints: 4c475232) com.palantir.tracing:tracing:6.36.0 (8 constraints: dd7d1a9c) @@ -102,7 +102,7 @@ com.palantir.tritium:tritium-api:0.134.0 (2 constraints: 911f1bf4) com.palantir.tritium:tritium-core:0.134.0 (1 constraints: 7010afb2) -com.palantir.tritium:tritium-ids:0.134.0 (1 constraints: fe0f9aa6) +com.palantir.tritium:tritium-ids:0.134.0 (1 constraints: fc0f94a6) com.palantir.tritium:tritium-metrics:0.134.0 (5 constraints: 584ca516) @@ -186,7 +186,7 @@ org.hdrhistogram:HdrHistogram:2.2.2 (1 constraints: 0e100092) org.hibernate.validator:hibernate-validator:8.0.2.Final (1 constraints: 1a1606e4) -org.immutables:value:2.12.2 (2 constraints: 0215eec1) +org.immutables:value:2.12.2 (2 constraints: 0115edc1) org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0) From cba0244c3a76e245a5623a1dda8b239b34b9838a Mon Sep 17 00:00:00 2001 From: pmarupaka Date: Mon, 1 Jun 2026 15:11:09 -0400 Subject: [PATCH 4/5] revapi --- .palantir/revapi.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.palantir/revapi.yml b/.palantir/revapi.yml index 459991930..b610f53a8 100644 --- a/.palantir/revapi.yml +++ b/.palantir/revapi.yml @@ -126,3 +126,11 @@ acceptedBreaks: old: "method void com.palantir.conjure.java.client.config.ClientConfiguration::checkTimeoutPrecision(java.time.Duration,\ \ java.lang.String)" justification: "Removed internal method" + "8.35.0": + com.palantir.conjure.java.runtime:client-config: + - code: "java.method.addedToInterface" + new: "method T com.palantir.conjure.java.clients.ConjureClients.WithClientOptions::withQueueTimeout(java.time.Duration)" + justification: "Adding queue timeout to interface" + - code: "java.method.addedToInterface" + new: "method java.util.Optional com.palantir.conjure.java.client.config.ClientConfiguration::queueTimeout()" + justification: "Adding queue timeout to interface" From e1b94b7a6a768e1e340d79303ec145df050d504a Mon Sep 17 00:00:00 2001 From: svc-autorelease Date: Mon, 1 Jun 2026 20:17:29 +0000 Subject: [PATCH 5/5] Release 8.36.0-rc1 [skip ci]