Skip to content

Commit a549527

Browse files
jaydelucajaydeluca
authored
Switch approach to asserting not null when using satisfies() (#14464)
1 parent f6b1166 commit a549527

File tree

8 files changed

+19
-27
lines changed

8 files changed

+19
-27
lines changed

‎instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,10 @@ static SpanDataAssert sqs(
106106
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "receive"));
107107
} else if (spanName.endsWith("process")) {
108108
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "process"));
109-
attributeAssertions.add(
110-
satisfies(MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull()));
109+
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, val -> val.isNotNull()));
111110
} else if (spanName.endsWith("publish")) {
112111
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "publish"));
113-
attributeAssertions.add(
114-
satisfies(MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull()));
112+
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, val -> val.isNotNull()));
115113
}
116114
}
117115

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public void onCompleted() {
246246
equalTo(SERVER_PORT, server.getPort()),
247247
equalTo(NETWORK_TYPE, "ipv4"),
248248
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
249-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
249+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
250250
.satisfies(
251251
spanData ->
252252
assertThat(spanData.getEvents())

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public void sayHello(
175175
equalTo(SERVER_PORT, server.getPort()),
176176
equalTo(NETWORK_TYPE, "ipv4"),
177177
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
178-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
178+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
179179
.hasEventsSatisfyingExactly(
180180
event ->
181181
event
@@ -328,7 +328,7 @@ public void sayHello(
328328
equalTo(SERVER_PORT, server.getPort()),
329329
equalTo(NETWORK_TYPE, "ipv4"),
330330
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
331-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
331+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
332332
.hasEventsSatisfyingExactly(
333333
event ->
334334
event
@@ -493,7 +493,7 @@ public void onCompleted() {
493493
equalTo(SERVER_PORT, server.getPort()),
494494
equalTo(NETWORK_TYPE, "ipv4"),
495495
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
496-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
496+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
497497
.hasEventsSatisfyingExactly(
498498
event ->
499499
event
@@ -626,7 +626,7 @@ public void sayHello(
626626
equalTo(SERVER_PORT, server.getPort()),
627627
equalTo(NETWORK_TYPE, "ipv4"),
628628
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
629-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
629+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
630630
.hasEventsSatisfying(
631631
events -> {
632632
assertThat(events).isNotEmpty();
@@ -765,7 +765,7 @@ public void sayHello(
765765
equalTo(SERVER_PORT, server.getPort()),
766766
equalTo(NETWORK_TYPE, "ipv4"),
767767
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
768-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
768+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
769769
.hasEventsSatisfying(
770770
events -> {
771771
assertThat(events).hasSize(2);
@@ -1002,7 +1002,7 @@ public void onCompleted() {
10021002
equalTo(SERVER_PORT, server.getPort()),
10031003
equalTo(NETWORK_TYPE, "ipv4"),
10041004
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1005-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1005+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
10061006
.hasEventsSatisfyingExactly(
10071007
event ->
10081008
event
@@ -1120,7 +1120,7 @@ public void onCompleted() {
11201120
equalTo(SERVER_PORT, server.getPort()),
11211121
equalTo(NETWORK_TYPE, "ipv4"),
11221122
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1123-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1123+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
11241124
.hasEventsSatisfyingExactly(
11251125
event ->
11261126
event
@@ -1235,7 +1235,7 @@ public void onCompleted() {
12351235
equalTo(SERVER_PORT, server.getPort()),
12361236
equalTo(NETWORK_TYPE, "ipv4"),
12371237
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1238-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1238+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
12391239
.hasEventsSatisfyingExactly(
12401240
event ->
12411241
event
@@ -1336,7 +1336,7 @@ public void sayHello(
13361336
equalTo(SERVER_PORT, server.getPort()),
13371337
equalTo(NETWORK_TYPE, "ipv4"),
13381338
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1339-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1339+
satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()))
13401340
.hasEventsSatisfyingExactly(
13411341
event ->
13421342
event
@@ -1595,7 +1595,7 @@ static List<AttributeAssertion> addExtraClientAttributes(AttributeAssertion... a
15951595
if (Boolean.getBoolean("testLatestDeps")) {
15961596
result.add(equalTo(NETWORK_TYPE, "ipv4"));
15971597
result.add(equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"));
1598-
result.add(satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()));
1598+
result.add(satisfies(NETWORK_PEER_PORT, val -> val.isNotNull()));
15991599
}
16001600
return result;
16011601
}

‎instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import java.util.function.BiFunction;
5353
import java.util.function.Consumer;
5454
import java.util.function.Function;
55-
import org.assertj.core.api.AbstractAssert;
5655
import org.junit.jupiter.api.AfterAll;
5756
import org.junit.jupiter.api.BeforeAll;
5857
import org.junit.jupiter.api.Test;
@@ -177,7 +176,7 @@ void testConnectExceptionInsideTheConnectionFuture() {
177176
+ incorrectPort),
178177
satisfies(
179178
AttributeKey.stringKey("exception.stacktrace"),
180-
AbstractAssert::isNotNull)))));
179+
val -> val.isNotNull())))));
181180
}
182181

183182
@Test

‎instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceSyncClientTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.net.InetAddress;
2929
import java.net.UnknownHostException;
3030
import java.util.Map;
31-
import org.assertj.core.api.AbstractAssert;
3231
import org.junit.jupiter.api.AfterAll;
3332
import org.junit.jupiter.api.BeforeAll;
3433
import org.junit.jupiter.api.Test;
@@ -137,7 +136,7 @@ void testConnectException() {
137136
+ incorrectPort),
138137
satisfies(
139138
AttributeKey.stringKey("exception.stacktrace"),
140-
AbstractAssert::isNotNull)))));
139+
val -> val.isNotNull())))));
141140
}
142141

