Review fixes

open-telemetry · Mar 3, 2021 · 627b33d · 627b33d
1 parent cca0203
commit 627b33d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...rc/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/MappingResolver.java b/...rc/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/MappingResolver.java
@@ -36,9 +36,8 @@ public static MappingResolver build(Collection<String> mappings) {
       } else if (mapping.startsWith("*.") && mapping.length() > 2) {
         wildcardMatchers.add(new SuffixMatcher("/" + mapping, mapping.substring(1)));
       } else if (mapping.endsWith("/*")) {
-        exactMatches.add(mapping.substring(0, mapping.length() - 2));
         wildcardMatchers.add(
-            new PrefixMatcher(mapping, mapping.substring(0, mapping.length() - 1)));
+            new PrefixMatcher(mapping, mapping.substring(0, mapping.length() - 2)));
       } else {
         exactMatches.add(mapping);
       }
@@ -107,7 +106,7 @@ private PrefixMatcher(String mapping, String prefix) {
 
     @Override
     public boolean match(String path) {
-      return path.startsWith(prefix);
+      return path.equals(prefix) || path.startsWith(prefix + "/");
     }
 
     @Override

diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java b/...ava/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java
@@ -45,7 +45,11 @@ private String getSpanName(
       Object servletOrFilter, HttpServletRequest request, boolean allowNull) {
     String spanName = getSpanName(servletOrFilter, request);
     if (spanName == null && !allowNull) {
-      return "HTTP " + request.getMethod();
+      String contextPath = request.getContextPath();
+      if (contextPath == null || contextPath.isEmpty() || contextPath.equals("/")) {
+        return "HTTP " + request.getMethod();
+      }
+      return contextPath;
     }
     return spanName;
   }

diff --git a/...mentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServletMappingTest.groovy b/...mentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServletMappingTest.groovy
@@ -67,8 +67,8 @@ abstract class AbstractServletMappingTest<SERVER, CONTEXT> extends AgentInstrume
 
     where:
     path        | spanName    | success
-    'prefix'    | '/prefix'   | true
-    'prefix/'   | '/prefix'   | true
+    'prefix'    | '/prefix/*' | true
+    'prefix/'   | '/prefix/*' | true
     'prefix/a'  | '/prefix/*' | true
     'prefixa'   | '/*'        | false
     'a.suffix'  | '/*.suffix' | true