From bcb282a220ea042813261c0a5c03ddb9ee48bba8 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 24 Jun 2021 00:53:23 -0700 Subject: [PATCH] Conform to google style guide checkstyle (#3399) --- .../{E2EAgentBenchmark.java => AgentBenchmark.java} | 4 ++-- gradle/enforcement/checkstyle.xml | 3 +-- .../instrumentation/api/tracer/HttpServerTracer.java | 10 +++++----- .../akkahttp/server/AkkaHttpServerTracer.java | 2 +- .../awslambda/v1_0/AwsLambdaMessageTracer.java | 2 +- .../awslambda/v1_0/ParentContextExtractor.java | 4 ++-- .../awslambda/v1_0/ApiGatewayProxyRequestTest.java | 2 +- .../grizzly/GrizzlyHttpServerTracer.java | 2 +- .../liberty/dispatcher/LibertyConnectionWrapper.java | 2 +- .../liberty/dispatcher/LibertyDispatcherTracer.java | 4 ++-- .../netty/v3_8/server/NettyHttpServerTracer.java | 2 +- .../netty/v4_0/server/NettyHttpServerTracer.java | 2 +- .../netty/v4_1/server/NettyHttpServerTracer.java | 2 +- .../src/test/groovy/WithSpanInstrumentationTest.groovy | 4 ++-- .../opentelemetry/test/annotation/TracedWithSpan.java | 2 +- .../servlet/ServletHttpServerTracer.java | 2 +- .../spring/webmvc/SpringWebMvcServerTracer.java | 2 +- .../instrumentation/tomcat/common/TomcatTracer.java | 6 +++--- .../undertow/UndertowHttpServerTracer.java | 2 +- 19 files changed, 29 insertions(+), 30 deletions(-) rename benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/{E2EAgentBenchmark.java => AgentBenchmark.java} (97%) diff --git a/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/E2EAgentBenchmark.java b/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java similarity index 97% rename from benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/E2EAgentBenchmark.java rename to benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java index 47634f2544..6eb35daf20 100644 --- a/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/E2EAgentBenchmark.java +++ b/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java @@ -24,7 +24,7 @@ import org.testcontainers.lifecycle.Startables; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; -public class E2EAgentBenchmark { +public class AgentBenchmark { private static final String APP_NAME = System.getenv() .getOrDefault( @@ -32,7 +32,7 @@ public class E2EAgentBenchmark { "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk8-20201204.400701583"); private List> containers; - private static final Logger LOG = LoggerFactory.getLogger(E2EAgentBenchmark.class); + private static final Logger LOG = LoggerFactory.getLogger(AgentBenchmark.class); // docker images private static final DockerImageName APP_IMAGE = DockerImageName.parse(APP_NAME); diff --git a/gradle/enforcement/checkstyle.xml b/gradle/enforcement/checkstyle.xml index 4a532b0ba2..1eaec1861c 100644 --- a/gradle/enforcement/checkstyle.xml +++ b/gradle/enforcement/checkstyle.xml @@ -261,8 +261,7 @@ --> - - + e } // fallback to peer IP if there are no proxy headers - return peerHostIP(connection); + return peerHostIp(connection); } // VisibleForTesting @@ -263,7 +263,7 @@ public abstract class HttpServerTracer e protected abstract Integer peerPort(CONNECTION connection); @Nullable - protected abstract String peerHostIP(CONNECTION connection); + protected abstract String peerHostIp(CONNECTION connection); protected abstract String flavor(CONNECTION connection, REQUEST request); diff --git a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java index a0a76dbe6d..249403b634 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java +++ b/instrumentation/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerTracer.java @@ -49,7 +49,7 @@ public class AkkaHttpServerTracer } @Override - protected String peerHostIP(HttpRequest httpRequest) { + protected String peerHostIp(HttpRequest httpRequest) { return null; } diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaMessageTracer.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaMessageTracer.java index 75ec49e5ff..826714b963 100644 --- a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaMessageTracer.java +++ b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/AwsLambdaMessageTracer.java @@ -71,7 +71,7 @@ public class AwsLambdaMessageTracer extends BaseTracer { String parentHeader = message.getAttributes().get(AWS_TRACE_HEADER_SQS_ATTRIBUTE_KEY); if (parentHeader != null) { SpanContext parentCtx = - Span.fromContext(ParentContextExtractor.fromXRayHeader(parentHeader)).getSpanContext(); + Span.fromContext(ParentContextExtractor.fromXrayHeader(parentHeader)).getSpanContext(); if (parentCtx.isValid()) { span.addLink(parentCtx); } diff --git a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java index 63f7e76b4b..9e9f18058b 100644 --- a/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java +++ b/instrumentation/aws-lambda-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambda/v1_0/ParentContextExtractor.java @@ -25,7 +25,7 @@ public final class ParentContextExtractor { Context parentContext = null; String parentTraceHeader = System.getenv(AWS_TRACE_HEADER_ENV_KEY); if (parentTraceHeader != null) { - parentContext = fromXRayHeader(parentTraceHeader); + parentContext = fromXrayHeader(parentTraceHeader); } if (!isValidAndSampled(parentContext)) { // try http @@ -50,7 +50,7 @@ public final class ParentContextExtractor { // lower-case map getter used for extraction static final String AWS_TRACE_HEADER_PROPAGATOR_KEY = "x-amzn-trace-id"; - static Context fromXRayHeader(String parentHeader) { + static Context fromXrayHeader(String parentHeader) { return AwsXrayPropagator.getInstance() .extract( // see BaseTracer#extract() on why we're using root() here diff --git a/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java b/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java index 04832becf9..ceb0afe876 100644 --- a/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java +++ b/instrumentation/aws-lambda-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambda/v1_0/ApiGatewayProxyRequestTest.java @@ -44,7 +44,7 @@ class ApiGatewayProxyRequestTest { } @Test - public void shouldCreateNoopRequestIfXRayPropagatorsSet() throws IOException { + public void shouldCreateNoopRequestIfXrayPropagatorsSet() throws IOException { // given InputStream mock = mock(InputStream.class); GlobalOpenTelemetry.set( diff --git a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java index 87578c5d81..47060259f2 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java +++ b/instrumentation/grizzly-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/GrizzlyHttpServerTracer.java @@ -74,7 +74,7 @@ public class GrizzlyHttpServerTracer } @Override - protected String peerHostIP(HttpRequestPacket httpRequest) { + protected String peerHostIp(HttpRequestPacket httpRequest) { return httpRequest.getRemoteAddress(); } diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyConnectionWrapper.java b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyConnectionWrapper.java index 24132c2a74..4141a28b5f 100644 --- a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyConnectionWrapper.java +++ b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyConnectionWrapper.java @@ -22,7 +22,7 @@ public class LibertyConnectionWrapper { return httpDispatcherLink.getRemotePort(); } - public String peerHostIP() { + public String peerHostIp() { return httpDispatcherLink.getRemoteHostAddress(); } diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java index 55db583517..d36af0fdb0 100644 --- a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java +++ b/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherTracer.java @@ -37,8 +37,8 @@ public class LibertyDispatcherTracer @Override @Nullable - protected String peerHostIP(LibertyConnectionWrapper libertyConnectionWrapper) { - return libertyConnectionWrapper.peerHostIP(); + protected String peerHostIp(LibertyConnectionWrapper libertyConnectionWrapper) { + return libertyConnectionWrapper.peerHostIp(); } @Override diff --git a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java index 6f2d3a4939..bbecdde3ac 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java +++ b/instrumentation/netty/netty-3.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/server/NettyHttpServerTracer.java @@ -61,7 +61,7 @@ public class NettyHttpServerTracer } @Override - protected String peerHostIP(Channel channel) { + protected String peerHostIp(Channel channel) { SocketAddress socketAddress = channel.getRemoteAddress(); if (socketAddress instanceof InetSocketAddress) { return ((InetSocketAddress) socketAddress).getAddress().getHostAddress(); diff --git a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java index 6958490d2b..b4d493fe84 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java +++ b/instrumentation/netty/netty-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/server/NettyHttpServerTracer.java @@ -72,7 +72,7 @@ public class NettyHttpServerTracer } @Override - protected String peerHostIP(Channel channel) { + protected String peerHostIp(Channel channel) { SocketAddress socketAddress = channel.remoteAddress(); if (socketAddress instanceof InetSocketAddress) { return ((InetSocketAddress) socketAddress).getAddress().getHostAddress(); diff --git a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java index 0eec443961..0e4cb6f9b7 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java +++ b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/server/NettyHttpServerTracer.java @@ -72,7 +72,7 @@ public class NettyHttpServerTracer } @Override - protected String peerHostIP(Channel channel) { + protected String peerHostIp(Channel channel) { SocketAddress socketAddress = channel.remoteAddress(); if (socketAddress instanceof InetSocketAddress) { return ((InetSocketAddress) socketAddress).getAddress().getHostAddress(); diff --git a/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/groovy/WithSpanInstrumentationTest.groovy b/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/groovy/WithSpanInstrumentationTest.groovy index 44d74838bb..8166cf7f80 100644 --- a/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/groovy/WithSpanInstrumentationTest.groovy +++ b/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/groovy/WithSpanInstrumentationTest.groovy @@ -66,13 +66,13 @@ class WithSpanInstrumentationTest extends AgentInstrumentationSpecification { def "should take span kind from annotation"() { setup: - new TracedWithSpan().oneOfAKind() + new TracedWithSpan().someKind() expect: assertTraces(1) { trace(0, 1) { span(0) { - name "TracedWithSpan.oneOfAKind" + name "TracedWithSpan.someKind" kind PRODUCER hasNoParent() attributes { diff --git a/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/TracedWithSpan.java b/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/TracedWithSpan.java index 8cfc2c5986..bad95dfa9a 100644 --- a/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/TracedWithSpan.java +++ b/instrumentation/opentelemetry-annotations-1.0/javaagent/src/test/java/io/opentelemetry/test/annotation/TracedWithSpan.java @@ -28,7 +28,7 @@ public class TracedWithSpan { } @WithSpan(kind = SpanKind.PRODUCER) - public String oneOfAKind() { + public String someKind() { return "hello!"; } diff --git a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java index 4cfbb077c9..4860b4bbd8 100644 --- a/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java +++ b/instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/ServletHttpServerTracer.java @@ -127,7 +127,7 @@ public abstract class ServletHttpServerTracer } @Override - protected String peerHostIP(REQUEST connection) { + protected String peerHostIp(REQUEST connection) { return accessor.getRequestRemoteAddr(connection); } diff --git a/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java b/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java index 21f0a15907..58cc54a6bd 100644 --- a/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java +++ b/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java @@ -27,7 +27,7 @@ class SpringWebMvcServerTracer } @Override - protected String peerHostIP(HttpServletRequest request) { + protected String peerHostIp(HttpServletRequest request) { return request.getRemoteAddr(); } diff --git a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatTracer.java b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatTracer.java index d53eb19561..06c9d76054 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatTracer.java +++ b/instrumentation/tomcat/tomcat-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/common/TomcatTracer.java @@ -63,7 +63,7 @@ public abstract class TomcatTracer extends HttpServerTracer