[#noissue] Cleanup

agent-module/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptor.java

@@ -54,7 +54,7 @@
         this.methodDescriptor = targetMethod;
 
         if (traceKey) {
-            int index = findFirstString(targetMethod);
+            int index = ParameterUtils.findFirstString(targetMethod, 3);
 
             if (index != -1) {
                 this.traceKey = true;
@@ -69,20 +69,6 @@
         }
     }
 
-    private static int findFirstString(MethodDescriptor method) {
-        if (method == null) {
-            return -1;
-        }
-        final String[] methodParams = method.getParameterTypes();
-        final int minIndex = Math.min(methodParams.length, 3);
-        for (int i = 0; i < minIndex; i++) {
-            if ("java.lang.String".equals(methodParams[i])) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
     @Override
     public void before(Object target, Object[] args) {
         if (isDebug) {

agent-module/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/ParameterUtils.java → agent-module/plugins/arcus/src/main/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ParameterUtils.java

@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.navercorp.pinpoint.plugin.arcus;
+package com.navercorp.pinpoint.plugin.arcus.interceptor;
 
-import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod;
+import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor;
 
 /**
  * @author emeroad
  */
 public class ParameterUtils {
 
-    public static int findFirstString(InstrumentMethod method, int maxIndex) {
+    public static int findFirstString(MethodDescriptor method, int maxIndex) {
         if (method == null) {
             return -1;
         }

agent-module/profiler/src/main/java/com/navercorp/pinpoint/profiler/monitor/DefaultAgentStatMonitor.java

@@ -75,27 +75,21 @@
         Objects.requireNonNull(agentStatCollector, "agentStatCollector");
 
 
-        long collectionIntervalMs = monitorConfig.getProfileJvmStatCollectIntervalMs();
-        int numCollectionsPerBatch = monitorConfig.getProfileJvmStatBatchSendCount();
+        this.collectionIntervalMs = getCollectionIntervalMs(monitorConfig.getProfileJvmStatCollectIntervalMs());
 
-        if (collectionIntervalMs < MIN_COLLECTION_INTERVAL_MS) {
-            collectionIntervalMs = DEFAULT_COLLECTION_INTERVAL_MS;
-        }
-        if (collectionIntervalMs > MAX_COLLECTION_INTERVAL_MS) {
-            collectionIntervalMs = DEFAULT_COLLECTION_INTERVAL_MS;
-        }
+        int numCollectionsPerBatch = monitorConfig.getProfileJvmStatBatchSendCount();
         if (numCollectionsPerBatch < 1) {
             numCollectionsPerBatch = DEFAULT_NUM_COLLECTIONS_PER_SEND;
         }
-        this.collectionIntervalMs = collectionIntervalMs;
 
         List<Runnable> runnableList = new ArrayList<>();
 
         Runnable statCollectingJob = new CollectJob(dataSender, agentId, agentStartTimestamp, agentStatCollector, numCollectionsPerBatch);
         runnableList.add(statCollectingJob);
 
         if (monitorConfig.isCustomMetricEnable() && customMetricRegistryService != null) {
-            Runnable customMetricCollectionJob = new CustomMetricCollectingJob(dataSender, new AgentCustomMetricCollector(customMetricRegistryService), numCollectionsPerBatch);
+            AgentCustomMetricCollector agentCustomMetricCollector = new AgentCustomMetricCollector(customMetricRegistryService);
+            Runnable customMetricCollectionJob = new CustomMetricCollectingJob(dataSender, agentCustomMetricCollector, numCollectionsPerBatch);
             runnableList.add(customMetricCollectionJob);
         }
 
@@ -109,6 +103,16 @@
         preLoadClass(agentId, agentStartTimestamp, agentStatCollector);
     }
 
+    private long getCollectionIntervalMs(long collectionIntervalMs) {
+        if (collectionIntervalMs < MIN_COLLECTION_INTERVAL_MS) {
+            collectionIntervalMs = DEFAULT_COLLECTION_INTERVAL_MS;
+        }
+        if (collectionIntervalMs > MAX_COLLECTION_INTERVAL_MS) {
+            collectionIntervalMs = DEFAULT_COLLECTION_INTERVAL_MS;
+        }
+        return collectionIntervalMs;
+    }
+
     // https://github.com/naver/pinpoint/issues/2881
     // #2881 AppClassLoader and PinpointUrlClassLoader Circular dependency deadlock
     // prevent deadlock for JDK6

commons/src/main/java/com/navercorp/pinpoint/common/util/IdValidateUtils.java

@@ -32,7 +32,7 @@ public final class IdValidateUtils {
     @Deprecated
     public static String STABLE_VERSION_PATTERN_VALUE = AgentVersionPostfix.STABLE_VERSION_PATTERN_STRING;
 
-    public static final String ID_PATTERN_VALUE = "[a-zA-Z0-9._\\-]+";;
+    public static final String ID_PATTERN_VALUE = "[a-zA-Z0-9._\\-]+";
     private static final Pattern ID_PATTERN = Pattern.compile(ID_PATTERN_VALUE);
 
     private IdValidateUtils() {