Skip to content

[#14044] Strengthen coroutine lifecycle regression #14047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaehong-kim merged 1 commit into from
Jul 24, 2026
+34 −6
Merged

[#14044] Strengthen coroutine lifecycle regression #14047

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions ...m/navercorp/pinpoint/plugin/kotlinx/coroutines/interceptor/ResumeWithInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import com.navercorp.pinpoint.bootstrap.context.TraceBlock;
import com.navercorp.pinpoint.bootstrap.context.TraceContext;
import com.navercorp.pinpoint.bootstrap.context.scope.TraceScope;
import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor;
import com.navercorp.pinpoint.bootstrap.interceptor.BlockAroundInterceptor;
import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor;
import kotlin.coroutines.Continuation;
import kotlin.coroutines.CoroutineContext;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -34,9 +36,11 @@
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import java.util.concurrent.atomic.AtomicReference;

import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -80,12 +84,18 @@ void setUp() {
}

@Test
void closesTraceBlockCreatedBeforeResumeWhenCurrentAsyncTraceIsUnavailable() {
BlockAroundInterceptor interceptor = assertInstanceOf(
BlockAroundInterceptor.class, new ResumeWithInterceptor(traceContext, methodDescriptor));
void closesStartedTraceBlockAfterNestedReactorCallbackClearsCurrentTrace() {
AtomicReference<Trace> currentTrace = new AtomicReference<>(trace);
lenient().when(asyncContext.currentAsyncTraceObject()).thenAnswer(invocation -> currentTrace.get());
lenient().when(trace.traceBlockBegin()).thenReturn(traceBlock);

// Keep the pre-fix AroundInterceptor path executable so this test fails on behavior.
Interceptor interceptor = new ResumeWithInterceptor(traceContext, methodDescriptor);
TraceBlock block = beforeResume(interceptor);

TraceBlock block = interceptor.before(continuation, null);
interceptor.after(block, continuation, null, null, null);
// Simulate a nested Reactor callback clearing the current async trace between interceptor hooks.
currentTrace.set(null);
afterResume(interceptor, block);

assertSame(traceBlock, block);
verify(asyncContext, never()).currentAsyncTraceObject();
Expand All @@ -97,4 +107,22 @@ void closesTraceBlockCreatedBeforeResumeWhenCurrentAsyncTraceIsUnavailable() {
inOrder.verify(traceScope).leave();
inOrder.verify(traceBlock).close();
}

private TraceBlock beforeResume(Interceptor interceptor) {
if (interceptor instanceof BlockAroundInterceptor) {
return ((BlockAroundInterceptor) interceptor).before(continuation, null);
}

((AroundInterceptor) interceptor).before(continuation, null);
return traceBlock;
}

private void afterResume(Interceptor interceptor, TraceBlock block) {
if (interceptor instanceof BlockAroundInterceptor) {
((BlockAroundInterceptor) interceptor).after(block, continuation, null, null, null);
return;
}

((AroundInterceptor) interceptor).after(continuation, null, null, null);
}
}
Loading