From 12a2fce96dc989c396a3de289b56178ebe48ff66 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 19 Jul 2018 14:04:10 +1000 Subject: [PATCH] Upgrade java formatter version. --- .circleci/config.yml | 2 +- .../datadog/trace/agent/tooling/ExceptionHandlers.java | 9 ++++++--- .../java/datadog/trace/agent/tooling/Instrumenter.java | 4 +++- .../datadog/trace/agent/tooling/muzzle/Reference.java | 3 ++- .../src/lagomTest/java/EchoServiceImpl.java | 1 - .../classloaders/ClassLoaderInstrumentation.java | 3 ++- .../hystrix/HystrixCommandInstrumentation.java | 3 ++- .../jdbc/PreparedStatementInstrumentation.java | 3 ++- .../instrumentation/jdbc/StatementInstrumentation.java | 3 ++- .../kafka_clients/KafkaProducerInstrumentation.java | 2 +- .../lettuce/rx/LettuceFluxCreationAdvice.java | 3 ++- .../lettuce/rx/LettuceFluxTerminationRunnable.java | 3 ++- .../lettuce/rx/LettuceMonoCreationAdvice.java | 3 ++- .../trace/instrumentation/play/PlayInstrumentation.java | 3 ++- .../ratpack/RatpackHttpClientInstrumentation.java | 3 ++- .../instrumentation/ratpack/impl/WrappedRequestSpec.java | 2 +- .../src/main/java/datadog/trace/agent/TracingAgent.java | 3 ++- .../main/java/datadog/trace/agent/test/SpockRunner.java | 2 +- dd-trace-java.gradle | 2 +- .../src/main/java/datadog/opentracing/PendingTrace.java | 3 ++- .../trace/common/sampling/RateByServiceSampler.java | 1 - .../src/main/java/datadog/trace/common/util/Clock.java | 2 ++ gradle/checkstyle.gradle | 4 +++- 23 files changed, 43 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9eee3e469..c7b329b201 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: - run: name: Build Project - command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava check -x test -x traceAgentTest --build-cache --parallel --stacktrace --no-daemon --max-workers=4 + command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava check -x test -x latestDepTest -x traceAgentTest --build-cache --parallel --stacktrace --no-daemon --max-workers=4 - run: name: Collect Libs diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java index c898ce9a58..05475002f0 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ExceptionHandlers.java @@ -32,7 +32,8 @@ public class ExceptionHandlers { public Size apply(final MethodVisitor mv, final Implementation.Context context) { // writes the following bytecode: // try { - // org.slf4j.LoggerFactory.getLogger((Class)ExceptionLogger.class).debug("exception in instrumentation", t); + // org.slf4j.LoggerFactory.getLogger((Class)ExceptionLogger.class).debug("exception + // in instrumentation", t); // } catch (Throwable t2) { // } final Label logStart = new Label(); @@ -63,11 +64,13 @@ public class ExceptionHandlers { mv.visitLabel(logEnd); mv.visitJumpInsn(Opcodes.GOTO, handlerExit); - // if the runtime can't reach our ExceptionHandler or logger, silently eat the exception + // if the runtime can't reach our ExceptionHandler or logger, silently eat the + // exception mv.visitLabel(eatException); mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {"java/lang/Throwable"}); mv.visitInsn(Opcodes.POP); - // mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Throwable", "printStackTrace", "()V", false); + // mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Throwable", "printStackTrace", + // "()V", false); mv.visitLabel(handlerExit); mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null); diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java index 06f65dac34..14a7a62d82 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java @@ -90,7 +90,9 @@ public interface Instrumenter { JavaModule module, Class classBeingRedefined, ProtectionDomain protectionDomain) { - // Optimization: calling getInstrumentationMuzzle() inside this method prevents unnecessary loading of muzzle references during agentBuilder setup. + // Optimization: calling getInstrumentationMuzzle() inside this method + // prevents unnecessary loading of muzzle references during agentBuilder + // setup. final ReferenceMatcher muzzle = getInstrumentationMuzzle(); if (null != muzzle) { List mismatches = diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java index f8a2184a8f..27c006ef72 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/Reference.java @@ -120,7 +120,8 @@ public class Reference { private boolean onClasspath(final String className, final ClassLoader loader) { final String resourceName = Utils.getResourceName(className); return loader.getResource(resourceName) != null - // helper classes are not on the resource path because they are loaded with reflection (See HelperInjector) + // helper classes are not on the resource path because they are loaded with reflection (See + // HelperInjector) || (className.startsWith("datadog.trace.") && Utils.findLoadedClass(className, loader) != null) // bootstrap class diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java b/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java index 0825468748..9f75a55e0d 100644 --- a/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java +++ b/dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/java/EchoServiceImpl.java @@ -1,4 +1,3 @@ - import akka.NotUsed; import akka.stream.javadsl.Source; import com.lightbend.lagom.javadsl.api.ServiceCall; diff --git a/dd-java-agent/instrumentation/classloaders/src/main/java/datadog/trace/instrumentation/classloaders/ClassLoaderInstrumentation.java b/dd-java-agent/instrumentation/classloaders/src/main/java/datadog/trace/instrumentation/classloaders/ClassLoaderInstrumentation.java index 845bf8e5ae..396c5f70b4 100644 --- a/dd-java-agent/instrumentation/classloaders/src/main/java/datadog/trace/instrumentation/classloaders/ClassLoaderInstrumentation.java +++ b/dd-java-agent/instrumentation/classloaders/src/main/java/datadog/trace/instrumentation/classloaders/ClassLoaderInstrumentation.java @@ -59,7 +59,8 @@ public final class ClassLoaderInstrumentation extends Instrumenter.Default { field.setAccessible(true); final Object o = field.get(null); - // FIXME: This instrumentation will never work. Referencing class DDTracer will throw an exception. + // FIXME: This instrumentation will never work. Referencing class DDTracer will throw an + // exception. if (o instanceof DDTracer) { final DDTracer tracer = (DDTracer) o; tracer.registerClassLoader(cl); diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java index fa56b6261b..3458e1be52 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java @@ -27,7 +27,8 @@ public class HystrixCommandInstrumentation extends Instrumenter.Default { @Override public ElementMatcher typeMatcher() { - // Not adding a version restriction because this should work with any version and add some benefit. + // Not adding a version restriction because this should work with any version and add some + // benefit. return not(isInterface()).and(hasSuperType(named("com.netflix.hystrix.HystrixCommand"))); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java index afe4c22f14..96159ae57b 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java @@ -59,7 +59,8 @@ public final class PreparedStatementInstrumentation extends Instrumenter.Default Connection connection; try { connection = statement.getConnection(); - // unwrap the connection to cache the underlying actual connection and to not cache proxy objects + // unwrap the connection to cache the underlying actual connection and to not cache proxy + // objects if (connection.isWrapperFor(Connection.class)) { connection = connection.unwrap(Connection.class); } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index 81430ae510..a63a991b68 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -61,7 +61,8 @@ public final class StatementInstrumentation extends Instrumenter.Default { try { connection = statement.getConnection(); if (connection.isWrapperFor(Connection.class)) { - // unwrap the connection to cache the underlying actual connection and to not cache proxy objects + // unwrap the connection to cache the underlying actual connection and to not cache proxy + // objects connection = connection.unwrap(Connection.class); } } catch (final Throwable e) { diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index b31668ac69..8834ee89fe 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -98,7 +98,7 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Default { Format.Builtin.TEXT_MAP, new TextMapInjectAdapter(record.headers())); } catch (final IllegalStateException e) { - //headers must be read-only from reused record. try again with new one. + // headers must be read-only from reused record. try again with new one. record = new ProducerRecord<>( record.topic(), diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java index ad4015b3ef..f1335ef090 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java @@ -23,7 +23,8 @@ public class LettuceFluxCreationAdvice { LettuceFluxTerminationRunnable handler = new LettuceFluxTerminationRunnable(commandName, finishSpanOnClose); publisher = publisher.doOnSubscribe(handler.getOnSubscribeConsumer()); - // don't register extra callbacks to finish the spans if the command being instrumented is one of those that return + // don't register extra callbacks to finish the spans if the command being instrumented is one + // of those that return // Mono (In here a flux is created first and then converted to Mono) if (!finishSpanOnClose) { publisher = publisher.doOnEach(handler); diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java index 3f87174443..15ea8aa852 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java @@ -95,7 +95,8 @@ public class LettuceFluxTerminationRunnable implements Consumer, Runnabl Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT); Tags.COMPONENT.set(span, LettuceInstrumentationUtil.COMPONENT_NAME); - // should be command name only, but use workaround to prepend string to agent crashing commands + // should be command name only, but use workaround to prepend string to agent crashing + // commands span.setTag( DDTags.RESOURCE_NAME, LettuceInstrumentationUtil.getCommandResourceName(this.commandName)); diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java index 8e9828e0a3..1e60b11319 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java @@ -14,7 +14,8 @@ public class LettuceMonoCreationAdvice { return LettuceInstrumentationUtil.getCommandName(supplier.get()); } - // throwables wouldn't matter here, because no spans have been started due to redis command not being + // throwables wouldn't matter here, because no spans have been started due to redis command not + // being // run until the user subscribes to the Mono publisher @Advice.OnMethodExit(suppress = Throwable.class) public static void monitorSpan( diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java index e63a89063f..cc71390786 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java +++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java @@ -110,7 +110,8 @@ public final class PlayInstrumentation extends Instrumenter.Default { @Advice.Thrown final Throwable throwable, @Advice.Argument(0) final Request req, @Advice.Return(readOnly = false) Future responseFuture) { - // more about routes here: https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md + // more about routes here: + // https://github.com/playframework/playframework/blob/master/documentation/manual/releases/release26/migration26/Migration26.md final Option pathOption = req.tags().get("ROUTE_PATTERN"); if (!pathOption.isEmpty()) { final String path = (String) pathOption.get(); diff --git a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java index 5a022dde4c..b62f4ca880 100644 --- a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java/datadog/trace/instrumentation/ratpack/RatpackHttpClientInstrumentation.java @@ -28,7 +28,8 @@ public final class RatpackHttpClientInstrumentation extends Instrumenter.Default @Override protected boolean defaultEnabled() { - // FIXME: Injecting ContextualScopeManager is probably a bug. Verify and check all ratpack helpers before enabling. + // FIXME: Injecting ContextualScopeManager is probably a bug. Verify and check all ratpack + // helpers before enabling. return false; } diff --git a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java8/datadog/trace/instrumentation/ratpack/impl/WrappedRequestSpec.java b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java8/datadog/trace/instrumentation/ratpack/impl/WrappedRequestSpec.java index 960d779491..cb6b6b1172 100644 --- a/dd-java-agent/instrumentation/ratpack-1.4/src/main/java8/datadog/trace/instrumentation/ratpack/impl/WrappedRequestSpec.java +++ b/dd-java-agent/instrumentation/ratpack-1.4/src/main/java8/datadog/trace/instrumentation/ratpack/impl/WrappedRequestSpec.java @@ -41,7 +41,7 @@ public final class WrappedRequestSpec implements RequestSpec { * */ private Action redirectHandler(ReceivedResponse response) { - //handler.handleReceive(response.getStatusCode(), null, span.get()); + // handler.handleReceive(response.getStatusCode(), null, span.get()); return (s) -> new WrappedRequestSpec(s, tracer, scope, spanRef); } diff --git a/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java index c806cf3c3e..20dd6a2775 100644 --- a/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java +++ b/dd-java-agent/src/main/java/datadog/trace/agent/TracingAgent.java @@ -155,7 +155,8 @@ public class TracingAgent { private static ClassLoader getPlatformClassLoader() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { - // must invoke ClassLoader.getPlatformClassLoader by reflection to remain compatible with java 7 + 8. + // must invoke ClassLoader.getPlatformClassLoader by reflection to remain compatible with java 7 + // + 8. final Method method = ClassLoader.class.getDeclaredMethod("getPlatformClassLoader"); return (ClassLoader) method.invoke(null); } diff --git a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/SpockRunner.java b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/SpockRunner.java index 3c30d74261..40145485a0 100644 --- a/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/SpockRunner.java +++ b/dd-java-agent/testing/src/main/java/datadog/trace/agent/test/SpockRunner.java @@ -23,7 +23,7 @@ import org.spockframework.runtime.Sputnik; * Runs a spock test in an agent-friendly way. * *
    - *
  • Adds agent bootstrap classes to bootstrap classpath. + *
  • Adds agent bootstrap classes to bootstrap classpath. *
*/ public class SpockRunner extends Sputnik { diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle index 11c7c435ab..6b404bd459 100644 --- a/dd-trace-java.gradle +++ b/dd-trace-java.gradle @@ -13,7 +13,7 @@ buildscript { plugins { id 'com.gradle.build-scan' version '1.14' - id 'com.github.sherter.google-java-format' version '0.6' + id 'com.github.sherter.google-java-format' version '0.7.1' } def isCI = System.getenv("CI") != null diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/PendingTrace.java b/dd-trace-ot/src/main/java/datadog/opentracing/PendingTrace.java index aa44c123f1..dc22820c01 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/PendingTrace.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/PendingTrace.java @@ -31,7 +31,8 @@ public class PendingTrace extends ConcurrentLinkedDeque { private final DDTracer tracer; private final long traceId; - // TODO: consider moving these time fields into DDTracer to ensure that traces have precise relative time + // TODO: consider moving these time fields into DDTracer to ensure that traces have precise + // relative time /** Trace start time in nano seconds measured up to a millisecond accuracy */ private final long startTimeNano; /** Nano second ticks value at trace start */ diff --git a/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java index 0412527005..bad0b6f2f3 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/sampling/RateByServiceSampler.java @@ -1,4 +1,3 @@ - package datadog.trace.common.sampling; import com.fasterxml.jackson.databind.JsonNode; diff --git a/dd-trace-ot/src/main/java/datadog/trace/common/util/Clock.java b/dd-trace-ot/src/main/java/datadog/trace/common/util/Clock.java index dc48c00871..50b5db38f6 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/common/util/Clock.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/util/Clock.java @@ -14,7 +14,9 @@ import java.util.concurrent.TimeUnit; *

The JDK provides two clocks: *

  • one in nanoseconds, for precision, but it can only use to measure durations *
  • one in milliseconds, for accuracy, useful to provide epoch time + * *

    + * *

    At this time, we are using a millis precision (converted to micros) in order to guarantee * consistency between the span start times and the durations */ diff --git a/gradle/checkstyle.gradle b/gradle/checkstyle.gradle index fa0cd26d39..b0aad8d2bf 100644 --- a/gradle/checkstyle.gradle +++ b/gradle/checkstyle.gradle @@ -53,7 +53,9 @@ tasks.withType(Test) { apply plugin: 'com.github.sherter.google-java-format' googleJavaFormat { - exclude 'gradle-home' + source = sourceSets*.allJava + include '**/*.java' + exclude '**/build/**/*.java' } tasks.withType(Checkstyle) {