open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable checkstyle type var naming rule (#1666)

This commit is contained in:
Trask Stalnaker 2020-11-19 11:00:31 -08:00 committed by GitHub
parent a4e6d9322d
commit d183692699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gradle/enforcement/checkstyle.xml
View File

@ -216,25 +216,23 @@
<message key="name.invalidPattern" <message key="name.invalidPattern"
value="Pattern variable name ''{0}'' must match pattern ''{1}''."/> value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
</module> </module>
<!--
<module name="ClassTypeParameterName"> <module name="ClassTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> <!-- modified from default Google Java Style -->
<property name="format" value="^[A-Z]+[0-9]?$"/>
<message key="name.invalidPattern" <message key="name.invalidPattern"
value="Class type name ''{0}'' must match pattern ''{1}''."/> value="Class type name ''{0}'' must match pattern ''{1}''."/>
</module> </module>
-->
<module name="RecordTypeParameterName"> <module name="RecordTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern" <message key="name.invalidPattern"
value="Record type name ''{0}'' must match pattern ''{1}''."/> value="Record type name ''{0}'' must match pattern ''{1}''."/>
</module> </module>
<!--
<module name="MethodTypeParameterName"> <module name="MethodTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> <!-- modified from default Google Java Style -->
<property name="format" value="^[A-Z]+[0-9]?$"/>
<message key="name.invalidPattern" <message key="name.invalidPattern"
value="Method type name ''{0}'' must match pattern ''{1}''."/> value="Method type name ''{0}'' must match pattern ''{1}''."/>
</module> </module>
-->
<module name="InterfaceTypeParameterName"> <module name="InterfaceTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/> <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern" <message key="name.invalidPattern"

4
instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/TracingCqlSession.java
View File

@ -165,8 +165,8 @@ public class TracingCqlSession implements CqlSession {
@Override @Override
@Nullable @Nullable
public <RequestT extends Request, ResultT> ResultT execute( public <REQUEST extends Request, RESULT> RESULT execute(
@NonNull RequestT request, @NonNull GenericType<ResultT> resultType) { @NonNull REQUEST request, @NonNull GenericType<RESULT> resultType) {
return session.execute(request, resultType); return session.execute(request, resultType);
} }

27
instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/client/TracingClientInterceptor.java
View File

@ -51,13 +51,13 @@ public class TracingClientInterceptor implements ClientInterceptor {
} }
@Override @Override
public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall( public <REQUEST, RESPONSE> ClientCall<REQUEST, RESPONSE> interceptCall(
MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) { MethodDescriptor<REQUEST, RESPONSE> method, CallOptions callOptions, Channel next) {
String methodName = method.getFullMethodName(); String methodName = method.getFullMethodName();
Span span = tracer.startSpan(methodName); Span span = tracer.startSpan(methodName);
GrpcHelper.prepareSpan(span, methodName); GrpcHelper.prepareSpan(span, methodName);
Context context = Context.current().with(span); Context context = Context.current().with(span);
final ClientCall<ReqT, RespT> result; final ClientCall<REQUEST, RESPONSE> result;
try (Scope ignored = context.makeCurrent()) { try (Scope ignored = context.makeCurrent()) {
try { try {
// call other interceptors // call other interceptors
@ -77,15 +77,18 @@ public class TracingClientInterceptor implements ClientInterceptor {
return new TracingClientCall<>(result, span, context, tracer); return new TracingClientCall<>(result, span, context, tracer);
} }
static final class TracingClientCall<ReqT, RespT> static final class TracingClientCall<REQUEST, RESPONSE>
extends ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT> { extends ForwardingClientCall.SimpleForwardingClientCall<REQUEST, RESPONSE> {
private final Span span; private final Span span;
private final Context context; private final Context context;
private final GrpcClientTracer tracer; private final GrpcClientTracer tracer;
TracingClientCall( TracingClientCall(
ClientCall<ReqT, RespT> delegate, Span span, Context context, GrpcClientTracer tracer) { ClientCall<REQUEST, RESPONSE> delegate,
Span span,
Context context,
GrpcClientTracer tracer) {
super(delegate); super(delegate);
this.span = span; this.span = span;
this.context = context; this.context = context;
@ -93,7 +96,7 @@ public class TracingClientInterceptor implements ClientInterceptor {
} }
@Override @Override
public void start(Listener<RespT> responseListener, Metadata headers) { public void start(Listener<RESPONSE> responseListener, Metadata headers) {
OpenTelemetry.getGlobalPropagators().getTextMapPropagator().inject(context, headers, SETTER); OpenTelemetry.getGlobalPropagators().getTextMapPropagator().inject(context, headers, SETTER);
try (Scope ignored = span.makeCurrent()) { try (Scope ignored = span.makeCurrent()) {
super.start(new TracingClientCallListener<>(responseListener, span, tracer), headers); super.start(new TracingClientCallListener<>(responseListener, span, tracer), headers);
@ -104,7 +107,7 @@ public class TracingClientInterceptor implements ClientInterceptor {
} }
@Override @Override
public void sendMessage(ReqT message) { public void sendMessage(REQUEST message) {
try (Scope ignored = span.makeCurrent()) { try (Scope ignored = span.makeCurrent()) {
super.sendMessage(message); super.sendMessage(message);
} catch (Throwable e) { } catch (Throwable e) {
@ -114,21 +117,21 @@ public class TracingClientInterceptor implements ClientInterceptor {
} }
} }
static final class TracingClientCallListener<RespT> static final class TracingClientCallListener<RESPONSE>
extends ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT> { extends ForwardingClientCallListener.SimpleForwardingClientCallListener<RESPONSE> {
private final Span span; private final Span span;
private final GrpcClientTracer tracer; private final GrpcClientTracer tracer;
private final AtomicLong messageId = new AtomicLong(); private final AtomicLong messageId = new AtomicLong();
TracingClientCallListener(Listener<RespT> delegate, Span span, GrpcClientTracer tracer) { TracingClientCallListener(Listener<RESPONSE> delegate, Span span, GrpcClientTracer tracer) {
super(delegate); super(delegate);
this.span = span; this.span = span;
this.tracer = tracer; this.tracer = tracer;
} }
@Override @Override
public void onMessage(RespT message) { public void onMessage(RESPONSE message) {
Attributes attributes = Attributes attributes =
Attributes.of( Attributes.of(
GrpcHelper.MESSAGE_TYPE, "SENT", GrpcHelper.MESSAGE_ID, messageId.incrementAndGet()); GrpcHelper.MESSAGE_TYPE, "SENT", GrpcHelper.MESSAGE_ID, messageId.incrementAndGet());

20
instrumentation/grpc-1.5/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_5/server/TracingServerInterceptor.java
View File

@ -46,8 +46,10 @@ public class TracingServerInterceptor implements ServerInterceptor {
} }
@Override @Override
public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall( public <REQUEST, RESPONSE> ServerCall.Listener<REQUEST> interceptCall(
ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) { ServerCall<REQUEST, RESPONSE> call,
Metadata headers,
ServerCallHandler<REQUEST, RESPONSE> next) {
String methodName = call.getMethodDescriptor().getFullMethodName(); String methodName = call.getMethodDescriptor().getFullMethodName();
Span span = tracer.startSpan(methodName, headers); Span span = tracer.startSpan(methodName, headers);
@ -72,12 +74,12 @@ public class TracingServerInterceptor implements ServerInterceptor {
} }
} }
static final class TracingServerCall<ReqT, RespT> static final class TracingServerCall<REQUEST, RESPONSE>
extends ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT> { extends ForwardingServerCall.SimpleForwardingServerCall<REQUEST, RESPONSE> {
private final Span span; private final Span span;
private final GrpcServerTracer tracer; private final GrpcServerTracer tracer;
TracingServerCall(ServerCall<ReqT, RespT> delegate, Span span, GrpcServerTracer tracer) { TracingServerCall(ServerCall<REQUEST, RESPONSE> delegate, Span span, GrpcServerTracer tracer) {
super(delegate); super(delegate);
this.span = span; this.span = span;
this.tracer = tracer; this.tracer = tracer;
@ -95,21 +97,21 @@ public class TracingServerInterceptor implements ServerInterceptor {
} }
} }
static final class TracingServerCallListener<ReqT> static final class TracingServerCallListener<REQUEST>
extends ForwardingServerCallListener.SimpleForwardingServerCallListener<ReqT> { extends ForwardingServerCallListener.SimpleForwardingServerCallListener<REQUEST> {
private final Span span; private final Span span;
private final GrpcServerTracer tracer; private final GrpcServerTracer tracer;
private final AtomicLong messageId = new AtomicLong(); private final AtomicLong messageId = new AtomicLong();
TracingServerCallListener(Listener<ReqT> delegate, Span span, GrpcServerTracer tracer) { TracingServerCallListener(Listener<REQUEST> delegate, Span span, GrpcServerTracer tracer) {
super(delegate); super(delegate);
this.span = span; this.span = span;
this.tracer = tracer; this.tracer = tracer;
} }
@Override @Override
public void onMessage(ReqT message) { public void onMessage(REQUEST message) {
// TODO(anuraaga): Restore // TODO(anuraaga): Restore
Attributes attributes = Attributes attributes =
Attributes.of( Attributes.of(

10
instrumentation/netty/netty-3.8/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/util/CombinedSimpleChannelHandler.java
View File

@ -17,14 +17,14 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.jboss.netty.channel.WriteCompletionEvent; import org.jboss.netty.channel.WriteCompletionEvent;
public class CombinedSimpleChannelHandler< public class CombinedSimpleChannelHandler<
Upstream extends SimpleChannelUpstreamHandler, UPSTREAM extends SimpleChannelUpstreamHandler,
Downstream extends SimpleChannelDownstreamHandler> DOWNSTREAM extends SimpleChannelDownstreamHandler>
extends SimpleChannelHandler { extends SimpleChannelHandler {
private final Upstream upstream; private final UPSTREAM upstream;
private final Downstream downstream; private final DOWNSTREAM downstream;
public CombinedSimpleChannelHandler(Upstream upstream, Downstream downstream) { public CombinedSimpleChannelHandler(UPSTREAM upstream, DOWNSTREAM downstream) {
this.upstream = upstream; this.upstream = upstream;
this.downstream = downstream; this.downstream = downstream;
} }