From 22adb820daf197b5ceeee50827334692eb40337b Mon Sep 17 00:00:00 2001 From: emeroad Date: Fri, 25 Nov 2022 18:33:01 +0900 Subject: [PATCH] [#noissue] Cleanup --- .../plugin/request/ServletRequestListener.java | 10 ++++++---- .../plugin/uri/DisabledUriStatRecorder.java | 3 +-- .../bootstrap/plugin/uri/UriStatRecorder.java | 4 +--- ...ServerConnectionHandleRequestInterceptor.java | 6 +++--- .../context/recorder/DefaultUriStatRecorder.java | 16 ++++++---------- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/request/ServletRequestListener.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/request/ServletRequestListener.java index 5062bc7228a9..bc885e1558f3 100644 --- a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/request/ServletRequestListener.java +++ b/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()); } } diff --git a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/DisabledUriStatRecorder.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/DisabledUriStatRecorder.java index 80e2c7ab5254..abe799cf79b5 100644 --- a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/DisabledUriStatRecorder.java +++ b/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 UriStatRecorder 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 } diff --git a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriStatRecorder.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriStatRecorder.java index 8ed7e9e9aea9..0125d95a1c42 100644 --- a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriStatRecorder.java +++ b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriStatRecorder.java @@ -16,8 +16,6 @@ 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 * @@ -25,7 +23,7 @@ */ public interface UriStatRecorder { - 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); } diff --git a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java b/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java index 049ddfe06b34..b4fbe28b515a 100644 --- a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java +++ b/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()); } } diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultUriStatRecorder.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultUriStatRecorder.java index 644282f1ad26..e85fb386250c 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultUriStatRecorder.java +++ b/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,11 +30,11 @@ public class DefaultUriStatRecorder implements UriStatRecorder { private final Logger logger = LogManager.getLogger(this.getClass()); + private static final String NOT_FOUNDED = "/NOT_FOUND_URI"; private final UriExtractor uriExtractor; private final UriStatStorage uriStatStorage; - private final String NOT_FOUNDED = "/NOT_FOUND_URI"; public DefaultUriStatRecorder(UriExtractor uriExtractor, UriStatStorage uriStatStorage) { this.uriExtractor = Objects.requireNonNull(uriExtractor, "uriExtractor"); @@ -45,18 +42,17 @@ public DefaultUriStatRecorder(UriExtractor uriExtractor, UriStatStorage uriSt } @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);