diff --git a/agent/src/main/resources/pinpoint.config b/agent/src/main/resources/pinpoint.config index 8743759d1..c53157f78 100644 --- a/agent/src/main/resources/pinpoint.config +++ b/agent/src/main/resources/pinpoint.config @@ -66,6 +66,9 @@ profiler.type.detect.order= ########################################################### profiler.include= +# jetty entry point +profiler.user.include=org.eclipse.jetty.servlet.ServletHandler.doHandle, org.eclipse.jetty.server.Server.handle + ########################################################### # TOMCAT # ########################################################### diff --git a/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java b/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java index f707ce54c..6b64f3c11 100644 --- a/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java +++ b/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java @@ -35,7 +35,6 @@ public class UserIncludeMethodInterceptor implements SimpleAroundInterceptor { private TraceContext traceContext; private MethodDescriptor descriptor; - private boolean span = false; public UserIncludeMethodInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) { this.traceContext = traceContext; @@ -53,7 +52,6 @@ public class UserIncludeMethodInterceptor implements SimpleAroundInterceptor { Trace trace = traceContext.currentTraceObject(); if (trace == null) { trace = traceContext.newTraceObject(); - span = true; if (!trace.canSampled()) { if(isDebug) { logger.debug("New trace and can't sampled {}", trace); @@ -95,7 +93,7 @@ public class UserIncludeMethodInterceptor implements SimpleAroundInterceptor { trace.markAfterTime(); } finally { trace.traceBlockEnd(); - if(span) { + if(trace.isRootStack()) { trace.markAfterTime(); trace.close(); traceContext.removeTraceObject();