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 5fb492542..27a216c87 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 @@ -25,8 +25,10 @@ import com.palantir.conjure.java.api.config.ssl.SslConfiguration; import com.palantir.conjure.java.config.ssl.SslSocketFactories; import com.palantir.conjure.java.config.ssl.TrustContext; +import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.UnsafeArg; import com.palantir.logsafe.exceptions.SafeIllegalArgumentException; +import com.palantir.logsafe.exceptions.SafeIllegalStateException; import com.palantir.logsafe.logger.SafeLogger; import com.palantir.logsafe.logger.SafeLoggerFactory; import com.palantir.tritium.metrics.registry.SharedTaggedMetricRegistries; @@ -200,7 +202,10 @@ public static ProxySelector createProxySelector(ProxyConfiguration proxyConfig) // fall through } - throw new IllegalStateException("Failed to create ProxySelector for proxy configuration: " + proxyConfig); + throw new SafeIllegalStateException( + "Failed to create ProxySelector for proxy configuration", + SafeArg.of("type", proxyConfig.type()), + UnsafeArg.of("hostAndPort", proxyConfig.hostAndPort())); } @VisibleForTesting diff --git a/versions.lock b/versions.lock index 4f1b7e9af..180460e31 100644 --- a/versions.lock +++ b/versions.lock @@ -2,7 +2,7 @@ com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13) com.fasterxml.jackson.core:jackson-annotations:2.15.3 (10 constraints: 68c65769) com.fasterxml.jackson.core:jackson-core:2.15.3 (14 constraints: 33364552) -com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e38cb4a0) +com.fasterxml.jackson.core:jackson-databind:2.15.3 (20 constraints: e58c74a2) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3 (2 constraints: 2f20bc05) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.3 (1 constraints: 3905393b) com.fasterxml.jackson.datatype:jackson-datatype-guava:2.15.3 (1 constraints: 3905393b) @@ -18,16 +18,16 @@ com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: f223e4a4) com.google.code.findbugs:jsr305:3.0.2 (15 constraints: 9de5277d) com.google.errorprone:error_prone_annotations:2.7.1 (16 constraints: e5f9191d) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) -com.google.guava:guava:32.1.3-jre (15 constraints: f6093b6b) +com.google.guava:guava:32.1.3-jre (15 constraints: f909e26b) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0) com.netflix.concurrency-limits:concurrency-limits-core:0.2.2 (1 constraints: 0605f335) com.netflix.feign:feign-core:8.18.0 (2 constraints: 1213df52) com.netflix.feign:feign-jackson:8.18.0 (1 constraints: 43056b3b) com.palantir.conjure.java:conjure-lib:7.20.0 (3 constraints: 67254d4f) -com.palantir.conjure.java.api:errors:2.36.0 (3 constraints: 3525a84a) -com.palantir.conjure.java.api:service-config:2.36.0 (3 constraints: a72832e3) -com.palantir.conjure.java.api:ssl-config:2.36.0 (2 constraints: 0118c086) +com.palantir.conjure.java.api:errors:2.38.0 (3 constraints: 3725684b) +com.palantir.conjure.java.api:service-config:2.38.0 (3 constraints: a92806e4) +com.palantir.conjure.java.api:ssl-config:2.38.0 (2 constraints: 05183887) com.palantir.dialogue:dialogue-apache-hc5-client:3.96.0 (1 constraints: 4405673b) com.palantir.dialogue:dialogue-blocking-channels:3.96.0 (2 constraints: e3236db4) com.palantir.dialogue:dialogue-core:3.96.0 (2 constraints: 491958ef) @@ -48,16 +48,16 @@ com.palantir.tracing:tracing:6.18.0 (7 constraints: 866f3e47) com.palantir.tracing:tracing-api:6.18.0 (5 constraints: b9521ea8) com.palantir.tracing:tracing-jersey-jakarta:6.18.0 (1 constraints: 41055f3b) com.palantir.tracing:tracing-okhttp3:6.18.0 (1 constraints: 41055f3b) -com.palantir.tritium:tritium-api:0.77.0 (2 constraints: 3d1f10be) -com.palantir.tritium:tritium-core:0.77.0 (1 constraints: 461059a2) -com.palantir.tritium:tritium-metrics:0.77.0 (5 constraints: 114de95f) -com.palantir.tritium:tritium-registry:0.77.0 (6 constraints: 565df4db) +com.palantir.tritium:tritium-api:0.78.0 (2 constraints: 3f1f44be) +com.palantir.tritium:tritium-core:0.78.0 (1 constraints: 47105ca2) +com.palantir.tritium:tritium-metrics:0.78.0 (5 constraints: 124dbb60) +com.palantir.tritium:tritium-registry:0.78.0 (6 constraints: 585df7dc) com.squareup.okhttp3:okhttp:3.13.1 (4 constraints: 2e38ea61) com.squareup.okio:okio:1.17.2 (1 constraints: 850cc309) com.squareup.retrofit2:converter-jackson:2.4.0 (1 constraints: 08050136) com.squareup.retrofit2:retrofit:2.4.0 (2 constraints: 4b1d8704) com.thoughtworks.paranamer:paranamer:2.8 (1 constraints: 7b15b5d4) -io.dropwizard.metrics:metrics-core:4.2.21 (6 constraints: 57593170) +io.dropwizard.metrics:metrics-core:4.2.21 (6 constraints: 4959dc6e) jakarta.activation:jakarta.activation-api:2.1.0 (1 constraints: 8c0f4791) jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: f4368043) jakarta.el:jakarta.el-api:5.0.1 (2 constraints: eb1eda9a) diff --git a/versions.props b/versions.props index bd9df6a96..7e501a0c0 100644 --- a/versions.props +++ b/versions.props @@ -6,13 +6,13 @@ com.netflix.concurrency-limits:* = 0.2.2 com.netflix.feign:feign-*= 8.18.0 com.palantir.conjure.java:* = 7.20.0 com.palantir.conjure.java:conjure-lib = 7.20.0 -com.palantir.conjure.java.api:* = 2.36.0 +com.palantir.conjure.java.api:* = 2.38.0 com.palantir.conjure.verification:* = 0.19.0 com.palantir.dialogue:* = 3.96.0 com.palantir.safe-logging:* = 3.6.0 com.palantir.tokens:* = 3.18.0 com.palantir.tracing:* = 6.18.0 -com.palantir.tritium:* = 0.77.0 +com.palantir.tritium:* = 0.78.0 io.reactivex.rxjava2:rxjava = 2.2.21 org.apache.commons:commons-lang3 = 3.13.0 org.assertj:assertj-core = 3.24.2