Merge pull request #8 from newrelic/version4Updates

Version4 updates

build.gradle

@@ -129,8 +129,8 @@ task createModule {
         jar {
           manifest {
             attributes 'Implementation-Title': 'PROJECT_GROUP.PROJECT_NAME'
-            attributes 'Implementation-Vendor': 'New Relic'
-            attributes 'Implementation-Vendor-Id': 'com.newrelic'
+            attributes 'Implementation-Vendor': 'New Relic Labs'
+            attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
             attributes 'Implementation-Version': 1.0
           }
         }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

micronaut-http-netty-4.1/build.gradle

@@ -0,0 +1,29 @@
+
+// Build.gradle generated for instrumentation module micronaut-http-netty
+
+apply plugin: 'java'
+
+targetCompatibility=JavaVersion.VERSION_17
+
+dependencies {
+   implementation 'io.micronaut:micronaut-http-netty:4.1.0'
+
+   // New Relic Java Agent dependencies
+   implementation 'com.newrelic.agent.java:newrelic-agent:7.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-api:7.4.0'
+   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   implementation fileTree(include: ['*.jar'], dir: '../test-lib')
+}
+
+jar {
+  manifest {
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.micronaut-http-netty'
+    attributes 'Implementation-Vendor': 'New Relic Labs'
+    attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
+    attributes 'Implementation-Version': 1.0
+  }
+}
+
+verifyInstrumentation {
+	passes 'io.micronaut:micronaut-http-netty:[4.1.0,)'
+}

micronaut-http-netty-4.1/src/main/java/io/micronaut/http/netty/reactive/HandlerPublisher.java

@@ -0,0 +1,7 @@
+package io.micronaut.http.netty.reactive;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+@SkipIfPresent
+public abstract class HandlerPublisher<T> {
+}

micronaut-http-netty-4.1/src/main/java/io/micronaut/http/netty/reactive/HandlerSubscriber.java

@@ -0,0 +1,25 @@
+package io.micronaut.http.netty.reactive;
+
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+
+@Weave
+public abstract class HandlerSubscriber<T> {
+
+	@Trace(dispatcher = true)
+	public void onComplete() {
+		Weaver.callOriginal();
+	}
+
+	public void onError(final Throwable error) {
+		NewRelic.noticeError(error);
+		Weaver.callOriginal();
+	}
+
+	@Trace(dispatcher = true)
+	 public void onNext(T t) {
+		 Weaver.callOriginal();
+	 }
+}

micronaut-http-netty-4.1/src/main/java/io/micronaut/http/netty/websocket/AbstractNettyWebSocketHandler.java

@@ -0,0 +1,35 @@
+package io.micronaut.http.netty.websocket;
+
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.weaver.MatchType;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+
+import io.micronaut.core.bind.BoundExecutable;
+import io.micronaut.inject.MethodExecutionHandle;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+
+@Weave(type = MatchType.BaseClass)
+public abstract class AbstractNettyWebSocketHandler {
+
+	@Trace(dispatcher = true)
+	protected void channelRead0(ChannelHandlerContext ctx, Object msg) {
+		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","NettyWebSocketHandler",getClass().getSimpleName(),"channelRead0");
+		Weaver.callOriginal();
+	}
+
+	@Trace(dispatcher = true)
+	protected void handleWebSocketFrame(ChannelHandlerContext ctx, WebSocketFrame msg) {
+		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","NettyWebSocketHandler",getClass().getSimpleName(),"handleWebSocketFrame");
+		Weaver.callOriginal();
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Trace(dispatcher = true)
+	protected Object invokeExecutable(BoundExecutable boundExecutable, MethodExecutionHandle<?, ?> messageHandler) {
+		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","NettyWebSocketHandler",getClass().getSimpleName(),"invokeExecutable");
+		return Weaver.callOriginal();
+	}
+}

micronaut-http-server-netty-2/src/main/java/com/newrelic/instrumentation/micronaut/netty/Utils.java → micronaut-http-server-netty-2/src/main/java/com/newrelic/instrumentation/micronaut/netty_2/Utils.java

@@ -1,4 +1,4 @@
-package com.newrelic.instrumentation.micronaut.netty;
+package com.newrelic.instrumentation.micronaut.netty_2;
 
 import java.util.HashMap;
 import java.util.Map;

micronaut-http-server-netty-2/src/main/java/io/micronaut/http/server/netty/RoutingInBoundHandler.java

@@ -3,7 +3,7 @@
 import com.newrelic.api.agent.Trace;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import com.newrelic.instrumentation.micronaut.netty.Utils;
+import com.newrelic.instrumentation.micronaut.netty_2.Utils;
 
 import io.micronaut.web.router.RouteMatch;
 import io.netty.channel.ChannelHandlerContext;

micronaut-http-server-netty-3/src/main/java/com/newrelic/instrumentation/micronaut/netty/Utils.java → micronaut-http-server-netty-3/src/main/java/com/newrelic/instrumentation/micronaut/netty_3/Utils.java

@@ -1,4 +1,4 @@
-package com.newrelic.instrumentation.micronaut.netty;
+package com.newrelic.instrumentation.micronaut.netty_3;
 
 import java.util.HashMap;
 import java.util.Map;

micronaut-http-server-netty-4.3/build.gradle

@@ -0,0 +1,32 @@
+
+// Build.gradle generated for instrumentation module micronaut-http-netty-2
+
+apply plugin: 'java'
+
+targetCompatibility=JavaVersion.VERSION_17
+
+dependencies {
+   implementation 'io.micronaut:micronaut-http-server-netty:4.3.0'
+   implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.11'
+
+   // New Relic Java Agent dependencies
+   implementation 'com.newrelic.agent.java:newrelic-agent:7.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-api:7.4.0'
+   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   implementation fileTree(include: ['*.jar'], dir: '../test-lib')
+}
+
+jar {
+  manifest {
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.micronaut-http-server-netty-4'
+    attributes 'Implementation-Vendor': 'New Relic Labs'
+    attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
+    attributes 'Implementation-Version': 1.0
+  }
+}
+
+verifyInstrumentation {
+  passes 'io.micronaut:micronaut-http-server-netty:[4.3.0,)'
+  excludeRegex '.*RC.'
+  excludeRegex '.*M.'
+}

micronaut-http-server-netty-4.3/src/main/java/com/newrelic/instrumentation/micronaut/netty_43/NRBiConsumerWrapper.java

@@ -0,0 +1,40 @@
+package com.newrelic.instrumentation.micronaut.netty_43;
+
+import java.util.function.BiConsumer;
+
+import com.newrelic.agent.bridge.AgentBridge;
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Token;
+import com.newrelic.api.agent.Trace;
+
+public class NRBiConsumerWrapper<R> implements BiConsumer<R, Throwable> {
+
+	BiConsumer<R, Throwable> delegate = null;
+	private Token token = null;
+	private static boolean isTransformed = false;
+
+	public NRBiConsumerWrapper(BiConsumer<R, Throwable> d, Token t) {
+		delegate = d;
+		token = t;
+		if(!isTransformed) {
+			AgentBridge.instrumentation.retransformUninstrumentedClass(getClass());
+			isTransformed = true;
+		}
+	}
+
+	@Override
+	@Trace(async = true)
+	public void accept(R t, Throwable u) {
+		if(token != null) {
+			token.linkAndExpire();
+			token = null;
+		}
+		if(u != null) {
+			NewRelic.noticeError(u);
+		}
+		if(delegate != null) {
+			delegate.accept(t, u);
+		}
+	}
+
+}

micronaut-http-server-netty-4.3/src/main/java/com/newrelic/instrumentation/micronaut/netty_43/Utils.java

@@ -0,0 +1,46 @@
+package com.newrelic.instrumentation.micronaut.netty_43;
+
+import java.util.Map;
+
+import io.micronaut.web.router.RouteMatch;
+
+public class Utils {
+
+	public static void decorateWithRoute(RouteMatch<?> routeMatch) {
+//		TracedMethod traced = NewRelic.getAgent().getTracedMethod();
+//		if(routeMatch instanceof BasicObjectRouteMatch) {
+//			BasicObjectRouteMatch objMatch = (BasicObjectRouteMatch)routeMatch;
+//			Class<?> declaringClass = objMatch.getDeclaringType();
+//			traced.setMetricName("Custom","Micronaut","Netty","Route","Object", declaringClass.getSimpleName());
+//			traced.addCustomAttribute("Declaring-Class", declaringClass.getName());
+//		} else if(routeMatch instanceof UriRouteMatch) {
+//			UriRouteMatch<?,?> uriRouteMatch = (UriRouteMatch<?, ?>)routeMatch;
+//			
+//			
+//			
+//			String uri = uriRouteMatch.getUri();
+//			UriMatchTemplate matchTemplate = uriRouteMatch.getRoute().getUriMatchTemplate();
+//			String pathString = matchTemplate != null ? matchTemplate.toPathString() : null;
+//			
+//			String uriTemplate = uriRouteMatch.toString();
+//			String methodName = uriRouteMatch.getMethodName();
+//			String name = uriRouteMatch.getName();
+//			
+//			HashMap<String, Object> attributes = new HashMap<String, Object>();
+//			addAttribute(attributes, "PathString", pathString);
+//			addAttribute(attributes, "Method-Name", methodName);
+//			addAttribute(attributes, "URI", uri);
+//			addAttribute(attributes, "URITemplate", uriTemplate);
+//			addAttribute(attributes, "Name", name);
+//			traced.addCustomAttributes(attributes);
+//			
+//			traced.setMetricName("Custom","Micronaut","Netty","Route","URI");
+//		}
+	}
+
+	public static void addAttribute(Map<String, Object> attributes, String key, Object value) {
+		if(attributes != null && key != null && !key.isEmpty() && value != null) {
+			attributes.put(key, value);
+		}
+	}
+}

micronaut-http-server-netty-4.3/src/main/java/io/micronaut/http/reactive/execution/ReactorExecutionFlowImpl.java

@@ -0,0 +1,39 @@
+package io.micronaut.http.reactive.execution;
+
+import java.util.function.BiConsumer;
+
+import org.reactivestreams.Publisher;
+
+import com.newrelic.api.agent.Token;
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.weaver.NewField;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+import com.newrelic.instrumentation.micronaut.netty_43.NRBiConsumerWrapper;
+
+import reactor.core.publisher.Mono;
+
+@Weave
+abstract class ReactorExecutionFlowImpl {
+
+	@NewField
+	protected Token token = null;
+
+    <K> ReactorExecutionFlowImpl(Publisher<K> value) {
+    }
+
+    <K> ReactorExecutionFlowImpl(Mono<K> value) {
+    }
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Trace(async = true)
+    public void onComplete(BiConsumer<? super Object, Throwable> fn) {
+		if(token != null) {
+			token.link();
+			NRBiConsumerWrapper wrapper = new NRBiConsumerWrapper(fn, token);
+			token = null;
+			fn = wrapper;
+		}
+		Weaver.callOriginal();
+    }
+}

micronaut-http-server-netty-4.3/src/main/java/io/micronaut/http/server/netty/AbstractHttpContentProcessor.java

@@ -0,0 +1,16 @@
+package io.micronaut.http.server.netty;
+
+import java.util.Collection;
+
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.weaver.MatchType;
+import com.newrelic.api.agent.weaver.Weave;
+
+import io.netty.buffer.ByteBufHolder;
+
+@Weave(type=MatchType.BaseClass)
+public abstract class AbstractHttpContentProcessor<T> {
+
+	@Trace(dispatcher = true)
+	protected abstract void onData(ByteBufHolder message, Collection<Object> out);
+}

micronaut-http-server-netty-4.3/src/main/java/io/micronaut/http/server/netty/RoutingInBoundHandler.java

@@ -0,0 +1,18 @@
+package io.micronaut.http.server.netty;
+
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+
+import io.micronaut.http.server.netty.body.ByteBody;
+import io.micronaut.http.server.netty.handler.PipeliningServerHandler;
+import io.netty.channel.ChannelHandlerContext;
+
+@Weave
+public abstract class RoutingInBoundHandler {
+
+	@Trace(dispatcher = true)
+	public void accept(ChannelHandlerContext ctx, io.netty.handler.codec.http.HttpRequest request, ByteBody body, PipeliningServerHandler.OutboundAccess outboundAccess) {
+		Weaver.callOriginal();
+	}
+}