From 49aaf17acf0b574b0a525198effa7e750187e648 Mon Sep 17 00:00:00 2001
From: Jaehong Kim <jaehong.kim@navercorp.com>
Date: Mon, 8 Jun 2015 15:43:07 +0900
Subject: [PATCH 1/3] add jetty entry point in pinpoint.conf

---
 agent/src/main/resources/pinpoint.config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/agent/src/main/resources/pinpoint.config b/agent/src/main/resources/pinpoint.config
index 8743759d1..e073073ef 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
+
 ###########################################################
 # TOMCAT                                                  #
 ###########################################################

From b7f97a80f4bf68b93e278aa3a42803ea88a45266 Mon Sep 17 00:00:00 2001
From: Jaehong Kim <jaehong.kim@navercorp.com>
Date: Mon, 8 Jun 2015 15:43:32 +0900
Subject: [PATCH 2/3] fix span close condition

---
 .../plugin/user/interceptor/UserIncludeMethodInterceptor.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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();

From 1893ee97252ae2aaedaf9962440848326dc6d8cd Mon Sep 17 00:00:00 2001
From: Jaehong Kim <jaehong.kim@navercorp.com>
Date: Mon, 8 Jun 2015 15:53:49 +0900
Subject: [PATCH 3/3] add jetty entry point

---
 agent/src/main/resources/pinpoint.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/src/main/resources/pinpoint.config b/agent/src/main/resources/pinpoint.config
index e073073ef..c53157f78 100644
--- a/agent/src/main/resources/pinpoint.config
+++ b/agent/src/main/resources/pinpoint.config
@@ -67,7 +67,7 @@ profiler.type.detect.order=
 profiler.include=
 
 # jetty entry point
-profiler.user.include=org.eclipse.jetty.servlet.ServletHandler.doHandle
+profiler.user.include=org.eclipse.jetty.servlet.ServletHandler.doHandle, org.eclipse.jetty.server.Server.handle
 
 ###########################################################
 # TOMCAT                                                  #