143142
@Test

‎instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.rmi.registry.LocateRegistry;
2525
import java.rmi.registry.Registry;
2626
import java.rmi.server.UnicastRemoteObject;
27-
import org.assertj.core.api.AbstractAssert;
2827
import org.junit.jupiter.api.AfterAll;
2928
import org.junit.jupiter.api.BeforeAll;
3029
import org.junit.jupiter.api.Test;
@@ -157,8 +156,7 @@ void serviceThrownException() throws Exception {
157156
thrown.getClass().getCanonicalName()),
158157
equalTo(EXCEPTION_MESSAGE, thrown.getMessage()),
159158
satisfies(
160-
EXCEPTION_STACKTRACE,
161-
AbstractAssert::isNotNull)))
159+
EXCEPTION_STACKTRACE, val -> val.isNotNull())))
162160
.hasAttributesSatisfyingExactly(
163161
equalTo(RPC_SYSTEM, "java_rmi"),
164162
equalTo(RPC_SERVICE, "rmi.app.Greeter"),
@@ -177,8 +175,7 @@ void serviceThrownException() throws Exception {
177175
thrown.getClass().getCanonicalName()),
178176
equalTo(EXCEPTION_MESSAGE, thrown.getMessage()),
179177
satisfies(
180-
EXCEPTION_STACKTRACE,
181-
AbstractAssert::isNotNull)))
178+
EXCEPTION_STACKTRACE, val -> val.isNotNull())))
182179
.hasAttributesSatisfyingExactly(
183180
equalTo(RPC_SYSTEM, "java_rmi"),
184181
equalTo(RPC_SERVICE, "rmi.app.Server"),

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
1313
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
1414
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
15-
import static org.assertj.core.api.Assertions.assertThat;
1615

1716
import io.opentelemetry.api.trace.SpanKind;
1817
import io.opentelemetry.instrumentation.spring.webmvc.boot.AbstractSpringBootBasedTest;
@@ -86,7 +85,7 @@ protected SpanDataAssert assertHandlerSpan(
8685
equalTo(
8786
EXCEPTION_TYPE,
8887
"org.springframework.web.servlet.resource.NoResourceFoundException"),
89-
satisfies(EXCEPTION_MESSAGE, val -> assertThat(val).isNotNull()),
88+
satisfies(EXCEPTION_MESSAGE, val -> val.isNotNull()),
9089
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
9190
return span;
9291
} else {

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected SpanDataAssert assertHandlerSpan(
7070
equalTo(
7171
EXCEPTION_TYPE,
7272
"org.springframework.web.servlet.resource.NoResourceFoundException"),
73-
satisfies(EXCEPTION_MESSAGE, val -> assertThat(val).isNotNull()),
73+
satisfies(EXCEPTION_MESSAGE, val -> val.isNotNull()),
7474
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
7575
return span;
7676
} else {

0 commit comments

Comments
 (0)