Merge pull request #6 from newrelic-experimental/quarkus-enhancement

Quarkus enhancement
newrelic-experimental · Aug 26, 2024 · dc925d7 · dc925d7
2 parents bca2b23 + e108ca0
commit dc925d7
Show file tree

Hide file tree

Showing 50 changed files with 3,084 additions and 127 deletions.
diff --git a/quarkus-resteasy-2.0/src/main/java/com/newrelic/instrumentation/quarkus/resteasy/Utils.java b/quarkus-resteasy-2.0/src/main/java/com/newrelic/instrumentation/quarkus/resteasy/Utils.java
@@ -2,22 +2,53 @@
 
 import java.util.Map;
 
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.TransactionNamePriority;
+
 import io.vertx.ext.web.Route;
+import io.vertx.ext.web.RoutingContext;
 
 public class Utils {
 
-	public static final String NEWRELIC_TOKEN = "NewRelic-Token";
-
-	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);
-		}
+    public static final String NEWRELIC_TOKEN = "NewRelic-Token";
+
+    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);
+	}
+    }
+
+    public static void addRoute(Map<String, Object> attributes, Route route) {
+	if (route != null) {
+	    addAttribute(attributes, "Route-Name", route.getName());
+	    addAttribute(attributes, "Route-Path", route.getPath());
+	}
+    }
+
+    public static void setTransactionName(Map<String, Object> attributes, Route route) {
+	if (route != null) {
+	    addAttribute(attributes, "Route-Name", route.getName());
+	    addAttribute(attributes, "Route-Path", route.getPath());
+	}
+    }
+
+    public static void setTransactionName(RoutingContext request) {
+	String name = " ";
+	String route = request.currentRoute().getName();
+	if (route != null & route.length() > 0) {
+	    name += route;
 	}
-
-	public static void addRoute(Map<String, Object> attributes, Route route) {
-		if(route != null) {
-			addAttribute(attributes, "Route-Name", route.getName());
-			addAttribute(attributes, "Route-Path", route.getPath());
-		}
+	String path = request.currentRoute().getPath();
+	if (path != null & path.length() > 0) {
+	    name += ":" + path;
 	}
+	String method = request.request().method().name();
+	if (method != null & method.length() > 0) {
+	    name += " (" + method + ")";
+	}
+	System.out.println(name);
+	NewRelic.getAgent().getTransaction().setTransactionName(TransactionNamePriority.FRAMEWORK_LOW, false, "Quarkus",
+		"resteasy", name);
+
+    }
 }
diff --git a/...-resteasy-2.0/src/main/java/io/quarkus/resteasy/runtime/standalone/RequestDispatcher.java b/...-resteasy-2.0/src/main/java/io/quarkus/resteasy/runtime/standalone/RequestDispatcher.java
@@ -14,11 +14,9 @@
 @Weave
 public abstract class RequestDispatcher {
 
-	@Trace
-	public void service(Context context,
-            HttpServerRequest req,
-            HttpServerResponse resp,
-            HttpRequest vertxReq, HttpResponse vertxResp, boolean handleNotFound) {
-		Weaver.callOriginal();
-	}
+    @Trace
+    public void service(Context context, HttpServerRequest req, HttpServerResponse resp, HttpRequest vertxReq,
+	    HttpResponse vertxResp, boolean handleNotFound) {
+	Weaver.callOriginal();
+    }
 }
diff --git a/...esteasy-2.0/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java b/...esteasy-2.0/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java
@@ -14,23 +14,24 @@
 @Weave
 public class VertxRequestHandler {
 
-	@Trace
-	public void handle(RoutingContext request) {
-		HashMap<String, Object> attributes = new HashMap<String, Object>();
-		Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", request.normalizedPath());
-		Utils.addRoute(attributes, request.currentRoute());
-		NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
-
-		Weaver.callOriginal();
-	}
-
-	@Trace
-	private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput output) {
-		HashMap<String, Object> attributes = new HashMap<String, Object>();
-		Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", routingContext.normalizedPath());
-		Utils.addRoute(attributes, routingContext.currentRoute());
-		NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
-		Weaver.callOriginal();
-	}
+    @Trace
+    public void handle(RoutingContext request) {
+	HashMap<String, Object> attributes = new HashMap<String, Object>();
+	Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", request.normalizedPath());
+	Utils.addRoute(attributes, request.currentRoute());
+	NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
+	Utils.setTransactionName(request);
+	Weaver.callOriginal();
+    }
+
+    @Trace
+    private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput output) {
+	HashMap<String, Object> attributes = new HashMap<String, Object>();
+	Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", routingContext.normalizedPath());
+	Utils.addRoute(attributes, routingContext.currentRoute());
+	NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
+
+	Weaver.callOriginal();
+    }
 
 }
