[강운덕] [LUCYSUS-1744] 샘플링 레이트를 추가로 확인해야 되는 traceContext.currentRawTraceObject();를 잘못 호출하고 있는 부분이 있어 수정함.

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@2469 84d0f5b1-2673-498c-a247-62c4ff18d310

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) {

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;

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;

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;
 		}
 

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