Skip to content

fix: feign RepeatedCollectManager depth leak causing record miss (#587) #622

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
zwobill merged 1 commit into from
Jul 16, 2026
Merged

fix: feign RepeatedCollectManager depth leak causing record miss (#587) #622

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions ...pclient-feign/src/main/java/io/arex/inst/httpclient/feign/FeignClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@ public static boolean onEnter(@Argument(0)Request request,
if (IgnoreUtils.excludeOperation(uri.getPath())) {
return false;
}
// check outermost before enter() so nested http clients (e.g. Feign -> Apache)
// skip replay and avoid request body double consumption
boolean isOutermost = RepeatedCollectManager.validate();
RepeatedCollectManager.enter();
adapter = new FeignClientAdapter(request, uri);
extractor = new HttpClientExtractor(adapter);
if (ContextManager.needReplay()) {
if (ContextManager.needReplay() && isOutermost) {
mockResult = extractor.replay();
return mockResult != null && mockResult.notIgnoreMockResult();
}
Expand All @@ -73,6 +76,9 @@ public static void onExit(@Local("adapter") FeignClientAdapter adapter,
return;
}

// pair enter() unconditionally to keep CallDepth balanced across replay/record mixed flows
boolean isOutermost = RepeatedCollectManager.exitAndValidate();

if (mockResult != null && mockResult.notIgnoreMockResult()) {
if (mockResult.getThrowable() != null) {
throwable = mockResult.getThrowable();
Expand All @@ -82,7 +88,7 @@ public static void onExit(@Local("adapter") FeignClientAdapter adapter,
return;
}

if (ContextManager.needRecord() && RepeatedCollectManager.exitAndValidate()) {
if (ContextManager.needRecord() && isOutermost) {
response = adapter.copyResponse(response);
if (throwable != null) {
extractor.record(throwable);
Expand Down
5 changes: 5 additions & 0 deletions ...ent-feign/src/test/java/io/arex/inst/httpclient/feign/FeignClientInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,12 @@ void onEnter() {

// need replay and not exclude operation
Mockito.when(ContextManager.needReplay()).thenReturn(true);
Mockito.when(RepeatedCollectManager.validate()).thenReturn(true);
assertTrue(FeignClientInstrumentation.ExecuteAdvice.onEnter(request, null, null, null));

// nested call: outer already entered, inner replay should be skipped
Mockito.when(RepeatedCollectManager.validate()).thenReturn(false);
assertFalse(FeignClientInstrumentation.ExecuteAdvice.onEnter(request, null, null, null));
}

@Test
Expand Down
Loading