added external services and distributed tracing support

Author: dhilpipre

spring-cloud-gateway/build.gradle

@@ -26,11 +26,12 @@ jar {
 }
 
 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/src/main/java/com/newrelic/instrumentation/labs/spring/cloud/gw/FilteringWebHandler_Instrumentation.java

@@ -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/src/main/java/com/newrelic/instrumentation/labs/spring/cloud/gw/GatewayFilter_Instrumentation.java

@@ -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();
+		}
+	}
+
+}

spring-cloud-gateway/src/main/java/com/newrelic/instrumentation/labs/spring/cloud/gw/GlobalFilter_Instrumentation.java

@@ -0,0 +1,35 @@
+package com.newrelic.instrumentation.labs.spring.cloud.gw;
+
+import com.newrelic.api.agent.ExternalParameters;
+import com.newrelic.api.agent.Segment;
+
+public class NRHolder {
+
+	private Segment segment = null;
+	
+	public NRHolder(Segment seg) {
+		segment = seg;
+	}
+	
+	public boolean reportAsExternal(ExternalParameters params) {
+		if(segment != null) {
+			segment.reportAsExternal(params);
+			return true;
+		}
+		return false;
+	}
+	
+	public void ignore() {
+		if(segment != null) {
+			segment.ignore();
+			segment = null;
+		}
+	}
+	
+	public void end() {
+		if(segment != null) {
+			segment.end();
+			segment = null;
+		}
+	}
+}

spring-cloud-gateway/src/main/java/com/newrelic/instrumentation/labs/spring/cloud/gw/NRCompletionConsumer.java

@@ -0,0 +1,90 @@
+
+
+package com.newrelic.instrumentation.labs.spring.cloud.gw;
+
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
+
+import java.net.URI;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.web.server.ServerWebExchange;
+
+import com.newrelic.api.agent.HttpParameters;
+import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.isAlreadyRouted;
+
+public class SpringCloudUtils {
+	
+    private static final Pattern versionPattern = Pattern.compile("[vV][0-9]{1,}");
+    private static final Pattern idPattern = Pattern.compile("^(?=[^\\s]*?[0-9])[-{}().:_|0-9]+$");
+    private static final Pattern codPattern = Pattern.compile("^(?=[^\\s]*?[0-9])(?=[^\\s]*?[a-zA-Z])(?!\\{id\\}).*$");
+
+
+
+	public static void recordValue(Map<String,Object> attributes, String key, Object value) {
+		if(key != null && !key.isEmpty() && value != null) {
+			attributes.put(key, value);
+		}
+	}
+
+	public static HttpParameters getParams(ServerWebExchange exchange) {
+		try {
+			URI requestUrl = exchange.getRequiredAttribute(GATEWAY_REQUEST_URL_ATTR);
+			ServerHttpRequest request = exchange.getRequest();
+			HttpMethod method = request.getMethod();
+			HttpParameters params = HttpParameters.library("Spring-Cloud").uri(requestUrl).procedure(method.name()).noInboundHeaders().build();
+			return params;
+		} catch (Exception e) {
+		}
+		
+		return null;
+	}
+	
+	public static String getSimpliedPath(ServerWebExchange exchange)  {
+        String path = exchange.getRequest().getPath().value();
+
+        String simplifiedPath = path;
+
+        final String[] splitPath = path.split("/");
+
+        if (splitPath.length > 0) {
+            simplifiedPath = "";
+            for (String p : splitPath) {
+                if (versionPattern.matcher(p).matches()) {
+                    simplifiedPath = simplifiedPath.concat("/").concat(p.replaceAll(versionPattern.toString(), "{version}"));
+                } else if (idPattern.matcher(p).matches()) {
+                    simplifiedPath = simplifiedPath.concat("/").concat(p.replaceAll(idPattern.toString(), "{id}"));
+                } else if (codPattern.matcher(p).matches()) {
+                    simplifiedPath = simplifiedPath.concat("/").concat(p.replaceAll(codPattern.toString(), "{cod}"));
+                } else {
+                    simplifiedPath = simplifiedPath.concat("/").concat(p);
+                }
+            }
+        }
+
+		return simplifiedPath;
+	}
+	
+	public static boolean skip(ServerWebExchange exchange) {
+		URI requestUrl = exchange.getRequiredAttribute(GATEWAY_REQUEST_URL_ATTR);
+
+		String scheme = requestUrl.getScheme();
+		if (isAlreadyRouted(exchange) || (!"http".equals(scheme) && !"https".equals(scheme))) {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean skipWS(ServerWebExchange exchange) {
+		URI requestUrl = exchange.getRequiredAttribute(GATEWAY_REQUEST_URL_ATTR);
+
+		String scheme = requestUrl.getScheme();
+		if (isAlreadyRouted(exchange) || (!"ws".equals(scheme) && !"wss".equals(scheme))) {
+			return true;
+		}
+		return false;
+	}
+
+}

spring-cloud-gateway/src/main/java/com/newrelic/instrumentation/labs/spring/cloud/gw/NRErrorConsumer.java

@@ -0,0 +1,69 @@
+package com.newrelic.instrumentation.labs.spring.cloud.gw;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.http.HttpHeaders;
+
+import com.newrelic.api.agent.HeaderType;
+import com.newrelic.api.agent.Headers;
+
+public class SpringGatewayHeaders implements Headers {
+	
+	private HttpHeaders headers = null;
+	
+	public SpringGatewayHeaders(HttpHeaders h) {
+		headers = h;
+	}
+
+	@Override
+	public void addHeader(String name, String value) {
+		if(headers != null) {
+			headers.add(name, value);
+		}
+	}
+
+	@Override
+	public boolean containsHeader(String name) {
+		return getHeaderNames().contains(name);
+	}
+
+	@Override
+	public String getHeader(String name) {
+		if(headers != null) {
+			return headers.getFirst(name);
+		}
+		return null;
+	}
+
+	@Override
+	public Collection<String> getHeaderNames() {
+		if(headers != null) {
+			return headers.keySet();
+		}
+		return Collections.emptyList();
+	}
+
+	@Override
+	public HeaderType getHeaderType() {
+		return HeaderType.HTTP;
+	}
+
+	@Override
+	public Collection<String> getHeaders(String name) {
+		if(headers != null) {
+			return headers.get(name);
+		}
+		return null;
+	}
+
+	@Override
+	public void setHeader(String name, String value) {
+		if(headers != null) {
+			headers.set(name, value);
+		}
+	}
+
+}