Skip to content

Commit 6038ef3

Browse files
trasktrask
committed
Use val for satisfies lambdas, part 2
1 parent f8e3e32 commit 6038ef3

6 files changed

Lines changed: 89 additions & 71 deletions

File tree

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,13 @@ void testApacheDubboBase() throws ReflectiveOperationException {
158158
maybeStablePeerService(),
159159
hasServicePeerName() ? "test-peer-service" : null),
160160
equalTo(SERVER_ADDRESS, "localhost"),
161-
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
161+
satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)),
162162
satisfies(
163163
NETWORK_PEER_ADDRESS,
164-
k -> assertLatestDeps(k, a -> a.isInstanceOf(String.class))),
164+
val -> assertLatestDeps(val, v -> v.isInstanceOf(String.class))),
165165
satisfies(
166166
NETWORK_PEER_PORT,
167-
k -> assertLatestDeps(k, a -> a.isInstanceOf(Long.class))),
167+
val -> assertLatestDeps(val, v -> v.isInstanceOf(Long.class))),
168168
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
169169
span ->
170170
span.hasName(
@@ -189,8 +189,9 @@ void testApacheDubboBase() throws ReflectiveOperationException {
189189
hasServicePeerName() && Boolean.getBoolean("testLatestDeps")
190190
? "test-peer-service"
191191
: null),
192-
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
193-
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)))));
192+
satisfies(
193+
NETWORK_PEER_ADDRESS, val -> val.isInstanceOf(String.class)),
194+
satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class)))));
194195

195196
if (emitOldRpcSemconv()) {
196197
testing()
@@ -234,7 +235,8 @@ void testApacheDubboBase() throws ReflectiveOperationException {
234235
equalTo(RPC_METHOD, "$invoke"),
235236
equalTo(SERVER_ADDRESS, "localhost"),
236237
satisfies(
237-
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
238+
SERVER_PORT,
239+
val -> val.isInstanceOf(Long.class)),
238240
satisfies(
239241
NETWORK_TYPE,
240242
AbstractDubboTest::assertNetworkType))))));
@@ -281,7 +283,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
281283
equalTo(SERVER_ADDRESS, "localhost"),
282284
satisfies(
283285
SERVER_PORT,
284-
k -> k.isInstanceOf(Long.class)))))));
286+
val -> val.isInstanceOf(Long.class)))))));
285287
}
286288
}
287289

@@ -349,13 +351,13 @@ void testApacheDubboTest()
349351
maybeStablePeerService(),
350352
hasServicePeerName() ? "test-peer-service" : null),
351353
equalTo(SERVER_ADDRESS, "localhost"),
352-
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
354+
satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)),
353355
satisfies(
354356
NETWORK_PEER_ADDRESS,
355-
k -> assertLatestDeps(k, a -> a.isInstanceOf(String.class))),
357+
val -> assertLatestDeps(val, v -> v.isInstanceOf(String.class))),
356358
satisfies(
357359
NETWORK_PEER_PORT,
358-
k -> assertLatestDeps(k, a -> a.isInstanceOf(Long.class))),
360+
val -> assertLatestDeps(val, v -> v.isInstanceOf(Long.class))),
359361
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
360362
span ->
361363
span.hasName(
@@ -380,17 +382,18 @@ void testApacheDubboTest()
380382
hasServicePeerName() && Boolean.getBoolean("testLatestDeps")
381383
? "test-peer-service"
382384
: null),
383-
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
384-
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
385+
satisfies(
386+
NETWORK_PEER_ADDRESS, val -> val.isInstanceOf(String.class)),
387+
satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class)),
385388
// this attribute is not filled reliably, it is either null or
386389
// "ipv4"/"ipv6"
387390
satisfies(
388391
NETWORK_TYPE,
389-
k ->
392+
val ->
390393
assertLatestDeps(
391-
k,
392-
a ->
393-
a.satisfiesAnyOf(
394+
val,
395+
v ->
396+
v.satisfiesAnyOf(
394397
val -> assertThat(val).isNull(),
395398
val -> assertThat(val).isEqualTo("ipv4"),
396399
val -> assertThat(val).isEqualTo("ipv6")))))));
@@ -437,7 +440,8 @@ void testApacheDubboTest()
437440
equalTo(RPC_METHOD, "$invokeAsync"),
438441
equalTo(SERVER_ADDRESS, "localhost"),
439442
satisfies(
440-
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
443+
SERVER_PORT,
444+
val -> val.isInstanceOf(Long.class)),
441445
satisfies(
442446
NETWORK_TYPE,
443447
AbstractDubboTest::assertNetworkType))))));

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ void testDubboChain() throws ReflectiveOperationException {
200200
maybeStablePeerService(),
201201
hasServicePeerName() ? "test-peer-service" : null),
202202
equalTo(SERVER_ADDRESS, "localhost"),
203-
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
203+
satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)),
204204
satisfies(
205205
NETWORK_PEER_ADDRESS,
206-
k -> assertLatestDeps(k, a -> a.isInstanceOf(String.class))),
206+
val -> assertLatestDeps(val, v -> v.isInstanceOf(String.class))),
207207
satisfies(
208208
NETWORK_PEER_PORT,
209-
k -> assertLatestDeps(k, a -> a.isInstanceOf(Long.class))),
209+
val -> assertLatestDeps(val, v -> v.isInstanceOf(Long.class))),
210210
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
211211
span ->
212212
span.hasName(
@@ -231,8 +231,9 @@ void testDubboChain() throws ReflectiveOperationException {
231231
hasServicePeerName() && Boolean.getBoolean("testLatestDeps")
232232
? "test-peer-service"
233233
: null),
234-
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
235-
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class))),
234+
satisfies(
235+
NETWORK_PEER_ADDRESS, val -> val.isInstanceOf(String.class)),
236+
satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class))),
236237
span ->
237238
span.hasName("org.apache.dubbo.rpc.service.GenericService/$invoke")
238239
.hasKind(SpanKind.CLIENT)
@@ -254,13 +255,13 @@ void testDubboChain() throws ReflectiveOperationException {
254255
maybeStablePeerService(),
255256
hasServicePeerName() ? "test-peer-service" : null),
256257
equalTo(SERVER_ADDRESS, "localhost"),
257-
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
258+
satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)),
258259
satisfies(
259260
NETWORK_PEER_ADDRESS,
260-
k -> assertLatestDeps(k, a -> a.isInstanceOf(String.class))),
261+
val -> assertLatestDeps(val, v -> v.isInstanceOf(String.class))),
261262
satisfies(
262263
NETWORK_PEER_PORT,
263-
k -> assertLatestDeps(k, a -> a.isInstanceOf(Long.class))),
264+
val -> assertLatestDeps(val, v -> v.isInstanceOf(Long.class))),
264265
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
265266
span ->
266267
span.hasName(
@@ -285,8 +286,9 @@ void testDubboChain() throws ReflectiveOperationException {
285286
hasServicePeerName() && Boolean.getBoolean("testLatestDeps")
286287
? "test-peer-service"
287288
: null),
288-
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
289-
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)))));
289+
satisfies(
290+
NETWORK_PEER_ADDRESS, val -> val.isInstanceOf(String.class)),
291+
satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class)))));
290292

