Use JSP path name as transaction name (#751)

rather than the name of the generated servlet

closes #429

Author: felixbarny

apm-agent-plugins/apm-servlet-plugin/src/main/java/co/elastic/apm/agent/servlet/ServletTransactionHelper.java

@@ -63,6 +63,7 @@ public class ServletTransactionHelper {
     @VisibleForAdvice
     public static final String ASYNC_ATTRIBUTE = ServletApiAdvice.class.getName() + ".async";
     private static final String CONTENT_TYPE_FROM_URLENCODED = "application/x-www-form-urlencoded";
+    public static final WildcardMatcher ENDS_WITH_JSP = WildcardMatcher.valueOf("*.jsp");
 
     private final Logger logger = LoggerFactory.getLogger(ServletTransactionHelper.class);
 
@@ -197,7 +198,8 @@ private void doOnAfter(Transaction transaction, @Nullable Throwable exception, b
     }
 
     void applyDefaultTransactionName(String method, String servletPath, @Nullable String pathInfo, Transaction transaction) {
-        if (webConfiguration.isUsePathAsName()) {
+        // JSPs don't contain path params and the name is more telling than the generated servlet class
+        if (webConfiguration.isUsePathAsName() || ENDS_WITH_JSP.matches(servletPath, pathInfo)) {
             // should override ServletName#doGet
             StringBuilder transactionName = transaction.getAndOverrideName(PRIO_LOW_LEVEL_FRAMEWORK + 1);
             if (transactionName != null) {