[#noissue] Cleanup

Author: emeroad

bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/request/ServletRequestListener.java

@@ -159,10 +159,11 @@ public void destroyed(REQ request, final Throwable throwable, final int statusCo
 
         // TODO STATDISABLE this logic was added to disable statistics tracing
         if (!trace.canSampled()) {
-            Trace copy = traceContext.removeTraceObject();
+            traceContext.removeTraceObject();
             trace.close();
             boolean status = isNotFailedStatus(statusCode);
-            uriStatRecorder.record(copy, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
+            String uriTemplate = trace.getUriTemplate();
+            uriStatRecorder.record(uriTemplate, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
 
             return;
         }
@@ -177,10 +178,11 @@ public void destroyed(REQ request, final Throwable throwable, final int statusCo
             this.parameterRecorder.record(recorder, request, throwable);
         } finally {
             trace.traceBlockEnd();
-            Trace copy = this.traceContext.removeTraceObject();
+            this.traceContext.removeTraceObject();
             trace.close();
             boolean status = isNotFailedStatus(statusCode);
-            uriStatRecorder.record(copy, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
+            String uriTemplate = trace.getUriTemplate();
+            uriStatRecorder.record(uriTemplate, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
         }
     }
 

bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/DisabledUriStatRecorder.java

@@ -16,7 +16,6 @@
 
 package com.navercorp.pinpoint.bootstrap.plugin.uri;
 
-import com.navercorp.pinpoint.bootstrap.context.Trace;
 
 /**
  * @author Taejin Koo
@@ -30,7 +29,7 @@ public static <T> UriStatRecorder<T> create() {
     }
 
     @Override
-    public void record(Trace trace, T request, String rawUri, boolean status, long startTime, long endTime) {
+    public void record(String uriTemplate, T request, String rawUri, boolean status, long startTime, long endTime) {
         // do nothing
     }
 

bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriStatRecorder.java

@@ -16,16 +16,14 @@
 
 package com.navercorp.pinpoint.bootstrap.plugin.uri;
 
-import com.navercorp.pinpoint.bootstrap.context.Trace;
-
 /**
  * Class that store information that obtained from Request and URIExtractor inside Pinpoint
  *
  * @author Taejin Koo
  */
 public interface UriStatRecorder<T> {
 
-    void record(Trace trace, T request, String rawUri, boolean status, long startTime, long endTime);
+    void record(String uriTemplate, T request, String rawUri, boolean status, long startTime, long endTime);
 
 }
 

plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java

@@ -31,11 +31,11 @@
 import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.RequestRecorderFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.proxy.ProxyRequestRecorder;
-import com.navercorp.pinpoint.bootstrap.plugin.request.util.ParameterRecorder;
-import com.navercorp.pinpoint.bootstrap.plugin.request.util.RemoteAddressResolverFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.request.RequestAdaptor;
 import com.navercorp.pinpoint.bootstrap.plugin.request.RequestTraceReader;
 import com.navercorp.pinpoint.bootstrap.plugin.request.ServerRequestRecorder;
+import com.navercorp.pinpoint.bootstrap.plugin.request.util.ParameterRecorder;
+import com.navercorp.pinpoint.bootstrap.plugin.request.util.RemoteAddressResolverFactory;
 import com.navercorp.pinpoint.bootstrap.plugin.uri.BypassingUriExtractorService;
 import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorder;
 import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorderFactory;
@@ -261,7 +261,7 @@ private void recordUriStat(Object[] args, Trace trace) {
             final String urlTemplate = ((VertxUrlTemplate)scope.getCurrentInvocation().getAttachment()).getUrlTemplate();
             String uri = StringUtils.isEmpty(urlTemplate)? request.uri() : urlTemplate;
             boolean status = isNotFailedStatus(request.response().getStatusCode());
-            uriStatRecorder.record(trace, request, uri, status, trace.getStartTime(), trace.getEndTime());
+            uriStatRecorder.record(urlTemplate, request, uri, status, trace.getStartTime(), trace.getEndTime());
         }
     }
 

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultUriStatRecorder.java

@@ -16,14 +16,11 @@
 
 package com.navercorp.pinpoint.profiler.context.recorder;
 
-import com.navercorp.pinpoint.bootstrap.context.Trace;
-import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.plugin.uri.UriExtractor;
 import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorder;
 import com.navercorp.pinpoint.profiler.context.storage.UriStatStorage;
-
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.Objects;
 
@@ -33,30 +30,29 @@
 public class DefaultUriStatRecorder<T> implements UriStatRecorder<T> {
 
     private final Logger logger = LogManager.getLogger(this.getClass());
+    private static final String NOT_FOUNDED = "/NOT_FOUND_URI";
 
     private final UriExtractor<T> uriExtractor;
     private final UriStatStorage uriStatStorage;
 
-    private final String NOT_FOUNDED = "/NOT_FOUND_URI";
 
     public DefaultUriStatRecorder(UriExtractor<T> uriExtractor, UriStatStorage uriStatStorage) {
         this.uriExtractor = Objects.requireNonNull(uriExtractor, "uriExtractor");
         this.uriStatStorage = Objects.requireNonNull(uriStatStorage, "uriStatStorage");
     }
 
     @Override
-    public void record(Trace trace, T request, String rawUri, boolean status, long startTime, long endTime) {
+    public void record(String uriTemplate, T request, String rawUri, boolean status, long startTime, long endTime) {
         String uri;
 
         String userAttributeUri = uriExtractor.getUri(request, rawUri);
-        String interceptedUri = trace.getUriTemplate();
         if (userAttributeUri != null) {
             uri = userAttributeUri;
-        } else if (interceptedUri != null) {
-            uri = interceptedUri;
+        } else if (uriTemplate != null) {
+            uri = uriTemplate;
         } else {
             uri = NOT_FOUNDED;
-            logger.warn("can not extract uri. request:{}, rawUri:{}", request, rawUri);
+            logger.debug("can not extract uri. request:{}, rawUri:{}", request, rawUri);
         }
 
         uriStatStorage.store(uri, status, startTime, endTime);