Skip to content

Commit 2007a8e

Browse files
committed
[#noissue] Cleanup
1 parent c502432 commit 2007a8e

File tree

5 files changed

+17
-22
lines changed

5 files changed

+17
-22
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,11 @@ public void destroyed(REQ request, final Throwable throwable, final int statusCo
159159

160160
// TODO STATDISABLE this logic was added to disable statistics tracing
161161
if (!trace.canSampled()) {
162-
Trace copy = traceContext.removeTraceObject();
162+
traceContext.removeTraceObject();
163163
trace.close();
164164
boolean status = isNotFailedStatus(statusCode);
165-
uriStatRecorder.record(copy, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
165+
String uriTemplate = trace.getUriTemplate();
166+
uriStatRecorder.record(uriTemplate, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
166167

167168
return;
168169
}
@@ -177,10 +178,11 @@ public void destroyed(REQ request, final Throwable throwable, final int statusCo
177178
this.parameterRecorder.record(recorder, request, throwable);
178179
} finally {
179180
trace.traceBlockEnd();
180-
Trace copy = this.traceContext.removeTraceObject();
181+
this.traceContext.removeTraceObject();
181182
trace.close();
182183
boolean status = isNotFailedStatus(statusCode);
183-
uriStatRecorder.record(copy, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
184+
String uriTemplate = trace.getUriTemplate();
185+
uriStatRecorder.record(uriTemplate, request, rpcName, status, trace.getStartTime(), trace.getEndTime());
184186
}
185187
}
186188

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.navercorp.pinpoint.bootstrap.plugin.uri;
1818

19-
import com.navercorp.pinpoint.bootstrap.context.Trace;
2019

2120
/**
2221
* @author Taejin Koo
@@ -30,7 +29,7 @@ public static <T> UriStatRecorder<T> create() {
3029
}
3130

3231
@Override
33-
public void record(Trace trace, T request, String rawUri, boolean status, long startTime, long endTime) {
32+
public void record(String uriTemplate, T request, String rawUri, boolean status, long startTime, long endTime) {
3433
// do nothing
3534
}
3635

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616

1717
package com.navercorp.pinpoint.bootstrap.plugin.uri;
1818

19-
import com.navercorp.pinpoint.bootstrap.context.Trace;
20-
2119
/**
2220
* Class that store information that obtained from Request and URIExtractor inside Pinpoint
2321
*
2422
* @author Taejin Koo
2523
*/
2624
public interface UriStatRecorder<T> {
2725

28-
void record(Trace trace, T request, String rawUri, boolean status, long startTime, long endTime);
26+
void record(String uriTemplate, T request, String rawUri, boolean status, long startTime, long endTime);
2927

3028
}
3129

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory;
3232
import com.navercorp.pinpoint.bootstrap.plugin.RequestRecorderFactory;
3333
import com.navercorp.pinpoint.bootstrap.plugin.proxy.ProxyRequestRecorder;
34-
import com.navercorp.pinpoint.bootstrap.plugin.request.util.ParameterRecorder;
35-
import com.navercorp.pinpoint.bootstrap.plugin.request.util.RemoteAddressResolverFactory;
3634
import com.navercorp.pinpoint.bootstrap.plugin.request.RequestAdaptor;
3735
import com.navercorp.pinpoint.bootstrap.plugin.request.RequestTraceReader;
3836
import com.navercorp.pinpoint.bootstrap.plugin.request.ServerRequestRecorder;
37+
import com.navercorp.pinpoint.bootstrap.plugin.request.util.ParameterRecorder;
38+
import com.navercorp.pinpoint.bootstrap.plugin.request.util.RemoteAddressResolverFactory;
3939
import com.navercorp.pinpoint.bootstrap.plugin.uri.BypassingUriExtractorService;
4040
import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorder;
4141
import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorderFactory;
@@ -261,7 +261,7 @@ private void recordUriStat(Object[] args, Trace trace) {
261261
final String urlTemplate = ((VertxUrlTemplate)scope.getCurrentInvocation().getAttachment()).getUrlTemplate();
262262
String uri = StringUtils.isEmpty(urlTemplate)? request.uri() : urlTemplate;
263263
boolean status = isNotFailedStatus(request.response().getStatusCode());
264-
uriStatRecorder.record(trace, request, uri, status, trace.getStartTime(), trace.getEndTime());
264+
uriStatRecorder.record(urlTemplate, request, uri, status, trace.getStartTime(), trace.getEndTime());
265265
}
266266
}
267267

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@
1616

1717
package com.navercorp.pinpoint.profiler.context.recorder;
1818

19-
import com.navercorp.pinpoint.bootstrap.context.Trace;
20-
import com.navercorp.pinpoint.bootstrap.context.TraceContext;
2119
import com.navercorp.pinpoint.bootstrap.plugin.uri.UriExtractor;
2220
import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorder;
2321
import com.navercorp.pinpoint.profiler.context.storage.UriStatStorage;
24-
25-
import org.apache.logging.log4j.Logger;
2622
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2724

2825
import java.util.Objects;
2926

@@ -33,30 +30,29 @@
3330
public class DefaultUriStatRecorder<T> implements UriStatRecorder<T> {
3431

3532
private final Logger logger = LogManager.getLogger(this.getClass());
33+
private static final String NOT_FOUNDED = "/NOT_FOUND_URI";
3634

3735
private final UriExtractor<T> uriExtractor;
3836
private final UriStatStorage uriStatStorage;
3937

40-
private final String NOT_FOUNDED = "/NOT_FOUND_URI";
4138

4239
public DefaultUriStatRecorder(UriExtractor<T> uriExtractor, UriStatStorage uriStatStorage) {
4340
this.uriExtractor = Objects.requireNonNull(uriExtractor, "uriExtractor");
4441
this.uriStatStorage = Objects.requireNonNull(uriStatStorage, "uriStatStorage");
4542
}
4643

4744
@Override
48-
public void record(Trace trace, T request, String rawUri, boolean status, long startTime, long endTime) {
45+
public void record(String uriTemplate, T request, String rawUri, boolean status, long startTime, long endTime) {
4946
String uri;
5047

5148
String userAttributeUri = uriExtractor.getUri(request, rawUri);
52-
String interceptedUri = trace.getUriTemplate();
5349
if (userAttributeUri != null) {
5450
uri = userAttributeUri;
55-
} else if (interceptedUri != null) {
56-
uri = interceptedUri;
51+
} else if (uriTemplate != null) {
52+
uri = uriTemplate;
5753
} else {
5854
uri = NOT_FOUNDED;
59-
logger.warn("can not extract uri. request:{}, rawUri:{}", request, rawUri);
55+
logger.debug("can not extract uri. request:{}, rawUri:{}", request, rawUri);
6056
}
6157

6258
uriStatStorage.store(uri, status, startTime, endTime);

0 commit comments

Comments
 (0)