diff --git a/quarkus-resteasy-2.11/build.gradle b/quarkus-resteasy-2.11/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
 jar {
   manifest {
-    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.quarkus-resteasy-2.0'
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.quarkus-resteasy-2.11.0'
     attributes 'Implementation-Vendor': 'New Relic Labs'
     attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
     attributes 'Implementation-Version': 1.0

diff --git a/quarkus-resteasy-2.11/src/main/java/com/newrelic/instrumentation/quarkus/resteasy/Utils.java b/quarkus-resteasy-2.11/src/main/java/com/newrelic/instrumentation/quarkus/resteasy/Utils.java
@@ -2,22 +2,46 @@
 
 import java.util.Map;
 
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.TransactionNamePriority;
+
 import io.vertx.ext.web.Route;
+import io.vertx.ext.web.RoutingContext;
 
 public class Utils {
 
-	public static final String NEWRELIC_TOKEN = "NewRelic-Token";
-
-	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);
-		}
+    public static final String NEWRELIC_TOKEN = "NewRelic-Token";
+
+    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);
+	}
+    }
+
+    public static void addRoute(Map<String, Object> attributes, Route route) {
+	if (route != null) {
+	    addAttribute(attributes, "Route-Name", route.getName());
+	    addAttribute(attributes, "Route-Path", route.getPath());
 	}
-
-	public static void addRoute(Map<String, Object> attributes, Route route) {
-		if(route != null) {
-			addAttribute(attributes, "Route-Name", route.getName());
-			addAttribute(attributes, "Route-Path", route.getPath());
-		}
+    }
+
+    public static void setTransactionName(RoutingContext request) {
+	String name = " ";
+	String route = request.currentRoute().getName();
+	if (route != null & route.length() > 0) {
+	    name += route;
+	}
+	String path = request.currentRoute().getPath();
+	if (path != null & path.length() > 0) {
+	    name += ":" + path;
 	}
+	String method = request.request().method().name();
+	if (method != null & method.length() > 0) {
+	    name += " (" + method + ")";
+	}
+	System.out.println(name);
+	NewRelic.getAgent().getTransaction().setTransactionName(TransactionNamePriority.FRAMEWORK_LOW, false, "Quarkus",
+		"resteasy", name);
+
+    }
 }
diff --git a/...resteasy-2.11/src/main/java/io/quarkus/resteasy/runtime/standalone/RequestDispatcher.java b/...resteasy-2.11/src/main/java/io/quarkus/resteasy/runtime/standalone/RequestDispatcher.java
@@ -14,11 +14,10 @@
 @Weave
 public abstract class RequestDispatcher {
 
-	@Trace
-	public void service(Context context,
-            HttpServerRequest req,
-            HttpServerResponse resp,
-            HttpRequest vertxReq, HttpResponse vertxResp, boolean handleNotFound) {
-		Weaver.callOriginal();
-	}
+    @Trace
+    public void service(Context context, HttpServerRequest req, HttpServerResponse resp, HttpRequest vertxReq,
+	    HttpResponse vertxResp, boolean handleNotFound) {
+
+	Weaver.callOriginal();
+    }
 }
diff --git a/...steasy-2.11/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java b/...steasy-2.11/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java
@@ -14,23 +14,24 @@
 @Weave
 public class VertxRequestHandler {
 
-	@Trace
-	public void handle(RoutingContext request) {
-		HashMap<String, Object> attributes = new HashMap<String, Object>();
-		Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", request.normalizedPath());
-		Utils.addRoute(attributes, request.currentRoute());
-		NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
-
-		Weaver.callOriginal();
-	}
-
-	@Trace
-	private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput output) {
-		HashMap<String, Object> attributes = new HashMap<String, Object>();
-		Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", routingContext.normalizedPath());
-		Utils.addRoute(attributes, routingContext.currentRoute());
-		NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
-		Weaver.callOriginal();
-	}
+    @Trace
+    public void handle(RoutingContext request) {
+	HashMap<String, Object> attributes = new HashMap<String, Object>();
+	Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", request.normalizedPath());
+	Utils.addRoute(attributes, request.currentRoute());
+	NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
+	Utils.setTransactionName(request);
+	Weaver.callOriginal();
+    }
+
+    @Trace
+    private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput output) {
+	HashMap<String, Object> attributes = new HashMap<String, Object>();
+	Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", routingContext.normalizedPath());
+	Utils.addRoute(attributes, routingContext.currentRoute());
+	NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
+
+	Weaver.callOriginal();
+    }
 
 }
