From 246caaab527e732ceb63f699db4e856b0728e0b2 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Tue, 8 Oct 2013 08:00:36 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20=EC=83=98=ED=94=8C=EB=A7=81=20=EB=A0=88=EC=9D=B4=ED=8A=B8?= =?UTF-8?q?=EB=A5=BC=20=EC=B6=94=EA=B0=80=EB=A1=9C=20=ED=99=95=EC=9D=B8?= =?UTF-8?q?=ED=95=B4=EC=95=BC=20=EB=90=98=EB=8A=94=20traceContext.currentR?= =?UTF-8?q?awTraceObject();=EB=A5=BC=20=EC=9E=98=EB=AA=BB=20=ED=98=B8?= =?UTF-8?q?=EC=B6=9C=ED=95=98=EA=B3=A0=20=EC=9E=88=EB=8A=94=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=EC=9D=B4=20=EC=9E=88=EC=96=B4=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@2469 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../httpclient4/interceptor/Execute2MethodInterceptor.java | 1 - .../connector/npc/interceptor/ConnectInterceptor.java | 4 +++- .../npc/interceptor/CreateConnectorInterceptor.java | 5 +++-- .../npc/interceptor/InitializeConnectorInterceptor.java | 5 +++-- .../java/com/nhn/pinpoint/profiler/sender/TcpDataSender.java | 1 + 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java index d99e1ccec..ec7b3690a 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/httpclient4/interceptor/Execute2MethodInterceptor.java @@ -50,7 +50,6 @@ public class Execute2MethodInterceptor implements SimpleAroundInterceptor, ByteC } final HttpUriRequest request = (HttpUriRequest) args[0]; - // UUID format을 그대로. final boolean sampling = trace.canSampled(); if (!sampling) { if(isDebug) { diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/ConnectInterceptor.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/ConnectInterceptor.java index 7682107a8..af7e311a6 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/ConnectInterceptor.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/ConnectInterceptor.java @@ -36,7 +36,9 @@ public class ConnectInterceptor implements SimpleAroundInterceptor, ByteCodeMeth logger.beforeInterceptor(target, args); } - Trace trace = traceContext.currentRawTraceObject(); + // Trace trace = traceContext.currentRawTraceObject(); + // sampling 레이트를 추가로 확인하여 액션을 취하는 로직이 없으므로 그냥 currentTraceObject()를 호출한다. + Trace trace = traceContext.currentTraceObject(); if (trace == null) { logger.warn("Trace object is null"); return; diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/CreateConnectorInterceptor.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/CreateConnectorInterceptor.java index eff424bf6..eee81cca2 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/CreateConnectorInterceptor.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/CreateConnectorInterceptor.java @@ -30,8 +30,9 @@ public class CreateConnectorInterceptor implements SimpleAroundInterceptor, Byte if (isDebug) { logger.beforeInterceptor(target, args); } - - Trace trace = traceContext.currentRawTraceObject(); + // Trace trace = traceContext.currentRawTraceObject(); + // sampling 레이트를 추가로 확인하여 액션을 취하는 로직이 없으므로 그냥 currentTraceObject()를 호출한다. + Trace trace = traceContext.currentTraceObject(); if (trace == null) { logger.warn("Trace object is null"); return; diff --git a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/InitializeConnectorInterceptor.java b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/InitializeConnectorInterceptor.java index bb72f8e44..df54cbf41 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/InitializeConnectorInterceptor.java +++ b/src/main/java/com/nhn/pinpoint/profiler/modifier/connector/npc/interceptor/InitializeConnectorInterceptor.java @@ -33,9 +33,10 @@ public class InitializeConnectorInterceptor implements SimpleAroundInterceptor, logger.beforeInterceptor(target, args); } - Trace trace = traceContext.currentRawTraceObject(); + // Trace trace = traceContext.currentRawTraceObject(); + // sampling 레이트를 추가로 확인하여 액션을 취하는 로직이 없으므로 그냥 currentTraceObject()fmf g + Trace trace = traceContext.currentTraceObject(); if (trace == null) { - logger.warn("Trace object is null"); return; } diff --git a/src/main/java/com/nhn/pinpoint/profiler/sender/TcpDataSender.java b/src/main/java/com/nhn/pinpoint/profiler/sender/TcpDataSender.java index af0dc6518..d200b0f4d 100644 --- a/src/main/java/com/nhn/pinpoint/profiler/sender/TcpDataSender.java +++ b/src/main/java/com/nhn/pinpoint/profiler/sender/TcpDataSender.java @@ -200,6 +200,7 @@ public class TcpDataSender implements DataSender { } private void fireComplete() { + logger.debug("fireComplete"); fireState.compareAndSet(true, false); }