From 7b0e3ffd1cf0f86744466505b7a3c77293922a4c Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Wed, 23 Jan 2019 22:19:22 -0500 Subject: [PATCH] netty 4.1: consolidate netty config names --- .../netty41/ChannelFutureListenerInstrumentation.java | 4 +++- .../netty41/NettyChannelPipelineInstrumentation.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index 1bc973940f..e7bb60b99d 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -27,7 +27,9 @@ import net.bytebuddy.matcher.ElementMatcher; public class ChannelFutureListenerInstrumentation extends Instrumenter.Default { public ChannelFutureListenerInstrumentation() { - super("netty", "netty-4.1"); + super( + NettyChannelPipelineInstrumentation.INSTRUMENTATION_NAME, + NettyChannelPipelineInstrumentation.ADDITIONAL_INSTRUMENTATION_NAMES); } @Override diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java index f0c5f59821..6f1005c958 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java @@ -40,8 +40,11 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(Instrumenter.class) public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { + static final String INSTRUMENTATION_NAME = "netty"; + static final String[] ADDITIONAL_INSTRUMENTATION_NAMES = {"netty-4.1"}; + public NettyChannelPipelineInstrumentation() { - super("netty", "netty-4.1"); + super(INSTRUMENTATION_NAME, ADDITIONAL_INSTRUMENTATION_NAMES); } @Override