From b96eb91dd97fb31f00f2e743140676e9123417db Mon Sep 17 00:00:00 2001 From: qxo <49526356@qq.com> Date: Fri, 27 Oct 2023 16:49:13 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20trace/watch/stack/monitor=20method-patt?= =?UTF-8?q?ern=20=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AD=89=E5=8F=B7(=3D)=E5=92=8C=E7=82=B9=E5=8F=B7(.)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 实际操作等号(=)和点号(.)更友好 --- .../core/command/monitor200/AbstractMethodBasedCommand.java | 4 ++-- .../taobao/arthas/core/command/monitor200/MonitorCommand.java | 4 ++-- .../taobao/arthas/core/command/monitor200/StackCommand.java | 4 ++-- .../taobao/arthas/core/command/monitor200/TraceCommand.java | 4 ++-- .../taobao/arthas/core/command/monitor200/WatchCommand.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/AbstractMethodBasedCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/AbstractMethodBasedCommand.java index 73749209ea..5a3bcdfac3 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/AbstractMethodBasedCommand.java +++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/AbstractMethodBasedCommand.java @@ -30,8 +30,8 @@ public void setMethodPattern(final String methodPattern) { @Override protected void enhance(final CommandProcess process) { - if ("~".equals(methodPattern)) { //smart way - final Pattern smartPattern = Pattern.compile("([.][A-Z][^.]*)([.:])([a-z][^. ]*)$"); + if ("=".equals(methodPattern) || "~".equals(methodPattern) || ".".equals(methodPattern)) { //smart way + final Pattern smartPattern = Pattern.compile("([.][A-Z][^.]*)([.: ]+)([a-z][^. ]*)$"); final Matcher matcher = smartPattern.matcher(classPattern); if (matcher.find()) { methodPattern = matcher.group(3); diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java index e9a8d95f2b..4f02ddd06f 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java +++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/MonitorCommand.java @@ -22,8 +22,8 @@ @Summary("Monitor method execution statistics, e.g. total/success/failure count, average rt, fail rate, etc. ") @Description("\nExamples:\n" + " monitor org.apache.commons.lang.StringUtils isBlank\n" + - " monitor org.apache.commons.lang.StringUtils.isBlank ~\n" + - " monitor org.apache.commons.lang.StringUtils:isBlank ~\n" + + " monitor org.apache.commons.lang.StringUtils.isBlank =\n" + + " monitor org.apache.commons.lang.StringUtils:isBlank =\n" + " monitor org.apache.commons.lang.StringUtils isBlank -c 5\n" + " monitor org.apache.commons.lang.StringUtils isBlank params[0]!=null\n" + " monitor -b org.apache.commons.lang.StringUtils isBlank params[0]!=null\n" + diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java index 49fe334964..8fbada782d 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java +++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/StackCommand.java @@ -23,8 +23,8 @@ @Summary("Display the stack trace for the specified class and method") @Description(Constants.EXPRESS_DESCRIPTION + Constants.EXAMPLE + " stack org.apache.commons.lang.StringUtils isBlank\n" + - " stack org.apache.commons.lang.StringUtils.isBlank ~\n" + - " stack org.apache.commons.lang.StringUtils:isBlank ~\n" + + " stack org.apache.commons.lang.StringUtils.isBlank =\n" + + " stack org.apache.commons.lang.StringUtils:isBlank =\n" + " stack *StringUtils isBlank\n" + " stack *StringUtils isBlank params[0].length==1\n" + " stack *StringUtils isBlank '#cost>100'\n" + diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java index 3715b04a05..8d9edf97bc 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java +++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TraceCommand.java @@ -31,8 +31,8 @@ @Summary("Trace the execution time of specified method invocation.") @Description(value = Constants.EXPRESS_DESCRIPTION + Constants.EXAMPLE + " trace org.apache.commons.lang.StringUtils isBlank\n" + - " trace org.apache.commons.lang.StringUtils.isBlank ~\n" + - " trace org.apache.commons.lang.StringUtils:isBlank ~\n" + + " trace org.apache.commons.lang.StringUtils.isBlank =\n" + + " trace org.apache.commons.lang.StringUtils:isBlank =\n" + " trace *StringUtils isBlank\n" + " trace *StringUtils isBlank params[0].length==1\n" + " trace *StringUtils isBlank '#cost>100'\n" + diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java index 9a548a3126..9f7f9cf337 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java +++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/WatchCommand.java @@ -22,8 +22,8 @@ @Summary("Display the input/output parameter, return object, and thrown exception of specified method invocation") @Description(Constants.EXPRESS_DESCRIPTION + "\nExamples:\n" + " watch org.apache.commons.lang.StringUtils isBlank\n" + - " watch org.apache.commons.lang.StringUtils.isBlank ~\n" + - " watch org.apache.commons.lang.StringUtils:isBlank ~\n" + + " watch org.apache.commons.lang.StringUtils.isBlank =\n" + + " watch org.apache.commons.lang.StringUtils:isBlank =\n" + " watch org.apache.commons.lang.StringUtils isBlank '{params, target, returnObj, throwExp}' -x 2\n" + " watch *StringUtils isBlank params[0] params[0].length==1\n" + " watch *StringUtils isBlank params '#cost>100'\n" +