From 5f75a1897fb5bc0d3a0d53dea1d55d3f27417704 Mon Sep 17 00:00:00 2001 From: Ohjun Kwon Date: Wed, 8 Jan 2025 16:12:06 +0900 Subject: [PATCH] [#noissue] Allow blank agentId and ignore it from filter --- .../com/navercorp/pinpoint/web/calltree/span/SpanFilters.java | 3 +-- .../pinpoint/web/controller/BusinessTransactionController.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanFilters.java b/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanFilters.java index 19e976ce68ce8..ced818146bc41 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanFilters.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/calltree/span/SpanFilters.java @@ -2,7 +2,6 @@ import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.common.server.bo.SpanBo; -import com.navercorp.pinpoint.common.util.StringUtils; import com.navercorp.pinpoint.web.controller.BusinessTransactionController; import java.util.ArrayList; @@ -23,7 +22,7 @@ public static Predicate spanFilter(long spanId, String agentId, long foc Predicate filter = SpanFilters.spanIdFilter(spanId); builder.addFilter(filter); } - if (StringUtils.hasLength(agentId)) { + if (agentId != null && !agentId.isBlank()) { Predicate filter = SpanFilters.agentIdFilter(agentId); builder.addFilter(filter); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java index 19f27c6ba5b0f..129483199b32d 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java @@ -100,7 +100,7 @@ public TransactionInfoViewModel transactionInfo( @RequestParam(value = "focusTimestamp", required = false, defaultValue = DEFAULT_FOCUS_TIMESTAMP) @PositiveOrZero long focusTimestamp, - @RequestParam(value = "agentId", required = false) @NotBlank String agentId, + @RequestParam(value = "agentId", required = false) String agentId, @RequestParam(value = "spanId", required = false, defaultValue = DEFAULT_SPAN_ID) long spanId, @RequestParam(value = "v", required = false, defaultValue = "0") int viewVersion, @RequestParam(value = "useStatisticsAgentState", required = false, defaultValue = "false")