Skip to content

Commit 6a15b23

Browse files
trasktrask
committed
Use val for satisfies lambdas
1 parent 310b9e3 commit 6a15b23

25 files changed

Lines changed: 70 additions & 150 deletions

File tree

‎.github/agents/knowledge/testing-general-patterns.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ Inside a `satisfies(AttributeKey, Consumer)` lambda the parameter (e.g., `taskId
3838
Fluent assertion calls like `taskId.contains(jobName)` or `taskId.startsWith(prefix)` are
3939
already proper AssertJ assertions — they throw on failure. Do **not** wrap them in
4040
`assertThat(value.contains(x)).isTrue()`, which degrades the failure message.
41+
- For generic outer `satisfies(AttributeKey, lambda)` parameters, use `val`.
42+
Do not use short generic alternatives like `k` or `v` for the outer parameter.
43+
- If a `satisfies(...)` lambda contains a nested inner lambda and a second parameter name is
44+
required, keep the outer parameter as `val` and use `v` for the nested parameter.
4145

4246
## AssertJ Idiomatic Simplifications
4347

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ void testJmsProducerAndConsumer() {
9494
.hasAttributesSatisfyingExactly(
9595
equalTo(MESSAGING_DESTINATION_NAME, "queue:testQueue"),
9696
equalTo(stringKey("camel.uri"), experimental("jms://queue:testQueue")),
97-
satisfies(
98-
MESSAGING_MESSAGE_ID,
99-
stringAssert -> stringAssert.isInstanceOf(String.class))),
97+
satisfies(MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class))),
10098
span -> span.hasName("mock").hasKind(SpanKind.CLIENT).hasParent(trace.getSpan(2))));
10199
}
102100
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static SpanDataAssert sqs(
8585
equalTo(HTTP_REQUEST_METHOD, "POST"),
8686
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
8787
satisfies(URL_FULL, val -> val.isInstanceOf(String.class)),
88-
satisfies(SERVER_ADDRESS, stringAssert -> stringAssert.isInstanceOf(String.class)),
88+
satisfies(SERVER_ADDRESS, val -> val.isInstanceOf(String.class)),
8989
satisfies(
9090
SERVER_PORT,
9191
val ->
@@ -94,7 +94,7 @@ static SpanDataAssert sqs(
9494
v -> assertThat(v).isInstanceOf(Number.class))),
9595
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
9696
equalTo(RPC_SYSTEM, "aws-api"),
97-
satisfies(RPC_METHOD, stringAssert -> stringAssert.isEqualTo(rpcMethod)),
97+
satisfies(RPC_METHOD, val -> val.isEqualTo(rpcMethod)),
9898
equalTo(RPC_SERVICE, "AmazonSQS")));
9999

100100
if (spanName.endsWith("receive")

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ static SpanDataAssert sqsConsume(SpanDataAssert span, String queueName, int dela
5151
experimental(
5252
"aws-sqs://" + queueName + "?amazonSQSClient=%23sqsClient&delay=" + delay)),
5353
equalTo(MESSAGING_DESTINATION_NAME, queueName),
54-
satisfies(
55-
MESSAGING_MESSAGE_ID, stringAssert -> stringAssert.isInstanceOf(String.class)));
54+
satisfies(MESSAGING_MESSAGE_ID, val -> val.isInstanceOf(String.class)));
5655
}
5756

5857
static SpanDataAssert snsPublish(SpanDataAssert span, String topicName) {

‎instrumentation/graphql-java/graphql-java-common-12.0/testing/src/main/java/io/opentelemetry/instrumentation/graphql/common/v12_0/AbstractGraphqlTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ protected static AttributeAssertion normalizedQueryEqualsTo(
349349
AttributeKey<String> key, String value) {
350350
return satisfies(
351351
key,
352-
stringAssert ->
353-
stringAssert.satisfies(
352+
val ->
353+
val.satisfies(
354354
querySource -> {
355355
String normalized = normalizeQuery(querySource);
356356
String valueNormalized = normalizeQuery(value);

‎instrumentation/hibernate/hibernate-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v3_3/AbstractHibernateTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ static void assertClientSpan(SpanDataAssert span, SpanData parent, String verb)
111111
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
112112
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"),
113113
satisfies(
114-
maybeStable(DB_STATEMENT),
115-
stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),
114+
maybeStable(DB_STATEMENT), val -> val.startsWith(verb.toLowerCase(Locale.ROOT))),
116115
equalTo(DB_QUERY_SUMMARY, emitStableDatabaseSemconv() ? verb + " Value" : null),
117116
equalTo(maybeStable(DB_OPERATION), emitStableDatabaseSemconv() ? null : verb),
118117
equalTo(maybeStable(DB_SQL_TABLE), emitStableDatabaseSemconv() ? null : "Value"));

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/CriteriaTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ void testCriteria(String methodName, Consumer<Criteria> interaction) {
8686
equalTo(
8787
DB_CONNECTION_STRING,
8888
emitStableDatabaseSemconv() ? null : "h2:mem:"),
89-
satisfies(
90-
maybeStable(DB_STATEMENT),
91-
stringAssert -> stringAssert.startsWith("select")),
89+
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("select")),
9290
equalTo(
9391
DB_QUERY_SUMMARY,
9492
emitStableDatabaseSemconv() ? "SELECT Value" : null),

‎instrumentation/hibernate/hibernate-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v4_0/SessionTest.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -870,9 +870,7 @@ void testHibernateOverlappingSessions() {
870870
equalTo(
871871
DB_CONNECTION_STRING,
872872
emitStableDatabaseSemconv() ? null : "h2:mem:"),
873-
satisfies(
874-
maybeStable(DB_STATEMENT),
875-
stringAssert -> stringAssert.startsWith("insert")),
873+
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("insert")),
876874
equalTo(
877875
DB_QUERY_SUMMARY,
878876
emitStableDatabaseSemconv() ? "INSERT Value" : null),
@@ -915,9 +913,7 @@ void testHibernateOverlappingSessions() {
915913
equalTo(
916914
DB_CONNECTION_STRING,
917915
emitStableDatabaseSemconv() ? null : "h2:mem:"),
918-
satisfies(
919-
maybeStable(DB_STATEMENT),
920-
stringAssert -> stringAssert.startsWith("insert")),
916+
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("insert")),
921917
equalTo(
922918
DB_QUERY_SUMMARY,
923919
emitStableDatabaseSemconv() ? "INSERT Value" : null),
@@ -938,9 +934,7 @@ void testHibernateOverlappingSessions() {
938934
equalTo(
939935
DB_CONNECTION_STRING,
940936
emitStableDatabaseSemconv() ? null : "h2:mem:"),
941-
satisfies(
942-
maybeStable(DB_STATEMENT),
943-
stringAssert -> stringAssert.startsWith("delete")),
937+
satisfies(maybeStable(DB_STATEMENT), val -> val.startsWith("delete")),
944938
equalTo(
945939
DB_QUERY_SUMMARY,
946940
emitStableDatabaseSemconv() ? "DELETE Value" : null),

‎instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate6Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v6_0/SessionTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,7 @@ private static SpanDataAssert assertClientSpan(
847847
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
848848
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"),
849849
satisfies(
850-
maybeStable(DB_STATEMENT),
851-
stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),
850+
maybeStable(DB_STATEMENT), val -> val.startsWith(verb.toLowerCase(Locale.ROOT))),
852851
equalTo(DB_QUERY_SUMMARY, emitStableDatabaseSemconv() ? verb + " Value" : null),
853852
equalTo(maybeStable(DB_OPERATION), emitStableDatabaseSemconv() ? null : verb),
854853
equalTo(maybeStable(DB_SQL_TABLE), emitStableDatabaseSemconv() ? null : "Value"));

‎instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,7 @@ private static SpanDataAssert assertClientSpan(
757757
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"),
758758
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : "h2:mem:"),
759759
satisfies(
760-
maybeStable(DB_STATEMENT),
761-
stringAssert -> stringAssert.startsWith(verb.toLowerCase(Locale.ROOT))),
760+
maybeStable(DB_STATEMENT), val -> val.startsWith(verb.toLowerCase(Locale.ROOT))),
762761
equalTo(DB_QUERY_SUMMARY, emitStableDatabaseSemconv() ? verb + " Value" : null),
763762
equalTo(maybeStable(DB_OPERATION), emitStableDatabaseSemconv() ? null : verb),
764763
equalTo(maybeStable(DB_SQL_TABLE), emitStableDatabaseSemconv() ? null : "Value"));

0 commit comments

Comments
 (0)