Merge pull request #4 from newrelic-experimental/updates_12-24

Updates 12 24

Author: dhilpipre

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -1,2 +1,3 @@
 rootProject.name = 'java-instrumentation-template'
-include 'spring-cloud-gateway'
+include 'spring-cloud-gateway-reactive'
+include 'spring-cloud-gateway-mvc-4.1'

spring-cloud-gateway-mvc-4.1/build.gradle

@@ -0,0 +1,27 @@
+
+// Build.gradle generated for instrumentation module spring-cloud-gateway-mvc
+
+apply plugin: 'java'
+
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
+
+dependencies {
+	implementation 'org.springframework.cloud:spring-cloud-gateway-server-mvc:4.1.0'
+    implementation 'org.springframework:spring-webmvc:5.3.16'
+
+   implementation fileTree(include: ['*.jar'], dir: '../libs')
+}
+
+jar {
+  manifest {
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.spring-cloud-gateway-mvc-4.1'
+    attributes 'Implementation-Vendor': 'New Relic'
+    attributes 'Implementation-Vendor-Id': 'com.newrelic'
+    attributes 'Implementation-Version': 1.0
+  }
+}
+
+verifyInstrumentation {
+   passes 'org.springframework.cloud:spring-cloud-gateway-server-mvc:[4.1.0,)'
+}

spring-cloud-gateway-mvc-4.1/src/main/java/org/springframework/cloud/gateway/server/mvc/handler/HandlerFunctions.java

@@ -0,0 +1,45 @@
+package org.springframework.cloud.gateway.server.mvc.handler;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.web.servlet.function.ServerRequest;
+import org.springframework.web.servlet.function.ServerResponse;
+
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.TransactionNamePriority;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+
+@Weave
+public abstract class HandlerFunctions {
+
+	@Weave
+	static class LookupProxyExchangeHandlerFunction {
+		
+		private final URI uri = Weaver.callOriginal();
+		
+		@Trace
+		public ServerResponse handle(ServerRequest serverRequest) {
+			if(uri != null) {
+				String path = uri.getPath();
+				StringBuffer sb = new StringBuffer(path);
+				
+				Map<String, String> pathVars = serverRequest.pathVariables();
+				if(pathVars != null && !pathVars.isEmpty()) {
+					sb.append('?');
+					Set<String> keys = pathVars.keySet();
+					for(String key : keys) {
+						sb.append(key);
+						sb.append("=?");
+					}
+				}
+				NewRelic.getAgent().getTransaction().setTransactionName(TransactionNamePriority.FRAMEWORK_HIGH, false, "SoringGateway", "handle", sb.toString(),serverRequest.methodName());
+			}
+			
+			return Weaver.callOriginal();
+		}
+	}
+}

spring-cloud-gateway-mvc-4.1/src/main/java/org/springframework/cloud/gateway/server/mvc/handler/ProxyExchangeHandlerFunction.java

@@ -0,0 +1,25 @@
+package org.springframework.cloud.gateway.server.mvc.handler;
+
+import java.net.URI;
+
+import org.springframework.web.servlet.function.ServerRequest;
+import org.springframework.web.servlet.function.ServerResponse;
+
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.TracedMethod;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+
+@Weave
+public class ProxyExchangeHandlerFunction {
+
+	@Trace
+	public ServerResponse handle(ServerRequest serverRequest) {
+		URI uri = serverRequest.uri();
+		TracedMethod traced = NewRelic.getAgent().getTracedMethod();
+		traced.addCustomAttribute("RequestURI", uri.toASCIIString());
+		traced.addCustomAttribute("Method", serverRequest.methodName());
+		return Weaver.callOriginal();
+	}
+}

spring-cloud-gateway/build.gradle renamed to spring-cloud-gateway-reactive/build.gradle

@@ -18,19 +18,20 @@ dependencies {
 
 jar {
   manifest {
-    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.spring-cloud-gateway-core'
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.spring-cloud-gateway-reactive'
     attributes 'Implementation-Vendor': 'New Relic Labs'
     attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
     attributes 'Implementation-Version': 1.1
   }
 }
 
 verifyInstrumentation {
-  passes("org.springframework.cloud:spring-cloud-gateway-core:[2.2.6.RELEASE,)") {
-      compile 'org.springframework:spring-web:5.3.2'
-      compile 'org.springframework:spring-web:5.3.2'
-
-    }
+//  passes("org.springframework.cloud:spring-cloud-gateway-core:[2.2.6.RELEASE,)") {
+ //     compile 'org.springframework:spring-web:5.3.2'
 
+//    }
+  passes("org.springframework.cloud:spring-cloud-gateway-server:[2.2.6.RELEASE,)") {
+  		compile 'org.springframework:spring-web:5.3.2' 
+  }
 }
 

spring-cloud-gateway/lib/newrelic-api.jar renamed to spring-cloud-gateway-reactive/lib/newrelic-api.jar

@@ -0,0 +1,21 @@
+package com.newrelic.instrumentation.labs.spring.cloud.gw;
+
+import java.util.function.Consumer;
+
+public class NRCompletionConsumer implements Consumer<Void> {
+	
+	private NRHolder holder = null;
+	
+	public NRCompletionConsumer(NRHolder h) {
+		holder = h;
+	}
+	
+
+	@Override
+	public void accept(Void t) {
+		if(holder != null) {
+			holder.end();
+		}
+	}
+
+}

spring-cloud-gateway/lib/newrelic-weaver-api.jar renamed to spring-cloud-gateway-reactive/lib/newrelic-weaver-api.jar

@@ -0,0 +1,26 @@
+package com.newrelic.instrumentation.labs.spring.cloud.gw;
+
+import java.util.function.Consumer;
+
+import com.newrelic.api.agent.NewRelic;
+
+public class NRErrorConsumer implements Consumer<Throwable> {
+	
+	private NRHolder holder = null;
+	
+	public NRErrorConsumer(NRHolder h) {
+		holder = h;
+	}
+	
+
+	@Override
+	public void accept(Throwable t) {
+		if(t != null) {
+			NewRelic.noticeError(t);
+		}
+		if(holder != null) {
+			holder.ignore();
+		}
+	}
+
+}