From 69224ee5966e7c847fbf301ece79d137cef858e0 Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Thu, 22 Jul 2021 14:13:16 -0400 Subject: [PATCH] Manually migrate a few stragglers --- dialogue-annotations/build.gradle | 3 +-- dialogue-apache-hc5-client/build.gradle | 3 +-- dialogue-blocking-channels/build.gradle | 3 +-- .../verification/AutoDeserializeTest.java | 13 +++++++---- .../verification/SingleParamServicesTest.java | 23 ++++++++++++++----- dialogue-clients/build.gradle | 3 +-- dialogue-core/build.gradle | 5 ++-- dialogue-futures/build.gradle | 3 +-- dialogue-serde/build.gradle | 3 +-- .../java/dialogue/serde/ErrorDecoder.java | 8 +++---- dialogue-target/build.gradle | 3 +-- versions.lock | 14 +++++------ versions.props | 2 +- 13 files changed, 47 insertions(+), 39 deletions(-) diff --git a/dialogue-annotations/build.gradle b/dialogue-annotations/build.gradle index 28c2d0b692..78697f8a96 100644 --- a/dialogue-annotations/build.gradle +++ b/dialogue-annotations/build.gradle @@ -10,10 +10,10 @@ dependencies { implementation project(':dialogue-serde') implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.google.code.findbugs:jsr305' + implementation 'com.palantir.safe-logging:logger' implementation 'com.palantir.safe-logging:preconditions' implementation 'com.palantir.safe-logging:safe-logging' implementation 'com.google.guava:guava' - implementation 'org.slf4j:slf4j-api' // MultipartRequestBody implementation 'org.apache.httpcomponents.core5:httpcore5' @@ -30,5 +30,4 @@ dependencies { // com.dialogue.annotations.MultipartRequestBody == okhttp.MultipartBody testImplementation 'com.squareup.okhttp3:okhttp' - implementation 'com.palantir.safe-logging:logger' } diff --git a/dialogue-apache-hc5-client/build.gradle b/dialogue-apache-hc5-client/build.gradle index 82f9177ed3..b355574570 100644 --- a/dialogue-apache-hc5-client/build.gradle +++ b/dialogue-apache-hc5-client/build.gradle @@ -7,6 +7,7 @@ dependencies { api 'com.palantir.conjure.java.runtime:client-config' api 'org.apache.httpcomponents.client5:httpclient5' implementation project(':dialogue-blocking-channels') + implementation 'com.palantir.safe-logging:logger' implementation 'com.palantir.safe-logging:preconditions' implementation 'com.palantir.tracing:tracing-api' implementation 'com.palantir.tritium:tritium-metrics' @@ -18,11 +19,9 @@ dependencies { implementation 'com.palantir.safe-logging:safe-logging' implementation 'io.dropwizard.metrics:metrics-core' implementation 'org.apache.httpcomponents.core5:httpcore5' - implementation 'org.slf4j:slf4j-api' testImplementation project(':dialogue-test-common') testImplementation project(':dialogue-serde') testImplementation 'org.awaitility:awaitility' testImplementation 'org.junit.jupiter:junit-jupiter' - implementation 'com.palantir.safe-logging:logger' } diff --git a/dialogue-blocking-channels/build.gradle b/dialogue-blocking-channels/build.gradle index 37b5359456..1013369fcd 100644 --- a/dialogue-blocking-channels/build.gradle +++ b/dialogue-blocking-channels/build.gradle @@ -7,15 +7,14 @@ dependencies { implementation project(':dialogue-futures') implementation 'com.palantir.tracing:tracing' implementation 'com.palantir.tritium:tritium-metrics' + implementation 'com.palantir.safe-logging:logger' implementation 'com.palantir.safe-logging:preconditions' implementation 'com.palantir.safe-logging:safe-logging' implementation 'com.palantir.tritium:tritium-registry' - implementation 'org.slf4j:slf4j-api' testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' testImplementation 'org.awaitility:awaitility' testImplementation project(':dialogue-test-common') - implementation 'com.palantir.safe-logging:logger' } diff --git a/dialogue-client-verifier/src/test/java/com/palantir/verification/AutoDeserializeTest.java b/dialogue-client-verifier/src/test/java/com/palantir/verification/AutoDeserializeTest.java index cfb8748ad2..65f8741432 100644 --- a/dialogue-client-verifier/src/test/java/com/palantir/verification/AutoDeserializeTest.java +++ b/dialogue-client-verifier/src/test/java/com/palantir/verification/AutoDeserializeTest.java @@ -21,6 +21,9 @@ import com.palantir.dialogue.com.palantir.conjure.verification.server.AutoDeserializeConfirmServiceBlocking; import com.palantir.dialogue.com.palantir.conjure.verification.server.AutoDeserializeServiceBlocking; import com.palantir.dialogue.com.palantir.conjure.verification.server.EndpointName; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; @@ -32,8 +35,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @RunWith(Parameterized.class) public class AutoDeserializeTest { @@ -41,7 +42,7 @@ public class AutoDeserializeTest { @ClassRule public static final VerificationServerRule server = new VerificationServerRule(); - private static final Logger log = LoggerFactory.getLogger(AutoDeserializeTest.class); + private static final SafeLogger log = SafeLoggerFactory.get(AutoDeserializeTest.class); private static final AutoDeserializeServiceBlocking testService = server.client(AutoDeserializeServiceBlocking.class); private static final AutoDeserializeConfirmServiceBlocking confirmService = @@ -120,7 +121,11 @@ public void runTestCase() throws Error, NoSuchMethodException { private Optional expectSuccess(Method method) { try { Object resultFromServer = method.invoke(testService, index); - log.info("Received result for endpoint {} and index {}: {}", endpointName, index, resultFromServer); + log.info( + "Received result for endpoint {} and index {}: {}", + SafeArg.of("endpointName", endpointName), + SafeArg.of("index", index), + SafeArg.of("resultFromServer", resultFromServer)); confirmService.confirm(endpointName, index, resultFromServer); return Optional.empty(); } catch (Exception e) { diff --git a/dialogue-client-verifier/src/test/java/com/palantir/verification/SingleParamServicesTest.java b/dialogue-client-verifier/src/test/java/com/palantir/verification/SingleParamServicesTest.java index f267e83412..5ac59ae0df 100644 --- a/dialogue-client-verifier/src/test/java/com/palantir/verification/SingleParamServicesTest.java +++ b/dialogue-client-verifier/src/test/java/com/palantir/verification/SingleParamServicesTest.java @@ -24,6 +24,9 @@ import com.palantir.dialogue.com.palantir.conjure.verification.server.SingleHeaderServiceBlocking; import com.palantir.dialogue.com.palantir.conjure.verification.server.SinglePathParamServiceBlocking; import com.palantir.dialogue.com.palantir.conjure.verification.server.SingleQueryParamServiceBlocking; +import com.palantir.logsafe.SafeArg; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -37,8 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @RunWith(Parameterized.class) public class SingleParamServicesTest { @@ -46,7 +47,7 @@ public class SingleParamServicesTest { @ClassRule public static final VerificationServerRule server = new VerificationServerRule(); - private static final Logger log = LoggerFactory.getLogger(SingleParamServicesTest.class); + private static final SafeLogger log = SafeLoggerFactory.get(SingleParamServicesTest.class); private static final ObjectMapper objectMapper = ObjectMappers.newClientObjectMapper(); private static ImmutableMap servicesMaps = ImmutableMap.of( "singlePathParamService", @@ -99,7 +100,11 @@ public static Collection data() { public void runTestCase() throws Exception { Assume.assumeFalse(Cases.shouldIgnore(endpointName, jsonString)); - log.info("Invoking {} {}({})", serviceName, endpointName, jsonString); + log.info( + "Invoking {} {}({})", + SafeArg.of("serviceName", serviceName), + SafeArg.of("endpointName", endpointName), + SafeArg.of("jsonString", jsonString)); Object service = servicesMaps.get(serviceName); for (Method method : servicesMaps.get(serviceName).getClass().getMethods()) { @@ -125,9 +130,15 @@ public void runTestCase() throws Exception { method.invoke(service, index, objectMapper.readValue(jsonString, cls)); } - log.info("Successfully post param to endpoint {} and index {}", endpointName, index); + log.info( + "Successfully post param to endpoint {} and index {}", + SafeArg.of("endpointName", endpointName), + SafeArg.of("index", index)); } catch (RemoteException e) { - log.error("Caught exception with params: {}", e.getError().parameters(), e); + log.error( + "Caught exception with params: {}", + SafeArg.of("errorParameters", e.getError().parameters()), + e); throw e; } } diff --git a/dialogue-clients/build.gradle b/dialogue-clients/build.gradle index 6749f6df9e..d679ad17ac 100644 --- a/dialogue-clients/build.gradle +++ b/dialogue-clients/build.gradle @@ -16,10 +16,10 @@ dependencies { implementation 'com.google.errorprone:error_prone_annotations' implementation 'com.google.guava:guava' implementation 'com.palantir.conjure.java.runtime:keystores' + implementation 'com.palantir.safe-logging:logger' implementation 'com.palantir.safe-logging:preconditions' implementation 'com.palantir.safe-logging:safe-logging' implementation 'com.palantir.tritium:tritium-registry' - implementation 'org.slf4j:slf4j-api' annotationProcessor 'org.immutables:value' compileOnly 'org.immutables:value::annotations' @@ -37,5 +37,4 @@ dependencies { testAnnotationProcessor 'org.immutables:value' testCompileOnly 'org.immutables:value::annotations' - implementation 'com.palantir.safe-logging:logger' } diff --git a/dialogue-core/build.gradle b/dialogue-core/build.gradle index b5713876a6..1bdb6f9002 100644 --- a/dialogue-core/build.gradle +++ b/dialogue-core/build.gradle @@ -8,7 +8,9 @@ dependencies { implementation project(':dialogue-futures') implementation 'com.github.ben-manes.caffeine:caffeine' implementation 'com.google.guava:guava' + implementation 'com.palantir.safe-logging:logger' implementation 'com.palantir.safe-logging:preconditions' + implementation 'com.palantir.safe-logging:safe-logging' implementation 'com.palantir.tracing:tracing' implementation 'io.dropwizard.metrics:metrics-core' implementation 'com.palantir.safethreadlocalrandom:safe-thread-local-random' @@ -16,9 +18,7 @@ dependencies { implementation 'com.google.code.findbugs:jsr305' implementation 'com.google.errorprone:error_prone_annotations' implementation 'com.palantir.conjure.java.api:service-config' - implementation 'com.palantir.safe-logging:safe-logging' implementation 'com.palantir.tracing:tracing-api' - implementation 'org.slf4j:slf4j-api' testImplementation 'com.palantir.tracing:tracing-test-utils' testImplementation 'com.palantir.safe-logging:preconditions-assertj' @@ -38,7 +38,6 @@ dependencies { testAnnotationProcessor 'org.immutables:value' testCompileOnly 'org.immutables:value::annotations' - implementation 'com.palantir.safe-logging:logger' } configurations.testCompileClasspath.exclude module: 'junit' // prefer junit5 diff --git a/dialogue-futures/build.gradle b/dialogue-futures/build.gradle index b8250143d4..fc6c342763 100644 --- a/dialogue-futures/build.gradle +++ b/dialogue-futures/build.gradle @@ -5,13 +5,12 @@ dependencies { api 'com.google.guava:guava' implementation 'com.google.code.findbugs:jsr305' implementation 'com.google.errorprone:error_prone_annotations' + implementation 'com.palantir.safe-logging:logger' implementation 'com.palantir.safe-logging:preconditions' - implementation 'org.slf4j:slf4j-api' testImplementation 'org.assertj:assertj-core' testImplementation 'org.assertj:assertj-guava' testImplementation 'org.mockito:mockito-core' testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.junit.jupiter:junit-jupiter-api' - implementation 'com.palantir.safe-logging:logger' } diff --git a/dialogue-serde/build.gradle b/dialogue-serde/build.gradle index f8a2784022..99d7af53f5 100644 --- a/dialogue-serde/build.gradle +++ b/dialogue-serde/build.gradle @@ -15,7 +15,6 @@ dependencies { implementation 'com.palantir.safethreadlocalrandom:safe-thread-local-random' implementation 'com.palantir.safe-logging:preconditions' implementation 'com.palantir.tracing:tracing' - implementation 'org.slf4j:slf4j-api' implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-core' implementation 'com.fasterxml.jackson.core:jackson-databind' @@ -23,6 +22,7 @@ dependencies { implementation 'com.google.errorprone:error_prone_annotations' implementation 'com.palantir.conjure.java.api:errors' implementation 'com.palantir.conjure.java:conjure-lib' + implementation 'com.palantir.safe-logging:logger' implementation 'com.palantir.safe-logging:safe-logging' implementation 'jakarta.ws.rs:jakarta.ws.rs-api' @@ -34,7 +34,6 @@ dependencies { testImplementation 'org.mockito:mockito-core' testImplementation 'com.palantir.safe-logging:preconditions-assertj' testImplementation 'org.apache.commons:commons-lang3' - implementation 'com.palantir.safe-logging:logger' } configurations.testCompileClasspath.exclude module: 'junit' // prefer junit5 diff --git a/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ErrorDecoder.java b/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ErrorDecoder.java index 34ce9c7a67..aaf3cd502b 100644 --- a/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ErrorDecoder.java +++ b/dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/ErrorDecoder.java @@ -32,6 +32,8 @@ import com.palantir.logsafe.SafeLoggable; import com.palantir.logsafe.UnsafeArg; import com.palantir.logsafe.exceptions.SafeExceptions; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -42,8 +44,6 @@ import java.time.Duration; import java.util.List; import java.util.Optional; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Extracts and returns a {@link RemoteException} from an {@link Response}. @@ -54,7 +54,7 @@ public enum ErrorDecoder { INSTANCE; - private static final Logger log = LoggerFactory.getLogger(ErrorDecoder.class); + private static final SafeLogger log = SafeLoggerFactory.get(ErrorDecoder.class); private static final ObjectMapper MAPPER = ObjectMappers.newClientObjectMapper(); public boolean isError(Response response) { @@ -63,7 +63,7 @@ public boolean isError(Response response) { public RuntimeException decode(Response response) { if (log.isDebugEnabled()) { - log.debug("Received an error response", diagnosticArgs(response).toArray(new Object[0])); + log.debug("Received an error response", diagnosticArgs(response)); } RuntimeException result = decodeInternal(response); result.addSuppressed(diagnostic(response)); diff --git a/dialogue-target/build.gradle b/dialogue-target/build.gradle index 02ee9f6549..06de1468f6 100644 --- a/dialogue-target/build.gradle +++ b/dialogue-target/build.gradle @@ -7,9 +7,8 @@ dependencies { api 'com.palantir.ri:resource-identifier' api 'com.palantir.conjure.java:conjure-lib' implementation 'com.palantir.safe-logging:preconditions' - implementation 'org.slf4j:slf4j-api' - implementation 'com.google.errorprone:error_prone_annotations' implementation 'com.palantir.safe-logging:safe-logging' + implementation 'com.google.errorprone:error_prone_annotations' implementation 'com.google.code.findbugs:jsr305' testImplementation 'jakarta.ws.rs:jakarta.ws.rs-api' diff --git a/versions.lock b/versions.lock index 114e9161e7..070aa9db34 100644 --- a/versions.lock +++ b/versions.lock @@ -30,11 +30,11 @@ com.palantir.conjure.java.runtime:keystores:7.10.0 (2 constraints: 5319f2db) com.palantir.goethe:goethe:0.2.0 (1 constraints: 0405f135) com.palantir.refreshable:refreshable:2.0.1 (2 constraints: e91893b1) com.palantir.ri:resource-identifier:1.3.0 (2 constraints: f1145cb6) -com.palantir.safe-logging:logger:1.17.0 (1 constraints: 3b053e3b) -com.palantir.safe-logging:logger-slf4j:1.17.0 (1 constraints: 340e9050) -com.palantir.safe-logging:logger-spi:1.17.0 (2 constraints: 771ed6b0) -com.palantir.safe-logging:preconditions:1.17.0 (14 constraints: 4ee77ee4) -com.palantir.safe-logging:safe-logging:1.17.0 (12 constraints: d8bb30ee) +com.palantir.safe-logging:logger:1.18.0 (1 constraints: 3c05413b) +com.palantir.safe-logging:logger-slf4j:1.18.0 (1 constraints: 350e9350) +com.palantir.safe-logging:logger-spi:1.18.0 (2 constraints: 791e0cb1) +com.palantir.safe-logging:preconditions:1.18.0 (14 constraints: 50e7dfe7) +com.palantir.safe-logging:safe-logging:1.18.0 (12 constraints: ddbb3af4) com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (1 constraints: 0305ee35) com.palantir.tokens:auth-tokens:3.10.0 (3 constraints: e4276661) com.palantir.tracing:tracing:4.23.0 (2 constraints: 5616060e) @@ -62,7 +62,7 @@ org.glassfish.jersey.core:jersey-common:2.31 (1 constraints: da04fa30) org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 3e103aa2) org.immutables:value:2.8.8 (1 constraints: 14051536) org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.3 (1 constraints: 0d10f991) -org.slf4j:slf4j-api:1.7.32 (12 constraints: e1b67cca) +org.slf4j:slf4j-api:1.7.32 (11 constraints: a3b19f12) [Test dependencies] com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.3 (2 constraints: ee13f781) @@ -71,7 +71,7 @@ com.google.auto.value:auto-value-annotations:1.7.4 (1 constraints: 640a29b9) com.google.code.findbugs:annotations:3.0.1 (1 constraints: 9e0aafc3) com.google.testing.compile:compile-testing:0.19 (1 constraints: de04f630) com.google.truth:truth:1.1 (1 constraints: b71111d7) -com.palantir.safe-logging:preconditions-assertj:1.17.0 (1 constraints: 3b053e3b) +com.palantir.safe-logging:preconditions-assertj:1.18.0 (1 constraints: 3c05413b) com.palantir.tracing:tracing-test-utils:4.23.0 (1 constraints: 3b05483b) com.spotify.dataenum:dataenum:1.3.2 (1 constraints: e91058c1) com.squareup.okhttp3:mockwebserver:3.13.1 (1 constraints: 3a053f3b) diff --git a/versions.props b/versions.props index d95789567b..5ec849745f 100644 --- a/versions.props +++ b/versions.props @@ -8,7 +8,7 @@ com.palantir.conjure.java.api:* = 2.19.0 com.palantir.conjure.java.runtime:* = 7.10.0 com.palantir.refreshable:* = 2.0.1 com.palantir.ri:resource-identifier = 1.3.0 -com.palantir.safe-logging:* = 1.17.0 +com.palantir.safe-logging:* = 1.18.0 com.palantir.safethreadlocalrandom:safe-thread-local-random = 0.1.0 com.palantir.tokens:auth-tokens = 3.10.0 com.palantir.tracing:* = 4.23.0