[#10371] Update child trace end point guard

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/AsyncChildTrace.java → profiler/src/main/java/com/navercorp/pinpoint/profiler/context/ChildTrace.java

@@ -33,7 +33,7 @@
 
 import java.util.Objects;
 
-public class AsyncChildTrace implements Trace {
+public class ChildTrace implements Trace {
 
     private static final int ASYNC_BEGIN_STACK_ID = 1001;
 
@@ -56,10 +56,10 @@
     private final TraceRoot traceRoot;
     private final LocalAsyncId localAsyncId;
 
-    public AsyncChildTrace(final TraceRoot traceRoot, CallStack<SpanEvent> callStack, Storage storage,
-                           SpanRecorder spanRecorder, WrappedSpanEventRecorder wrappedSpanEventRecorder,
-                           ExceptionContext exceptionContext,
-                           final LocalAsyncId localAsyncId) {
+    public ChildTrace(final TraceRoot traceRoot, CallStack<SpanEvent> callStack, Storage storage,
+                      SpanRecorder spanRecorder, WrappedSpanEventRecorder wrappedSpanEventRecorder,
+                      ExceptionContext exceptionContext,
+                      final LocalAsyncId localAsyncId) {
 
         this.traceRoot = Objects.requireNonNull(traceRoot, "traceRoot");
         this.callStack = Objects.requireNonNull(callStack, "callStack");
@@ -307,7 +307,7 @@
 
     @Override
     public String toString() {
-        return "AsyncChildTrace{" +
+        return "ChildTrace{" +
                 "traceRoot=" + getTraceRoot() +
                 ", localAsyncId=" + localAsyncId +
                 '}';

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/DefaultBaseTraceFactory.java

@@ -135,19 +135,19 @@
         final CallStack<SpanEvent> callStack = callStackFactory.newCallStack();
 
         final SpanRecorder spanRecorder = recorderFactory.newTraceRootSpanRecorder(traceRoot);
-        final WrappedSpanEventRecorder wrappedSpanEventRecorder = recorderFactory.newWrappedSpanEventRecorder(traceRoot);
+        final WrappedSpanEventRecorder wrappedSpanEventRecorder = recorderFactory.newChildTraceSpanEventRecorder(traceRoot);
         final ExceptionContext exceptionContext = exceptionContextFactory.newExceptionContext(traceRoot);
 
-        return new AsyncChildTrace(traceRoot, callStack, storage, spanRecorder, wrappedSpanEventRecorder, exceptionContext, localAsyncId);
+        return new ChildTrace(traceRoot, callStack, storage, spanRecorder, wrappedSpanEventRecorder, exceptionContext, localAsyncId);
     }
 
     @Override
     public Trace continueDisableAsyncContextTraceObject(LocalTraceRoot traceRoot) {
         final AsyncState asyncState = newAsyncState(traceRoot, ActiveTraceHandle.EMPTY_HANDLE, ListenableAsyncState.AsyncStateListener.EMPTY);
 
         SpanRecorder spanRecorder = recorderFactory.newDisableSpanRecorder(traceRoot);
-        SpanEventRecorder spanEventRecorder = recorderFactory.newDisableSpanEventRecorder(traceRoot, asyncState);
-        return new DisableAsyncChildTrace(traceRoot, spanRecorder, spanEventRecorder);
+        SpanEventRecorder spanEventRecorder = recorderFactory.newDisableChildTraceSpanEventRecorder(traceRoot, asyncState);
+        return new DisableChildTrace(traceRoot, spanRecorder, spanEventRecorder);
     }
 
     // entry point async trace.

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/DisableAsyncChildTrace.java → profiler/src/main/java/com/navercorp/pinpoint/profiler/context/DisableChildTrace.java

@@ -28,7 +28,7 @@
 
 import java.util.Objects;
 
-public class DisableAsyncChildTrace implements Trace {
+public class DisableChildTrace implements Trace {
     // private static final int ASYNC_BEGIN_STACK_ID = 1001;
     public static final String UNSUPPORTED_OPERATION = "disable async child trace";
 
@@ -45,7 +45,7 @@
     private final SpanRecorder spanRecorder;
     private final SpanEventRecorder spanEventRecorder;
 
-    public DisableAsyncChildTrace(final LocalTraceRoot traceRoot, SpanRecorder spanRecorder, SpanEventRecorder spanEventRecorder) {
+    public DisableChildTrace(final LocalTraceRoot traceRoot, SpanRecorder spanRecorder, SpanEventRecorder spanEventRecorder) {
         this.traceRoot = Objects.requireNonNull(traceRoot, "traceRoot");
         this.spanRecorder = Objects.requireNonNull(spanRecorder, "spanRecorder");
         this.spanEventRecorder = Objects.requireNonNull(spanEventRecorder, "spanEventRecorder");
@@ -172,7 +172,7 @@
 
     @Override
     public String toString() {
-        return "DisableAsyncChildTrace{" +
+        return "DisableChildTrace{" +
                 "traceRoot=" + traceRoot +
                 '}';
     }

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/ChildTraceSpanEventRecorder.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.profiler.context.recorder;
+
+import com.navercorp.pinpoint.bootstrap.context.AsyncContext;
+import com.navercorp.pinpoint.profiler.context.AsyncContextFactory;
+import com.navercorp.pinpoint.profiler.context.errorhandler.IgnoreErrorHandler;
+import com.navercorp.pinpoint.profiler.context.exception.ExceptionRecordingService;
+import com.navercorp.pinpoint.profiler.context.id.TraceRoot;
+import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService;
+import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService;
+
+public class ChildTraceSpanEventRecorder extends WrappedSpanEventRecorder {
+
+    public ChildTraceSpanEventRecorder(TraceRoot traceRoot,
+                                       AsyncContextFactory asyncContextFactory,
+                                       StringMetaDataService stringMetaDataService,
+                                       SqlMetaDataService sqlMetaDataService,
+                                       IgnoreErrorHandler ignoreErrorHandler,
+                                       ExceptionRecordingService exceptionRecordingService) {
+        super(traceRoot, asyncContextFactory, stringMetaDataService, sqlMetaDataService, ignoreErrorHandler, exceptionRecordingService);
+    }
+
+    @Override
+    public AsyncContext recordNextAsyncContext(boolean asyncStateSupport) {
+        return super.recordNextAsyncContext();
+    }
+}

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultRecorderFactory.java

@@ -26,7 +26,6 @@
 import com.navercorp.pinpoint.profiler.context.exception.ExceptionRecordingService;
 import com.navercorp.pinpoint.profiler.context.id.LocalTraceRoot;
 import com.navercorp.pinpoint.profiler.context.id.TraceRoot;
-import com.navercorp.pinpoint.profiler.context.exception.DefaultExceptionRecordingService;
 import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService;
 import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService;
 
@@ -97,6 +96,15 @@
                 stringMetaDataService, sqlMetaDataService, errorHandler, exceptionRecordingService);
     }
 
+    @Override
+    public WrappedSpanEventRecorder newChildTraceSpanEventRecorder(TraceRoot traceRoot) {
+        Objects.requireNonNull(traceRoot, "traceRoot");
+
+        final AsyncContextFactory asyncContextFactory = asyncContextFactoryProvider.get();
+        return new ChildTraceSpanEventRecorder(traceRoot, asyncContextFactory,
+                stringMetaDataService, sqlMetaDataService, errorHandler, exceptionRecordingService);
+    }
+
     @Override
     public DisableSpanEventRecorder newDisableSpanEventRecorder(LocalTraceRoot traceRoot, AsyncState asyncState) {
         Objects.requireNonNull(traceRoot, "traceRoot");
@@ -116,4 +124,13 @@
         final AsyncContextFactory asyncContextFactory = asyncContextFactoryProvider.get();
         return new DisableSpanEventRecorder(traceRoot, asyncContextFactory, asyncState);
     }
+
+    @Override
+    public DisableSpanEventRecorder newDisableChildTraceSpanEventRecorder(LocalTraceRoot traceRoot, AsyncState asyncState) {
+        Objects.requireNonNull(traceRoot, "traceRoot");
+        Objects.requireNonNull(asyncState, "asyncState");
+
+        final AsyncContextFactory asyncContextFactory = asyncContextFactoryProvider.get();
+        return new DisableChildTraceSpanEventRecorder(traceRoot, asyncContextFactory, asyncState);
+    }
 }

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/DisableChildTraceSpanEventRecorder.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 NAVER Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.navercorp.pinpoint.profiler.context.recorder;
+
+import com.navercorp.pinpoint.bootstrap.context.AsyncContext;
+import com.navercorp.pinpoint.bootstrap.context.AsyncState;
+import com.navercorp.pinpoint.profiler.context.AsyncContextFactory;
+import com.navercorp.pinpoint.profiler.context.id.LocalTraceRoot;
+
+public class DisableChildTraceSpanEventRecorder extends DisableSpanEventRecorder {
+
+    public DisableChildTraceSpanEventRecorder(LocalTraceRoot traceRoot, AsyncContextFactory asyncContextFactory, AsyncState asyncState) {
+        super(traceRoot, asyncContextFactory, asyncState);
+    }
+
+    @Override
+    public AsyncContext recordNextAsyncContext(boolean stateful) {
+        // child trace does not have an async end-point
+        return super.recordNextAsyncContext();
+    }
+}

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/recorder/RecorderFactory.java

@@ -37,7 +37,11 @@ public interface RecorderFactory {
 
     WrappedSpanEventRecorder newWrappedSpanEventRecorder(TraceRoot traceRoot, AsyncState asyncState);
 
+    WrappedSpanEventRecorder newChildTraceSpanEventRecorder(TraceRoot traceRoot);
+
     DisableSpanEventRecorder newDisableSpanEventRecorder(LocalTraceRoot traceRoot);
 
     DisableSpanEventRecorder newDisableSpanEventRecorder(LocalTraceRoot traceRoot, AsyncState asyncState);
+
+    DisableSpanEventRecorder newDisableChildTraceSpanEventRecorder(LocalTraceRoot traceRoot, AsyncState asyncState);
 }

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/AsyncContextTest.java

@@ -39,7 +39,7 @@ protected AsyncTraceContext newAsyncTraceContext() {
                 .thenAnswer(new Answer<Trace>() {
                     @Override
                     public Trace answer(InvocationOnMock invocationOnMock) {
-                        Trace trace = mock(AsyncChildTrace.class);
+                        Trace trace = mock(ChildTrace.class);
                         when(trace.canSampled()).thenReturn(true);
                         return trace;
                     }
@@ -48,7 +48,7 @@ public Trace answer(InvocationOnMock invocationOnMock) {
                 .thenAnswer(new Answer<Trace>() {
                     @Override
                     public Trace answer(InvocationOnMock invocationOnMock) {
-                        return mock(DisableAsyncChildTrace.class);
+                        return mock(DisableChildTrace.class);
                     }
                 });
         when(baseTraceFactoryProvider.get()).thenReturn(baseTraceFactory);
@@ -76,10 +76,10 @@ public void testAsyncTraceObject() {
         Trace enabledTrace = enabledAsyncContext.continueAsyncTraceObject();
         Trace disabledTrace = disabledAsyncContext.continueAsyncTraceObject();
         assertThat(enabledTrace)
-                .isInstanceOf(AsyncChildTrace.class)
+                .isInstanceOf(ChildTrace.class)
                 .isEqualTo(enabledAsyncContext.currentAsyncTraceObject());
         assertThat(disabledTrace)
-                .isInstanceOf(DisableAsyncChildTrace.class)
+                .isInstanceOf(DisableChildTrace.class)
                 .isEqualTo(disabledAsyncContext.currentAsyncTraceObject());
 
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultAsyncTraceContextTest.java

@@ -30,7 +30,7 @@ protected AsyncTraceContext newAsyncTraceContext() {
                 .thenAnswer(new Answer<Trace>() {
                     @Override
                     public Trace answer(InvocationOnMock invocationOnMock) {
-                        Trace trace = mock(AsyncChildTrace.class);
+                        Trace trace = mock(ChildTrace.class);
                         when(trace.canSampled()).thenReturn(true);
                         return trace;
                     }
@@ -39,7 +39,7 @@ public Trace answer(InvocationOnMock invocationOnMock) {
                 .thenAnswer(new Answer<Trace>() {
                     @Override
                     public Trace answer(InvocationOnMock invocationOnMock) {
-                        return mock(DisableAsyncChildTrace.class);
+                        return mock(DisableChildTrace.class);
                     }
                 });
         when(baseTraceFactoryProvider.get()).thenReturn(baseTraceFactory);

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/id/LocalTraceRootTest.java

@@ -4,7 +4,7 @@
 import com.navercorp.pinpoint.bootstrap.context.SpanRecorder;
 import com.navercorp.pinpoint.bootstrap.context.Trace;
 import com.navercorp.pinpoint.profiler.context.CloseListener;
-import com.navercorp.pinpoint.profiler.context.DisableAsyncChildTrace;
+import com.navercorp.pinpoint.profiler.context.DisableChildTrace;
 import com.navercorp.pinpoint.profiler.context.DisableTrace;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -77,6 +77,6 @@ private Trace newTrace(LocalTraceRoot traceRoot) {
     private Trace newChildTrace(LocalTraceRoot traceRoot) {
         SpanRecorder spanRecorder = mock(SpanRecorder.class);
         SpanEventRecorder spanEventRecorder = mock(SpanEventRecorder.class);
-        return new DisableAsyncChildTrace(traceRoot, spanRecorder, spanEventRecorder);
+        return new DisableChildTrace(traceRoot, spanRecorder, spanEventRecorder);
     }
 }