Avoid webflux plugin generating many endpoints & optimization http pl…

…ugin toPath method (apache#2718) * Avoid webflux plugin generating many endpoints
tuxedo · May 20, 2019 · 90fe05b · 90fe05b
1 parent 7b21c33
commit 90fe05b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/...ain/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/OnInboundNextInterceptor.java b/...ain/java/org/apache/skywalking/apm/plugin/spring/webflux/v5/OnInboundNextInterceptor.java
@@ -46,7 +46,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
             }
 
             if (allArguments[1] instanceof HttpRequest) {
-                AbstractSpan span = ContextManager.createEntrySpan(request.uri(), contextCarrier);
+                AbstractSpan span = ContextManager.createEntrySpan(toPath(request.uri()), contextCarrier);
                 Tags.URL.set(span, request.uri());
                 Tags.HTTP.METHOD.set(span, request.method().name());
                 span.setComponent(ComponentsDefine.SPRING_MVC_ANNOTATION);
@@ -65,4 +65,13 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
         Class<?>[] argumentsTypes, Throwable t) {
         ContextManager.activeSpan().errorOccurred().log(t);
     }
+
+    private static String toPath(String uri) {
+        int index = uri.indexOf("?");
+        if (index > -1) {
+            return uri.substring(0, index);
+        } else {
+            return uri;
+        }
+    }
 }
diff --git a/...ain/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplEndInterceptor.java b/...ain/java/org/apache/skywalking/apm/plugin/vertx3/HttpClientRequestImplEndInterceptor.java
@@ -86,8 +86,9 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
     }
 
     private static String toPath(String uri) {
-        if (uri.contains("?")) {
-            return uri.substring(0, uri.indexOf("?"));
+        int index = uri.indexOf("?");
+        if (index > -1) {
+            return uri.substring(0, index);
         } else {
             return uri;
         }

diff --git a/...in/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RouterImplAcceptInterceptor.java b/...in/src/main/java/org/apache/skywalking/apm/plugin/vertx3/RouterImplAcceptInterceptor.java
@@ -73,8 +73,9 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
     }
 
     private static String toPath(String uri) {
-        if (uri.contains("?")) {
-            return uri.substring(0, uri.indexOf("?"));
+        int index = uri.indexOf("?");
+        if (index > -1) {
+            return uri.substring(0, index);
         } else {
             return uri;
         }