Skip to content

Add waitAndAssertLogRecords to InstrumentationTestRunner #16052

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
laurit merged 1 commit into from
Jan 29, 2026
Merged

Add waitAndAssertLogRecords to InstrumentationTestRunner #16052

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
20 changes: 20 additions & 0 deletions ...mon/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
import io.opentelemetry.sdk.logs.data.LogRecordData;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.testing.assertj.LogRecordDataAssert;
import io.opentelemetry.sdk.testing.assertj.MetricAssert;
import io.opentelemetry.sdk.testing.assertj.TraceAssert;
import io.opentelemetry.sdk.testing.assertj.TracesAssert;
Expand All @@ -31,6 +32,7 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -263,6 +265,24 @@ public final List<LogRecordData> waitForLogRecords(int numberOfLogRecords) {
return getExportedLogRecords();
}

@SafeVarargs
@SuppressWarnings("varargs")
public final void waitAndAssertLogRecords(Consumer<LogRecordDataAssert>... assertions) {
waitAndAssertLogRecords(Arrays.asList(assertions));
}

public final void waitAndAssertLogRecords(
Iterable<? extends Consumer<LogRecordDataAssert>> assertions) {
List<Consumer<LogRecordDataAssert>> assertionsList = new ArrayList<>();
assertions.forEach(assertionsList::add);

List<LogRecordData> logRecordDataList = waitForLogRecords(assertionsList.size());
Iterator<Consumer<LogRecordDataAssert>> assertionIterator = assertionsList.iterator();

@laurit laurit Jan 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I initially thought that there should be awaitUntilAsserted like in metrics and trace assertions but it really isn't needed since we know how many log records are needed.

for (LogRecordData logRecordData : logRecordDataList) {
assertionIterator.next().accept(assertThat(logRecordData));
}
}

private List<MetricData> instrumentationMetrics(String instrumentationName) {
return getExportedMetrics().stream()
.filter(m -> m.getInstrumentationScopeInfo().getName().equals(instrumentationName))
Expand Down
19 changes: 2 additions & 17 deletions ...rc/main/java/io/opentelemetry/instrumentation/testing/junit/InstrumentationExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

package io.opentelemetry.instrumentation.testing.junit;

import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.context.ContextStorage;
import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;
Expand All @@ -21,10 +19,7 @@
import io.opentelemetry.sdk.testing.assertj.MetricAssert;
import io.opentelemetry.sdk.testing.assertj.TraceAssert;
import io.opentelemetry.sdk.trace.data.SpanData;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.function.Consumer;
import org.assertj.core.api.ListAssert;
Expand Down Expand Up @@ -157,25 +152,15 @@ public final void waitAndAssertTraces(Iterable<? extends Consumer<TraceAssert>>
testRunner.waitAndAssertTraces(assertions);
}

private void doWaitAndAssertLogRecords(List<Consumer<LogRecordDataAssert>> assertions) {
List<LogRecordData> logRecordDataList = waitForLogRecords(assertions.size());
Iterator<Consumer<LogRecordDataAssert>> assertionIterator = assertions.iterator();
for (LogRecordData logRecordData : logRecordDataList) {
assertionIterator.next().accept(assertThat(logRecordData));
}
}

public final void waitAndAssertLogRecords(
Iterable<? extends Consumer<LogRecordDataAssert>> assertions) {
List<Consumer<LogRecordDataAssert>> assertionsList = new ArrayList<>();
assertions.forEach(assertionsList::add);
doWaitAndAssertLogRecords(assertionsList);
testRunner.waitAndAssertLogRecords(assertions);
}

@SafeVarargs
@SuppressWarnings("varargs")
public final void waitAndAssertLogRecords(Consumer<LogRecordDataAssert>... assertions) {
doWaitAndAssertLogRecords(Arrays.asList(assertions));
testRunner.waitAndAssertLogRecords(assertions);
}

/**
Expand Down
Loading