Skip to content

Switch approach to asserting not null when using satisfies() #14464

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 3 commits into from
Aug 19, 2025
Merged

Switch approach to asserting not null when using satisfies() #14464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ea5d64
Switch approach to asserting not null
jaydeluca Aug 19, 2025
ac9c10d
Merge branch 'main' into fix-assertions
jaydeluca Aug 19, 2025
2dea149
dont use lambda shorthand
jaydeluca Aug 19, 2025
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
6 changes: 2 additions & 4 deletions ...st/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@ static SpanDataAssert sqs(
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "receive"));
} else if (spanName.endsWith("process")) {
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "process"));
attributeAssertions.add(
satisfies(MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull()));
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, val -> val.isNotNull()));
} else if (spanName.endsWith("publish")) {
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "publish"));
attributeAssertions.add(
satisfies(MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull()));
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, val -> val.isNotNull()));
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...g/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public void onCompleted() {
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.satisfies(
spanData ->
assertThat(spanData.getEvents())
Expand Down
20 changes: 10 additions & 10 deletions ....6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public void sayHello(
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfyingExactly(
event ->
event
Expand Down Expand Up @@ -328,7 +328,7 @@ public void sayHello(
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfyingExactly(
event ->
event
Expand Down Expand Up @@ -493,7 +493,7 @@ public void onCompleted() {
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfyingExactly(
event ->
event
Expand Down Expand Up @@ -626,7 +626,7 @@ public void sayHello(
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfying(
events -> {
assertThat(events).isNotEmpty();
Expand Down Expand Up @@ -765,7 +765,7 @@ public void sayHello(
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfying(
events -> {
assertThat(events).hasSize(2);
Expand Down Expand Up @@ -1002,7 +1002,7 @@ public void onCompleted() {
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfyingExactly(
event ->
event
Expand Down Expand Up @@ -1120,7 +1120,7 @@ public void onCompleted() {
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfyingExactly(
event ->
event
Expand Down Expand Up @@ -1235,7 +1235,7 @@ public void onCompleted() {
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfyingExactly(
event ->
event
Expand Down Expand Up @@ -1336,7 +1336,7 @@ public void sayHello(
equalTo(SERVER_PORT, server.getPort()),
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
.hasEventsSatisfyingExactly(
event ->
event
Expand Down Expand Up @@ -1595,7 +1595,7 @@ static List<AttributeAssertion> addExtraClientAttributes(AttributeAssertion... a
if (Boolean.getBoolean("testLatestDeps")) {
result.add(equalTo(NETWORK_TYPE, "ipv4"));
result.add(equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"));
result.add(satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()));
result.add(satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()));
}
return result;
}
Expand Down
3 changes: 1 addition & 2 deletions .../java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import org.assertj.core.api.AbstractAssert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -177,7 +176,7 @@ void testConnectExceptionInsideTheConnectionFuture() {
+ incorrectPort),
satisfies(
AttributeKey.stringKey("exception.stacktrace"),
AbstractAssert::isNotNull)))));
val -> val.isNotNull())))));
}

@Test
Expand Down
3 changes: 1 addition & 2 deletions ...t/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map;
import org.assertj.core.api.AbstractAssert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -137,7 +136,7 @@ void testConnectException() {
+ incorrectPort),
satisfies(
AttributeKey.stringKey("exception.stacktrace"),
AbstractAssert::isNotNull)))));
val -> val.isNotNull())))));
}

@Test
Expand Down
7 changes: 2 additions & 5 deletions ...n/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject;
import org.assertj.core.api.AbstractAssert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -157,8 +156,7 @@ void serviceThrownException() throws Exception {
thrown.getClass().getCanonicalName()),
equalTo(EXCEPTION_MESSAGE, thrown.getMessage()),
satisfies(
EXCEPTION_STACKTRACE,
AbstractAssert::isNotNull)))
EXCEPTION_STACKTRACE, val -> val.isNotNull())))
.hasAttributesSatisfyingExactly(
equalTo(RPC_SYSTEM, "java_rmi"),
equalTo(RPC_SERVICE, "rmi.app.Greeter"),
Expand All @@ -177,8 +175,7 @@ void serviceThrownException() throws Exception {
thrown.getClass().getCanonicalName()),
equalTo(EXCEPTION_MESSAGE, thrown.getMessage()),
satisfies(
EXCEPTION_STACKTRACE,
AbstractAssert::isNotNull)))
EXCEPTION_STACKTRACE, val -> val.isNotNull())))
.hasAttributesSatisfyingExactly(
equalTo(RPC_SYSTEM, "java_rmi"),
equalTo(RPC_SERVICE, "rmi.app.Server"),
Expand Down
3 changes: 1 addition & 2 deletions .../opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
import static org.assertj.core.api.Assertions.assertThat;

import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.spring.webmvc.boot.AbstractSpringBootBasedTest;
Expand Down Expand Up @@ -86,7 +85,7 @@ protected SpanDataAssert assertHandlerSpan(
equalTo(
EXCEPTION_TYPE,
"org.springframework.web.servlet.resource.NoResourceFoundException"),
satisfies(EXCEPTION_MESSAGE, val -> assertThat(val).isNotNull()),
satisfies(EXCEPTION_MESSAGE, val -> val.isNotNull()),
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
return span;
} else {
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected SpanDataAssert assertHandlerSpan(
equalTo(
EXCEPTION_TYPE,
"org.springframework.web.servlet.resource.NoResourceFoundException"),
satisfies(EXCEPTION_MESSAGE, val -> assertThat(val).isNotNull()),
satisfies(EXCEPTION_MESSAGE, val -> val.isNotNull()),
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
return span;
} else {
Expand Down