Skip to content

Sync OutputCapture from Spring Boot #6608

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
merged 1 commit into from
Aug 11, 2025
Merged

Sync OutputCapture from Spring Boot #6608

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
33 changes: 21 additions & 12 deletions micrometer-core/src/test/java/io/micrometer/core/testsupport/system/OutputCapture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,15 @@ class OutputCapture implements CapturedOutput {

private final Deque<SystemCapture> systemCaptures = new ArrayDeque<>();

private final AtomicReference<String> out = new AtomicReference<>(null);
private final AtomicReference<Object> out = new AtomicReference<>();

private final AtomicReference<String> err = new AtomicReference<>(null);
private final AtomicReference<Object> err = new AtomicReference<>();

private final AtomicReference<String> all = new AtomicReference<>(null);
private final AtomicReference<Object> all = new AtomicReference<>();

OutputCapture() {
clearExisting();
}

/**
* Push a new system capture session onto the stack.
Expand Down Expand Up @@ -128,20 +132,21 @@ void reset() {
}

void clearExisting() {
this.out.set(null);
this.err.set(null);
this.all.set(null);
this.out.set(new NoOutput());
this.err.set(new NoOutput());
this.all.set(new NoOutput());
}

private String get(AtomicReference<String> existing, Predicate<Type> filter) {
private String get(AtomicReference<Object> existing, Predicate<Type> filter) {
Assert.state(!this.systemCaptures.isEmpty(),
"No system captures found. Please check your output capture registration.");
String result = existing.get();
if (result == null) {
result = build(filter);
existing.compareAndSet(null, result);
Object existingOutput = existing.get();
if (existingOutput instanceof String) {
return (String) existingOutput;
}
return result;
String builtOutput = build(filter);
existing.compareAndSet(existingOutput, builtOutput);
return builtOutput;
}

String build(Predicate<Type> filter) {
Expand Down Expand Up @@ -306,4 +311,8 @@ enum Type {

}

static class NoOutput {

}

}