[#9633] Polishing

pinpoint-apm · Jan 16, 2023 · 1ffb662 · 1ffb662
1 parent 01cae35
commit 1ffb662
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 28 deletions.
diff --git a/...ain/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanRecursiveAroundInterceptor.java b/...ain/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanRecursiveAroundInterceptor.java
@@ -176,10 +176,9 @@ private boolean initScope(final Trace trace) {
     }
 
     private void entryScope(final Trace trace) {
-        if (ScopeUtils.entryScope(trace, this.scopeName)) {
-            if (isDebug) {
-                logger.debug("Try enter trace scope={}", scopeName);
-            }
+        ScopeUtils.entryScope(trace, this.scopeName);
+        if (isDebug) {
+            logger.debug("Try enter trace scope={}", scopeName);
         }
     }
 

diff --git a/...straps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/ScopeUtils.java b/...straps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/util/ScopeUtils.java
@@ -11,17 +11,15 @@ public final class ScopeUtils {
     private ScopeUtils() {
     }
 
-    public static boolean entryAsyncTraceScope(final Trace trace) {
-        return entryScope(trace, ASYNC_TRACE_SCOPE);
+    public static void entryAsyncTraceScope(final Trace trace) {
+        entryScope(trace, ASYNC_TRACE_SCOPE);
     }
 
-    public static boolean entryScope(final Trace trace, final String scopeName) {
+    public static void entryScope(final Trace trace, final String scopeName) {
         final TraceScope scope = trace.getScope(scopeName);
         if (scope != null) {
             scope.tryEnter();
-            return true;
         }
-        return false;
     }
 
     public static boolean leaveAsyncTraceScope(final Trace trace) {

diff --git a/...main/java/com/navercorp/pinpoint/plugin/rocketmq/interceptor/ProducerSendInterceptor.java b/...main/java/com/navercorp/pinpoint/plugin/rocketmq/interceptor/ProducerSendInterceptor.java
@@ -248,10 +248,9 @@ private boolean initScope(final Trace trace) {
     }
 
     private void entryScope(final Trace trace) {
-        if (ScopeUtils.entryScope(trace, SCOPE_NAME)) {
-            if (isDebug) {
-                logger.debug("Try enter trace scope={}", SCOPE_NAME);
-            }
+        ScopeUtils.entryScope(trace, SCOPE_NAME);
+        if (isDebug) {
+            logger.debug("Try enter trace scope={}", SCOPE_NAME);
         }
     }
 

diff --git a/...npoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageEndInterceptor.java b/...npoint/plugin/thrift/interceptor/tprotocol/server/TProtocolReadMessageEndInterceptor.java
@@ -379,10 +379,9 @@ private boolean initScope(final Trace trace) {
     }
 
     private void entryScope(final Trace trace) {
-        if (ScopeUtils.entryScope(trace, SCOPE_NAME)) {
-            if (isDebug) {
-                logger.debug("Try enter trace scope={}", SCOPE_NAME);
-            }
+        ScopeUtils.entryScope(trace, SCOPE_NAME);
+        if (isDebug) {
+            logger.debug("Try enter trace scope={}", SCOPE_NAME);
         }
     }
 

diff --git a/...ain/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java b/...ain/java/com/navercorp/pinpoint/plugin/user/interceptor/UserIncludeMethodInterceptor.java
@@ -181,10 +181,9 @@ private void deleteUserIncludeTrace(final Trace trace) {
     }
 
     private void entryUserIncludeTraceScope(final Trace trace) {
-        if (ScopeUtils.entryScope(trace, SCOPE_NAME)) {
-            if (isDebug) {
-                logger.debug("Try enter trace scope={}", SCOPE_NAME);
-            }
+        ScopeUtils.entryScope(trace, SCOPE_NAME);
+        if (isDebug) {
+            logger.debug("Try enter trace scope={}", SCOPE_NAME);
         }
     }
 

diff --git a/...navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java b/...navercorp/pinpoint/plugin/vertx/interceptor/ServerConnectionHandleRequestInterceptor.java
@@ -289,10 +289,9 @@ private boolean initScope(final Trace trace) {
     }
 
     private void entryScope(final Trace trace) {
-        if (ScopeUtils.entryScope(trace, SCOPE_NAME)) {
-            if (isDebug) {
-                logger.debug("Try enter trace scope={}", SCOPE_NAME);
-            }
+        ScopeUtils.entryScope(trace, SCOPE_NAME);
+        if (isDebug) {
+            logger.debug("Try enter trace scope={}", SCOPE_NAME);
         }
     }
 

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/id/LocalTraceRootImpl.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/id/LocalTraceRootImpl.java
@@ -44,9 +44,11 @@ public Shared getShared() {
 
     @Override
     public String toString() {
-        return "DefaultLocalTraceRoot{" +
-                ", agentId='" + agentId + '\'' +
+        return "LocalTraceRootImpl{" +
+                "agentId='" + agentId + '\'' +
+                ", localTransactionId=" + localTransactionId +
                 ", traceStartTime=" + traceStartTime +
+                ", shared=" + shared +
                 '}';
     }
 }
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/id/RemoteTraceRootImpl.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/id/RemoteTraceRootImpl.java
@@ -39,10 +39,12 @@ public TraceId getTraceId() {
 
     @Override
     public String toString() {
-        return "DefaultRemoteTraceRoot{" +
+        return "RemoteTraceRootImpl{" +
                 "traceId=" + traceId +
                 ", agentId='" + agentId + '\'' +
+                ", localTransactionId=" + localTransactionId +
                 ", traceStartTime=" + traceStartTime +
+                ", shared=" + shared +
                 '}';
     }