Remove comments (#228)

pavolloffay · web-flow · commit 61dc21cf13e4 · 2021-01-12T11:54:01.000+01:00
* Remove commented code

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;

* Fix names

Signed-off-by: Pavol Loffay &lt;p.loffay@gmail.com&gt;
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyInstrumentationName.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyInstrumentationName.java
@@ -19,6 +19,6 @@
 public class NettyInstrumentationName {
   public static final String PRIMARY = "netty";
   public static final String[] OTHER = {
-    "netty-4.0", "ht", "netty", "netty-4.0-ht",
+    "netty-4.0", "ht", "netty-ht", "netty-4.0-ht",
   };
 }
diff --git a/instrumentation/netty/netty-4.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyTestServer.java b/instrumentation/netty/netty-4.0/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyTestServer.java
@@ -78,10 +78,6 @@ protected void initChannel(Channel ch) throws Exception {
                   ChannelHandler channelHandler = channelHandlerClass.newInstance();
                   pipeline.addLast(channelHandler);
                 }
-                //                pipeline.addLast(handlerList.toArray(new ChannelHandler[0]));
-                //                pipeline.addLast(new HttpServerCodec());
-                //                pipeline.addLast(new HttpRequestDecoder());
-                //                pipeline.addLast(new HttpResponseEncoder());
 
                 pipeline.addLast(
                     new SimpleChannelInboundHandler() {
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyInstrumentationName.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyInstrumentationName.java
@@ -19,6 +19,6 @@
 public class NettyInstrumentationName {
   public static final String PRIMARY = "netty";
   public static final String[] OTHER = {
-    "netty-4.1", "ht", "netty", "netty-4.1-ht",
+    "netty-4.1", "ht", "netty-ht", "netty-4.1-ht",
   };
 }
diff --git a/instrumentation/netty/netty-4.1/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyTestServer.java b/instrumentation/netty/netty-4.1/src/test/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyTestServer.java
@@ -78,10 +78,6 @@ protected void initChannel(Channel ch) throws Exception {
                   ChannelHandler channelHandler = channelHandlerClass.newInstance();
                   pipeline.addLast(channelHandler);
                 }
-                //                pipeline.addLast(handlerList.toArray(new ChannelHandler[0]));
-                //                pipeline.addLast(new HttpServerCodec());
-                //                pipeline.addLast(new HttpRequestDecoder());
-                //                pipeline.addLast(new HttpResponseEncoder());
 
                 pipeline.addLast(
                     new SimpleChannelInboundHandler() {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`public class NettyInstrumentationName {`
`20`	`20`	`public static final String PRIMARY = "netty";`
`21`	`21`	`public static final String[] OTHER = {`
`22`		`- "netty-4.0", "ht", "netty", "netty-4.0-ht",`
	`22`	`+ "netty-4.0", "ht", "netty-ht", "netty-4.0-ht",`
`23`	`23`	`};`
`24`	`24`	`}`