diff --git a/quarkus-resteasy-2.14.1/build.gradle b/quarkus-resteasy-2.14.1/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
 jar {
   manifest {
-    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.quarkus-resteasy-2.0'
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.quarkus-resteasy-2.14.1'
     attributes 'Implementation-Vendor': 'New Relic Labs'
     attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
     attributes 'Implementation-Version': 1.0

diff --git a/...us-resteasy-2.14.1/src/main/java/com/newrelic/instrumentation/quarkus/resteasy/Utils.java b/...us-resteasy-2.14.1/src/main/java/com/newrelic/instrumentation/quarkus/resteasy/Utils.java
@@ -2,22 +2,46 @@
 
 import java.util.Map;
 
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.TransactionNamePriority;
+
 import io.vertx.ext.web.Route;
+import io.vertx.ext.web.RoutingContext;
 
 public class Utils {
 
-	public static final String NEWRELIC_TOKEN = "NewRelic-Token";
-
-	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);
-		}
+    public static final String NEWRELIC_TOKEN = "NewRelic-Token";
+
+    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);
+	}
+    }
+
+    public static void addRoute(Map<String, Object> attributes, Route route) {
+	if (route != null) {
+	    addAttribute(attributes, "Route-Name", route.getName());
+	    addAttribute(attributes, "Route-Path", route.getPath());
 	}
-
-	public static void addRoute(Map<String, Object> attributes, Route route) {
-		if(route != null) {
-			addAttribute(attributes, "Route-Name", route.getName());
-			addAttribute(attributes, "Route-Path", route.getPath());
-		}
+    }
+
+    public static void setTransactionName(RoutingContext request) {
+	String name = " ";
+	String route = request.currentRoute().getName();
+	if (route != null & route.length() > 0) {
+	    name += route;
+	}
+	String path = request.currentRoute().getPath();
+	if (path != null & path.length() > 0) {
+	    name += ":" + path;
 	}
+	String method = request.request().method().name();
+	if (method != null & method.length() > 0) {
+	    name += " (" + method + ")";
+	}
+	System.out.println(name);
+	NewRelic.getAgent().getTransaction().setTransactionName(TransactionNamePriority.FRAMEWORK_LOW, false, "Quarkus",
+		"resteasy", name);
+
+    }
 }
diff --git a/...steasy-2.14.1/src/main/java/io/quarkus/resteasy/runtime/standalone/RequestDispatcher.java b/...steasy-2.14.1/src/main/java/io/quarkus/resteasy/runtime/standalone/RequestDispatcher.java
@@ -15,14 +15,13 @@
 @Weave
 public abstract class RequestDispatcher {
 
-	@Trace
-	public void service(Context context,
-            HttpServerRequest req,
-            HttpServerResponse resp,
-            HttpRequest vertxReq, HttpResponse vertxResp, boolean handleNotFound, Throwable t) {
-		if(t != null) {
-			NewRelic.noticeError(t);
-		}
-		Weaver.callOriginal();
+    @Trace
+    public void service(Context context, HttpServerRequest req, HttpServerResponse resp, HttpRequest vertxReq,
+	    HttpResponse vertxResp, boolean handleNotFound, Throwable t) {
+	if (t != null) {
+	    NewRelic.noticeError(t);
 	}
+
+	Weaver.callOriginal();
+    }
 }
diff --git a/...easy-2.14.1/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java b/...easy-2.14.1/src/main/java/io/quarkus/resteasy/runtime/standalone/VertxRequestHandler.java
@@ -14,23 +14,24 @@
 @Weave
 public class VertxRequestHandler {
 
-	@Trace
-	public void handle(RoutingContext request) {
-		HashMap<String, Object> attributes = new HashMap<String, Object>();
-		Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", request.normalizedPath());
-		Utils.addRoute(attributes, request.currentRoute());
-		NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
-
-		Weaver.callOriginal();
-	}
-
-	@Trace
-	private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput output) {
-		HashMap<String, Object> attributes = new HashMap<String, Object>();
-		Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", routingContext.normalizedPath());
-		Utils.addRoute(attributes, routingContext.currentRoute());
-		NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
-		Weaver.callOriginal();
-	}
+    @Trace
+    public void handle(RoutingContext request) {
+	HashMap<String, Object> attributes = new HashMap<String, Object>();
+	Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", request.normalizedPath());
+	Utils.addRoute(attributes, request.currentRoute());
+	NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
+	Utils.setTransactionName(request);
+	Weaver.callOriginal();
+    }
+
+    @Trace
+    private void dispatch(RoutingContext routingContext, InputStream is, VertxOutput output) {
+	HashMap<String, Object> attributes = new HashMap<String, Object>();
+	Utils.addAttribute(attributes, "RoutingContext-NormalizedPath", routingContext.normalizedPath());
+	Utils.addRoute(attributes, routingContext.currentRoute());
+	NewRelic.getAgent().getTracedMethod().addCustomAttributes(attributes);
+
+	Weaver.callOriginal();
+    }
 
 }
diff --git a/quarkus-resteasy-reactive-2.0/build.gradle b/quarkus-resteasy-reactive-2.0/build.gradle
@@ -25,4 +25,4 @@ jar {
 verifyInstrumentation {
    passes 'io.quarkus:quarkus-resteasy-reactive:[2.0.0.Final,2.6.0.Final)'
    excludeRegex '.*CR.*'
-}
+}