Skip to content

Commit e7f4d7f

Browse files
ValentinZakharovValentinZakharov
committed
Spotless
1 parent dabfe2d commit e7f4d7f

16 files changed

Lines changed: 87 additions & 107 deletions

File tree

‎dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,22 @@ public static void wrapHandler(
5454
MaybeBlockResponseHandler.class.getName(), new MaybeBlockResponseHandler(contextStore));
5555
} else if (handler instanceof WebSocketServerProtocolHandler) {
5656
if (pipeline.get(HttpServerTracingHandler.class) != null) {
57-
addHandlerAfter(pipeline,
57+
addHandlerAfter(
58+
pipeline,
5859
"datadog.trace.instrumentation.netty38.server.HttpServerTracingHandler",
5960
new WebSocketServerTracingHandler(contextStore));
6061
}
6162
} else if (handler instanceof WebSocket13FrameEncoder) {
6263
if (pipeline.get(HttpServerRequestTracingHandler.class) != null) {
63-
addHandlerAfter(pipeline,
64+
addHandlerAfter(
65+
pipeline,
6466
"datadog.trace.instrumentation.netty38.server.HttpServerRequestTracingHandler",
6567
new WebSocketServerRequestTracingHandler(contextStore));
6668
}
6769
} else if (handler instanceof WebSocket13FrameDecoder) {
6870
if (pipeline.get(HttpServerResponseTracingHandler.class) != null) {
69-
addHandlerAfter(pipeline,
71+
addHandlerAfter(
72+
pipeline,
7073
"datadog.trace.instrumentation.netty38.server.HttpServerResponseTracingHandler",
7174
new WebSocketServerResponseTracingHandler(contextStore));
7275
}
@@ -90,9 +93,7 @@ public static void wrapHandler(
9093
}
9194

9295
private static void addHandlerAfter(
93-
final ChannelPipeline pipeline,
94-
final String name,
95-
final ChannelHandler handler) {
96+
final ChannelPipeline pipeline, final String name, final ChannelHandler handler) {
9697
ChannelHandler existing = pipeline.get(handler.getClass());
9798
if (existing != null) {
9899
pipeline.remove(existing);

‎dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent m
5555
channelTraceContext.setSenderHandlerContext(new HandlerContext.Sender(span, channelId));
5656
}
5757
if (response.getStatus() != HttpResponseStatus.CONTINUE
58-
&& (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS || isWebsocketUpgrade)) {
58+
&& (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS
59+
|| isWebsocketUpgrade)) {
5960
DECORATE.onResponse(span, response);
6061
DECORATE.beforeFinish(span);
6162
span.finish(); // Finish the span manually since finishSpanOnClose was false

‎dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package datadog.trace.instrumentation.netty38.server.websocket;
22

3+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
4+
import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE;
5+
import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT;
6+
37
import datadog.trace.bootstrap.ContextStore;
4-
import datadog.trace.bootstrap.InstrumentationContext;
58
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
69
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
710
import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext;
@@ -10,17 +13,11 @@
1013
import org.jboss.netty.channel.ChannelHandlerContext;
1114
import org.jboss.netty.channel.MessageEvent;
1215
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
13-
import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
14-
import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
15-
import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
1616
import org.jboss.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
17+
import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
1718
import org.jboss.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
18-
19-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
20-
import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE;
21-
import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT;
22-
import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_BINARY;
23-
19+
import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
20+
import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
2421

2522
public class WebSocketServerRequestTracingHandler extends SimpleChannelUpstreamHandler {
2623

@@ -40,7 +37,6 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw
4037
ChannelTraceContext traceContext = this.contextStore.get(channel);
4138
if (traceContext != null) {
4239

43-
4440
HandlerContext.Receiver receiverContext = traceContext.getReceiverHandlerContext();
4541
if (receiverContext == null) {
4642
HandlerContext.Sender sessionState = traceContext.getSenderHandlerContext();
@@ -131,7 +127,6 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw
131127
return;
132128
}
133129
}
134-
135130
}
136131
}
137132

‎dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package datadog.trace.instrumentation.netty38.server.websocket;
22

3+
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
4+
import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE;
5+
import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_BINARY;
6+
import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT;
7+
38
import datadog.trace.bootstrap.ContextStore;
49
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
510
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
@@ -9,16 +14,11 @@
914
import org.jboss.netty.channel.ChannelHandlerContext;
1015
import org.jboss.netty.channel.MessageEvent;
1116
import org.jboss.netty.channel.SimpleChannelDownstreamHandler;
12-
import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
13-
import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
14-
import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
1517
import org.jboss.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
18+
import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
1619
import org.jboss.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
17-
18-
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
19-
import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE;
20-
import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_BINARY;
21-
import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT;
20+
import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
21+
import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
2222

2323
public class WebSocketServerResponseTracingHandler extends SimpleChannelDownstreamHandler {
2424

@@ -62,7 +62,9 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws
6262
BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
6363
final AgentSpan span =
6464
DECORATE.onSendFrameStart(
65-
handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.getBinaryData().readableBytes());
65+
handlerContext,
66+
MESSAGE_TYPE_BINARY,
67+
binaryFrame.getBinaryData().readableBytes());
6668
try (final AgentScope scope = activateSpan(span)) {
6769
ctx.sendDownstream(event);
6870
} finally {

‎dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77

88
public class WebSocketServerTracingHandler
99
extends CombinedSimpleChannelHandler<
10-
WebSocketServerRequestTracingHandler, WebSocketServerResponseTracingHandler> {
10+
WebSocketServerRequestTracingHandler, WebSocketServerResponseTracingHandler> {
1111

12-
public WebSocketServerTracingHandler(final ContextStore<Channel, ChannelTraceContext> contextStore) {
12+
public WebSocketServerTracingHandler(
13+
final ContextStore<Channel, ChannelTraceContext> contextStore) {
1314
super(
1415
new WebSocketServerRequestTracingHandler(contextStore),
1516
new WebSocketServerResponseTracingHandler(contextStore));

‎dd-java-agent/instrumentation/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ abstract class Netty38ServerTest extends HttpServerTest<ServerBootstrap> {
8181
channelPipeline.addLast("encoder", new HttpResponseEncoder())
8282
channelPipeline.addLast("aggregator", new HttpChunkAggregator(65536))
8383
channelPipeline.addLast("controller", new SimpleChannelHandler() {
84-
WebSocketServerHandshaker handshaker
84+
WebSocketServerHandshaker handshaker
8585

8686
@Override
8787
void messageReceived(ChannelHandlerContext ctx, MessageEvent msg) throws Exception {
@@ -180,7 +180,7 @@ abstract class Netty38ServerTest extends HttpServerTest<ServerBootstrap> {
180180
runUnderTrace("onRead", {})
181181
} else {
182182
throw new UnsupportedOperationException(String.format("%s frame types not supported", frame.getClass()
183-
.getName()))
183+
.getName()))
184184
}
185185
}
186186
}

‎dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public final class AttributeKeys {
2323

2424
public static final AttributeKey<AgentScope.Continuation>
2525
CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY =
26-
attributeKey("datadog.connect.parent.continuation");
26+
attributeKey("datadog.connect.parent.continuation");
2727

2828
public static final AttributeKey<HttpHeaders> REQUEST_HEADERS_ATTRIBUTE_KEY =
2929
attributeKey("datadog.server.request.headers");
@@ -34,8 +34,7 @@ public final class AttributeKeys {
3434
public static final AttributeKey<Boolean> BLOCKED_RESPONSE_KEY =
3535
new AttributeKey<>("datadog.server.blocked_response");
3636

37-
public static final AttributeKey<String> CHANNEL_ID =
38-
attributeKey("io.netty.channel.id");
37+
public static final AttributeKey<String> CHANNEL_ID = attributeKey("io.netty.channel.id");
3938

4039
public static final AttributeKey<HandlerContext.Sender> WEBSOCKET_SENDER_HANDLER_CONTEXT =
4140
attributeKey("datadog.server.websocket.sender.handler_context");

‎dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,7 @@ public static void addHandler(
152152
MaybeBlockResponseHandler.INSTANCE);
153153
} else if (handler instanceof HttpRequestDecoder) {
154154
NettyPipelineHelper.addHandlerAfter(
155-
pipeline,
156-
handler,
157-
HttpServerRequestTracingHandler.INSTANCE);
155+
pipeline, handler, HttpServerRequestTracingHandler.INSTANCE);
158156
} else if (handler instanceof HttpResponseEncoder) {
159157
NettyPipelineHelper.addHandlerAfter(
160158
pipeline,
@@ -163,37 +161,33 @@ public static void addHandler(
163161
MaybeBlockResponseHandler.INSTANCE);
164162
} else if (handler instanceof WebSocketServerProtocolHandler) {
165163
if (pipeline.get(HttpServerTracingHandler.class) != null) {
166-
NettyPipelineHelper.addHandlerAfter(pipeline,
164+
NettyPipelineHelper.addHandlerAfter(
165+
pipeline,
167166
"datadog.trace.instrumentation.netty40.server.HttpServerTracingHandler",
168167
new WebSocketServerTracingHandler());
169168
}
170169
if (pipeline.get(HttpRequestDecoder.class) != null) {
171-
NettyPipelineHelper.addHandlerAfter(pipeline,
170+
NettyPipelineHelper.addHandlerAfter(
171+
pipeline,
172172
"datadog.trace.instrumentation.netty40.server.HttpServerRequestTracingHandler",
173173
WebSocketServerRequestTracingHandler.INSTANCE);
174174
}
175175
if (pipeline.get(HttpResponseEncoder.class) != null) {
176-
NettyPipelineHelper.addHandlerAfter(pipeline,
176+
NettyPipelineHelper.addHandlerAfter(
177+
pipeline,
177178
"datadog.trace.instrumentation.netty40.server.HttpServerResponseTracingHandler",
178179
WebSocketServerResponseTracingHandler.INSTANCE);
179180
}
180181
} else
181182
// Client pipeline handlers
182183
if (handler instanceof HttpClientCodec) {
183-
NettyPipelineHelper.addHandlerAfter(
184-
pipeline,
185-
handler,
186-
new HttpClientTracingHandler());
184+
NettyPipelineHelper.addHandlerAfter(pipeline, handler, new HttpClientTracingHandler());
187185
} else if (handler instanceof HttpRequestEncoder) {
188186
NettyPipelineHelper.addHandlerAfter(
189-
pipeline,
190-
handler,
191-
HttpClientRequestTracingHandler.INSTANCE);
187+
pipeline, handler, HttpClientRequestTracingHandler.INSTANCE);
192188
} else if (handler instanceof HttpResponseDecoder) {
193189
NettyPipelineHelper.addHandlerAfter(
194-
pipeline,
195-
handler,
196-
HttpClientResponseTracingHandler.INSTANCE);
190+
pipeline, handler, HttpClientResponseTracingHandler.INSTANCE);
197191
}
198192
} catch (final IllegalArgumentException e) {
199193
// Prevented adding duplicate handlers.

‎dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
public class NettyPipelineHelper {
88
public static void addHandlerAfter(
9-
final ChannelPipeline pipeline,
10-
final String name,
11-
final ChannelHandler... toAdd) {
9+
final ChannelPipeline pipeline, final String name, final ChannelHandler... toAdd) {
1210
String targetHandlerName = name;
1311
for (ChannelHandler handler : toAdd) {
1412
ChannelHandler existing = pipeline.get(handler.getClass());
@@ -24,9 +22,7 @@ public static void addHandlerAfter(
2422
}
2523

2624
public static void addHandlerAfter(
27-
final ChannelPipeline pipeline,
28-
final ChannelHandler handler,
29-
final ChannelHandler... toAdd) {
25+
final ChannelPipeline pipeline, final ChannelHandler handler, final ChannelHandler... toAdd) {
3026
ChannelHandlerContext handlerContext = pipeline.context(handler);
3127
if (handlerContext != null) {
3228
String handlerName = handlerContext.name();

‎dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import io.netty.channel.ChannelPromise;
1616
import io.netty.handler.codec.http.HttpResponse;
1717
import io.netty.handler.codec.http.HttpResponseStatus;
18-
import io.netty.util.CharsetUtil;
19-
2018
import java.util.UUID;
2119

2220
@ChannelHandler.Sharable
@@ -48,13 +46,17 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann
4846
response.getStatus() == HttpResponseStatus.SWITCHING_PROTOCOLS
4947
&& "websocket".equals(response.headers().get(UPGRADE_HEADER));
5048
if (isWebsocketUpgrade) {
51-
String channelId = ctx.channel().attr(CHANNEL_ID).setIfAbsent(UUID.randomUUID().toString().substring(0, 8));
49+
String channelId =
50+
ctx.channel()
51+
.attr(CHANNEL_ID)
52+
.setIfAbsent(UUID.randomUUID().toString().substring(0, 8));
5253
ctx.channel()
5354
.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT)
5455
.set(new HandlerContext.Sender(span, channelId));
5556
}
5657
if (response.getStatus() != HttpResponseStatus.CONTINUE
57-
&& (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS || isWebsocketUpgrade)) {
58+
&& (response.getStatus() != HttpResponseStatus.SWITCHING_PROTOCOLS
59+
|| isWebsocketUpgrade)) {
5860
DECORATE.onResponse(span, response);
5961
DECORATE.beforeFinish(span);
6062
ctx.channel().attr(SPAN_ATTRIBUTE_KEY).remove();

0 commit comments

Comments
 (0)