291293
if (emitOldRpcSemconv()) {
292294
testing()
@@ -337,7 +339,8 @@ void testDubboChain() throws ReflectiveOperationException {
337339
equalTo(RPC_METHOD, "$invoke"),
338340
equalTo(SERVER_ADDRESS, "localhost"),
339341
satisfies(
340-
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
342+
SERVER_PORT,
343+
val -> val.isInstanceOf(Long.class)),
341344
satisfies(
342345
NETWORK_TYPE,
343346
AbstractDubboTest::assertNetworkType)),
@@ -350,7 +353,8 @@ void testDubboChain() throws ReflectiveOperationException {
350353
equalTo(RPC_METHOD, "$invoke"),
351354
equalTo(SERVER_ADDRESS, "localhost"),
352355
satisfies(
353-
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
356+
SERVER_PORT,
357+
val -> val.isInstanceOf(Long.class)),
354358
satisfies(
355359
NETWORK_TYPE,
356360
AbstractDubboTest::assertNetworkType))))));
@@ -403,7 +407,7 @@ void testDubboChain() throws ReflectiveOperationException {
403407
equalTo(SERVER_ADDRESS, "localhost"),
404408
satisfies(
405409
SERVER_PORT,
406-
k -> k.isInstanceOf(Long.class))),
410+
val -> val.isInstanceOf(Long.class))),
407411
point ->
408412
point.hasAttributesSatisfyingExactly(
409413
equalTo(RPC_SYSTEM_NAME, "dubbo"),
@@ -413,7 +417,7 @@ void testDubboChain() throws ReflectiveOperationException {
413417
equalTo(SERVER_ADDRESS, "localhost"),
414418
satisfies(
415419
SERVER_PORT,
416-
k -> k.isInstanceOf(Long.class)))))));
420+
val -> val.isInstanceOf(Long.class)))))));
417421
}
418422
}
419423

@@ -487,13 +491,13 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
487491
maybeStablePeerService(),
488492
hasServicePeerName() ? "test-peer-service" : null),
489493
equalTo(SERVER_ADDRESS, "localhost"),
490-
satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
494+
satisfies(SERVER_PORT, val -> val.isInstanceOf(Long.class)),
491495
satisfies(
492496
NETWORK_PEER_ADDRESS,
493-
k -> assertLatestDeps(k, a -> a.isInstanceOf(String.class))),
497+
val -> assertLatestDeps(val, v -> v.isInstanceOf(String.class))),
494498
satisfies(
495499
NETWORK_PEER_PORT,
496-
k -> assertLatestDeps(k, a -> a.isInstanceOf(Long.class))),
500+
val -> assertLatestDeps(val, v -> v.isInstanceOf(Long.class))),
497501
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
498502
span ->
499503
span.hasName(
@@ -518,8 +522,9 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
518522
hasServicePeerName() && Boolean.getBoolean("testLatestDeps")
519523
? "test-peer-service"
520524
: null),
521-
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
522-
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)))));
525+
satisfies(
526+
NETWORK_PEER_ADDRESS, val -> val.isInstanceOf(String.class)),
527+
satisfies(NETWORK_PEER_PORT, val -> val.isInstanceOf(Long.class)))));
523528

524529
if (emitOldRpcSemconv()) {
525530
testing()
@@ -563,7 +568,8 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
563568
equalTo(RPC_METHOD, "$invoke"),
564569
equalTo(SERVER_ADDRESS, "localhost"),
565570
satisfies(
566-
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
571+
SERVER_PORT,
572+
val -> val.isInstanceOf(Long.class)),
567573
satisfies(
568574
NETWORK_TYPE,
569575
AbstractDubboTest::assertNetworkType))))));
@@ -610,7 +616,7 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
610616
equalTo(SERVER_ADDRESS, "localhost"),
611617
satisfies(
612618
SERVER_PORT,
613-
k -> k.isInstanceOf(Long.class)))))));
619+
val -> val.isInstanceOf(Long.class)))))));
614620
}
615621
}
616622
}

0 commit comments

Comments
 (0)