[pinpoint-apm#2939] Fix rpc hint checks for WAS to WAS filtering

Author: Xylus

web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java

@@ -45,14 +45,14 @@ public FilterHint(List<RpcHint> rpcHintList) {
     }
 
 
-    public List<RpcHint> getRpcHintList(String sourceApplicationName) {
-        if (sourceApplicationName == null) {
-            throw new NullPointerException("sourceApplicationName must not be null");
+    public List<RpcHint> getRpcHintList(String targetApplicationName) {
+        if (targetApplicationName == null) {
+            throw new NullPointerException("targetApplicationName must not be null");
         }
         final List<RpcHint> findRpcHintList = new ArrayList<>();
         for (RpcHint rpcHint : rpcHintList) {
             // TODO miss serviceType
-            if (rpcHint.getApplicationName().equals(sourceApplicationName)) {
+            if (rpcHint.getApplicationName().equals(targetApplicationName)) {
                 findRpcHintList.add(rpcHint);
             }
         }

web/src/main/java/com/navercorp/pinpoint/web/filter/LinkFilter.java

@@ -122,7 +122,8 @@ public LinkFilter(FilterDescriptor filterDescriptor, FilterHint filterHint, Serv
         this.filterType = getFilterType();
         logger.info("filterType:{}", filterType);
 
-        this.rpcHintList = this.filterHint.getRpcHintList(fromApplicationName);
+        this.rpcHintList = this.filterHint.getRpcHintList(toApplicationName);
+
         // TODO fix : fromSpan base rpccall filter
         this.acceptURLFilter = createAcceptUrlFilter(filterDescriptor);
         this.rpcUrlFilter = createRpcUrlFilter(filterDescriptor);
@@ -359,9 +360,11 @@ private boolean wasToWasFilter(List<SpanBo> transaction) {
             return false;
         }
 
-        if (!rpcHintList.isEmpty()) {
+        // Check for url pattern should now be done on the caller side (from spans) as to spans are missing at this point
+        if (!rpcUrlFilter.accept(fromSpanList)) {
             return false;
         }
+
         // if agent filter is FromAgentFilter or AcceptAgentFilter(agent filter is not selected), url filtering is available.
         return fromBaseFilter(fromSpanList);
     }
@@ -395,20 +398,27 @@ private boolean fromBaseFilter(List<SpanBo> fromSpanList) {
         // exceptional case
         // 1. remote call fail
         // 2. span packet lost.
+        if (rpcHintList.isEmpty()) {
+            // fast skip. There is nothing more we can do if rpcHintList is empty.
+            return false;
+        }
         for (SpanBo fromSpan : fromSpanList) {
             final List<SpanEventBo> eventBoList = fromSpan.getSpanEventBoList();
             if (eventBoList == null) {
                 continue;
             }
             for (SpanEventBo event : eventBoList) {
                 final ServiceType eventServiceType = serviceTypeRegistryService.findServiceType(event.getServiceType());
-                if (!eventServiceType.isRpcClient() || !eventServiceType.isQueue()) {
+                if (!eventServiceType.isRpcClient() && !eventServiceType.isQueue()) {
                     continue;
                 }
                 if (!eventServiceType.isRecordStatistics()) {
                     continue;
                 }
                 // check rpc call fail
+                // There are also cases where multiple applications receiving the same request from the caller node
+                // but not all of them have agents installed. RpcHint is used for such cases as acceptUrlFilter will
+                // reject these transactions.
                 for (RpcHint rpcHint : rpcHintList) {
                     for (RpcType rpcType : rpcHint.getRpcTypeList()) {
                         if (rpcType.isMatched(event.getDestinationId(), eventServiceType.getCode())) {

web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java

@@ -313,6 +313,67 @@ public void wasToWasFilter_noMatch() {
         Assert.assertFalse(linkFilter.include(Arrays.asList(user_appA, appA_appC)));
     }
 
+    @Test
+    public void wasToWasFilter_noMatch_missingReceivingSpan() {
+        final ServiceType tomcat = serviceTypeRegistryService.findServiceTypeByName(TOMCAT_TYPE_NAME);
+
+        final String rpcHost = "some.domain.name";
+        final String rpcUrl = "http://" + rpcHost + "/some/test/path";
+
+        FilterDescriptor descriptor = new FilterDescriptor();
+        descriptor.setFromApplicationName("APP_A");
+        descriptor.setFromServiceType(tomcat.getName());
+        descriptor.setToApplicationName("APP_B");
+        descriptor.setToServiceType(tomcat.getName());
+
+        FilterHint emptyHint = new FilterHint(Collections.emptyList());
+        FilterHint unmatchingHint = new FilterHint(Collections.singletonList(
+                new RpcHint("APP_B", Collections.singletonList(
+                        new RpcType("different.domain.name", RPC_TYPE_CODE)))));
+        FilterHint matchingHint = new FilterHint(Collections.singletonList(
+                new RpcHint("APP_B", Collections.singletonList(
+                        new RpcType(rpcHost, RPC_TYPE_CODE)))));
+
+        LinkFilter emptyHintLinkFilter = new LinkFilter(descriptor, emptyHint, serviceTypeRegistryService, annotationKeyRegistryService);
+        LinkFilter unmatchingHintLinkFilter = new LinkFilter(descriptor, unmatchingHint, serviceTypeRegistryService, annotationKeyRegistryService);
+        LinkFilter matchingHintLinkFilter = new LinkFilter(descriptor, matchingHint, serviceTypeRegistryService, annotationKeyRegistryService);
+        logger.debug("emptyHintLinkFilter : {}", emptyHintLinkFilter.toString());
+        logger.debug("unmatchingHintLinkFilter : {}", unmatchingHintLinkFilter.toString());
+        logger.debug("matchingHintLinkFilter : {}", matchingHintLinkFilter.toString());
+
+        SpanBo fromSpan = new SpanBo();
+        fromSpan.setSpanId(1);
+        fromSpan.setParentSpanId(-1);
+        fromSpan.setApplicationId("APP_A");
+        fromSpan.setApplicationServiceType(tomcat.getCode());
+        AnnotationBo rpcAnnotation = new AnnotationBo();
+        rpcAnnotation.setKey(RPC_ANNOTATION_CODE);
+        rpcAnnotation.setValue(rpcUrl);
+        SpanEventBo rpcSpanEvent = new SpanEventBo();
+        rpcSpanEvent.setServiceType(RPC_TYPE_CODE);
+        rpcSpanEvent.setDestinationId(rpcHost);
+        rpcSpanEvent.setAnnotationBoList(Collections.singletonList(rpcAnnotation));
+        fromSpan.addSpanEvent(rpcSpanEvent);
+        // Reject - filter hint empty
+        Assert.assertFalse(emptyHintLinkFilter.include(Collections.singletonList(fromSpan)));
+        // Reject - filter hint does not match
+        Assert.assertFalse(unmatchingHintLinkFilter.include(Collections.singletonList(fromSpan)));
+        // Accept - filter hint matches
+        Assert.assertTrue(matchingHintLinkFilter.include(Collections.singletonList(fromSpan)));
+
+        // Check rpc url as well
+        final String unmatchingUrlPattern = "/other/test/**";
+        final String matchingUrlPattern = "/some/test/**";
+        // Reject - url pattern does not match
+        descriptor.setUrl(unmatchingUrlPattern);
+        LinkFilter matchingHintLinkFilterWithUnmatchingUrlPattern = new LinkFilter(descriptor, matchingHint, serviceTypeRegistryService, annotationKeyRegistryService);
+        Assert.assertFalse(matchingHintLinkFilterWithUnmatchingUrlPattern.include(Collections.singletonList(fromSpan)));
+        // Accept - url pattern matches
+        descriptor.setUrl(encodeUrl(matchingUrlPattern));
+        LinkFilter matchingHintLinkFilterWithMatchingUrlPattern = new LinkFilter(descriptor, matchingHint, serviceTypeRegistryService, annotationKeyRegistryService);
+        Assert.assertTrue(matchingHintLinkFilterWithMatchingUrlPattern.include(Collections.singletonList(fromSpan)));
+    }
+
     @Test
     public void wasToBackendFilter() {
         final ServiceType tomcat = serviceTypeRegistryService.findServiceTypeByName(TOMCAT_TYPE_NAME);