home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-17 00:36:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

#488 added checks to filtering for NPE fix and RPC internal methods

Browse Source
This commit is contained in:
HyunGil Jeong
2015-05-28 18:50:17 +09:00
parent 1b5d37598c
commit bb65435ffb
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/java/com/navercorp/pinpoint/web/filter/DefaultFilterBuilder.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class DefaultFilterBuilder implements FilterBuilder {
Long fromResponseTime = descriptor.getResponseFrom();
Long toResponseTime = descriptor.getResponseTo();
Boolean includeFailed = descriptor.getIncludeException();
return new FromToResponseFilter(fromServiceType, fromApplicationName, fromAgentName, toServiceType, toApplicationName, toAgentName,fromResponseTime, toResponseTime, includeFailed, hint);
return new FromToResponseFilter(fromServiceType, fromApplicationName, fromAgentName, toServiceType, toApplicationName, toAgentName,fromResponseTime, toResponseTime, includeFailed, hint, this.registry);
}
private FromToFilter createFromToFilter(FilterDescriptor descriptor) {
web/src/main/java/com/navercorp/pinpoint/web/filter/FilterHint.java
+4
View File
@@ -46,6 +46,10 @@ public class FilterHint extends HashMap<String, List<Object>> {
if (!containApplicationHint(applicationName)) {
return false;
}
if (endPoint == null) {
return false;
}
List<Object> list = get(applicationName);
web/src/main/java/com/navercorp/pinpoint/web/filter/FromToResponseFilter.java
+15 -4
View File
@@ -20,6 +20,7 @@ import java.util.List;
import com.navercorp.pinpoint.common.bo.SpanBo;
import com.navercorp.pinpoint.common.bo.SpanEventBo;
import com.navercorp.pinpoint.common.service.ServiceTypeRegistryService;
import com.navercorp.pinpoint.common.trace.ServiceType;
import com.navercorp.pinpoint.common.trace.ServiceTypeCategory;
@@ -43,8 +44,10 @@ public class FromToResponseFilter implements Filter {
private final Boolean includeFailed;
private final FilterHint hint;
private final ServiceTypeRegistryService registry;
public FromToResponseFilter(List<ServiceType> fromServiceList, String fromApplicationName, String fromAgentName, List<ServiceType> toServiceList, String toApplicationName, String toAgentName, Long fromResponseTime, Long toResponseTime, Boolean includeFailed, FilterHint hint) {
public FromToResponseFilter(List<ServiceType> fromServiceList, String fromApplicationName, String fromAgentName, List<ServiceType> toServiceList, String toApplicationName, String toAgentName, Long fromResponseTime, Long toResponseTime, Boolean includeFailed, FilterHint hint, ServiceTypeRegistryService registry) {
if (fromServiceList == null) {
throw new NullPointerException("fromServiceList must not be null");
@@ -61,6 +64,9 @@ public class FromToResponseFilter implements Filter {
if (hint == null) {
throw new NullPointerException("hint must not be null");
}
if (registry == null) {
throw new NullPointerException("registry must not be null");
}
this.fromServiceCode = fromServiceList;
this.fromApplicationName = fromApplicationName;
@@ -74,8 +80,9 @@ public class FromToResponseFilter implements Filter {
this.toResponseTime = toResponseTime;
this.includeFailed = includeFailed;
this.hint = hint;
this.registry = registry;
}
private boolean checkResponseCondition(long elapsed, boolean hasError) {
@@ -211,8 +218,12 @@ public class FromToResponseFilter implements Filter {
return false;
}
private boolean isRpcClient(short serviceType) {
return ServiceTypeCategory.RPC.contains(serviceType);
private boolean isRpcClient(short serviceTypeCode) {
if (ServiceTypeCategory.RPC.contains(serviceTypeCode)) {
ServiceType serviceType = this.registry.findServiceType(serviceTypeCode);
return serviceType.isRecordStatistics();
}
return false;
}