Skip to content

Commit 0f258c6

Browse files
lauritlaurit
authored
Use hasAttributesSatisfyingExactly instead of hasAttributesSatisfying (#8336)
1 parent d5aac25 commit 0f258c6

File tree

20 files changed

+383
-729
lines changed

20 files changed

+383
-729
lines changed

‎instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterTest.java

+16-21
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
package io.opentelemetry.instrumentation.api.instrumenter;
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
9-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry;
9+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1010
import static org.assertj.core.api.Assertions.entry;
1111
import static org.mockito.Mockito.when;
1212

13+
import io.opentelemetry.api.common.AttributeKey;
1314
import io.opentelemetry.api.common.Attributes;
1415
import io.opentelemetry.api.common.AttributesBuilder;
1516
import io.opentelemetry.api.trace.Span;
@@ -179,16 +180,13 @@ void server() {
179180
.hasParentSpanId(SpanId.getInvalid())
180181
.hasStatus(StatusData.unset())
181182
.hasLinks(expectedSpanLink())
182-
.hasAttributesSatisfying(
183-
attributes ->
184-
assertThat(attributes)
185-
.containsOnly(
186-
attributeEntry("req1", "req1_value"),
187-
attributeEntry("req2", "req2_2_value"),
188-
attributeEntry("req3", "req3_value"),
189-
attributeEntry("resp1", "resp1_value"),
190-
attributeEntry("resp2", "resp2_2_value"),
191-
attributeEntry("resp3", "resp3_value")))));
183+
.hasAttributesSatisfyingExactly(
184+
equalTo(AttributeKey.stringKey("req1"), "req1_value"),
185+
equalTo(AttributeKey.stringKey("req2"), "req2_2_value"),
186+
equalTo(AttributeKey.stringKey("req3"), "req3_value"),
187+
equalTo(AttributeKey.stringKey("resp1"), "resp1_value"),
188+
equalTo(AttributeKey.stringKey("resp2"), "resp2_2_value"),
189+
equalTo(AttributeKey.stringKey("resp3"), "resp3_value"))));
192190
}
193191

194192
@Test
@@ -287,16 +285,13 @@ void client() {
287285
.hasParentSpanId(SpanId.getInvalid())
288286
.hasStatus(StatusData.unset())
289287
.hasLinks(expectedSpanLink())
290-
.hasAttributesSatisfying(
291-
attributes ->
292-
assertThat(attributes)
293-
.containsOnly(
294-
attributeEntry("req1", "req1_value"),
295-
attributeEntry("req2", "req2_2_value"),
296-
attributeEntry("req3", "req3_value"),
297-
attributeEntry("resp1", "resp1_value"),
298-
attributeEntry("resp2", "resp2_2_value"),
299-
attributeEntry("resp3", "resp3_value")))));
288+
.hasAttributesSatisfyingExactly(
289+
equalTo(AttributeKey.stringKey("req1"), "req1_value"),
290+
equalTo(AttributeKey.stringKey("req2"), "req2_2_value"),
291+
equalTo(AttributeKey.stringKey("req3"), "req3_value"),
292+
equalTo(AttributeKey.stringKey("resp1"), "resp1_value"),
293+
equalTo(AttributeKey.stringKey("resp2"), "resp2_2_value"),
294+
equalTo(AttributeKey.stringKey("resp3"), "resp3_value"))));
300295
}
301296

302297
@Test

‎instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperHttpPropagationTest.java

+13-22
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.instrumentation.awslambdacore.v1_0;
77

8+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
89
import static org.assertj.core.api.Assertions.assertThat;
910
import static org.assertj.core.api.Assertions.catchThrowable;
10-
import static org.assertj.core.api.Assertions.entry;
1111
import static org.mockito.Mockito.when;
1212

1313
import com.amazonaws.services.lambda.runtime.Context;
@@ -19,7 +19,6 @@
1919
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda;
2020
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2121
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
22-
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
2322
import io.opentelemetry.sdk.trace.data.StatusData;
2423
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
2524
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -90,16 +89,12 @@ void handlerTraced() throws Exception {
9089
.hasKind(SpanKind.SERVER)
9190
.hasTraceId("4fd0b6131f19f39af59518d127b0cafe")
9291
.hasParentSpanId("0000000000000456")
93-
.hasAttributesSatisfying(
94-
attrs ->
95-
OpenTelemetryAssertions.assertThat(attrs)
96-
.containsOnly(
97-
entry(
98-
ResourceAttributes.CLOUD_RESOURCE_ID,
99-
"arn:aws:lambda:us-east-1:123456789:function:test"),
100-
entry(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
101-
entry(
102-
SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))));
92+
.hasAttributesSatisfyingExactly(
93+
equalTo(
94+
ResourceAttributes.CLOUD_RESOURCE_ID,
95+
"arn:aws:lambda:us-east-1:123456789:function:test"),
96+
equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
97+
equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
10398
}
10499

105100
@Test
@@ -131,16 +126,12 @@ void handlerTracedWithException() {
131126
.hasParentSpanId("0000000000000456")
132127
.hasStatus(StatusData.error())
133128
.hasException(thrown)
134-
.hasAttributesSatisfying(
135-
attrs ->
136-
OpenTelemetryAssertions.assertThat(attrs)
137-
.containsOnly(
138-
entry(
139-
ResourceAttributes.CLOUD_RESOURCE_ID,
140-
"arn:aws:lambda:us-east-1:123456789:function:test"),
141-
entry(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
142-
entry(
143-
SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))));
129+
.hasAttributesSatisfyingExactly(
130+
equalTo(
131+
ResourceAttributes.CLOUD_RESOURCE_ID,
132+
"arn:aws:lambda:us-east-1:123456789:function:test"),
133+
equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
134+
equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
144135
}
145136

146137
public static final class TestRequestHandler implements RequestStreamHandler {

‎instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AwsLambdaStreamWrapperTest.java

+13-22
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.instrumentation.awslambdacore.v1_0;
77

8+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
89
import static org.assertj.core.api.Assertions.assertThat;
910
import static org.assertj.core.api.Assertions.catchThrowable;
10-
import static org.assertj.core.api.Assertions.entry;
1111
import static org.mockito.Mockito.when;
1212

1313
import com.amazonaws.services.lambda.runtime.Context;
@@ -16,7 +16,6 @@
1616
import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.WrappedLambda;
1717
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1818
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
19-
import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
2019
import io.opentelemetry.sdk.trace.data.StatusData;
2120
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
2221
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
@@ -80,16 +79,12 @@ void handlerTraced() throws Exception {
8079
span ->
8180
span.hasName("my_function")
8281
.hasKind(SpanKind.SERVER)
83-
.hasAttributesSatisfying(
84-
attrs ->
85-
OpenTelemetryAssertions.assertThat(attrs)
86-
.containsOnly(
87-
entry(
88-
ResourceAttributes.CLOUD_RESOURCE_ID,
89-
"arn:aws:lambda:us-east-1:123456789:function:test"),
90-
entry(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
91-
entry(
92-
SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))));
82+
.hasAttributesSatisfyingExactly(
83+
equalTo(
84+
ResourceAttributes.CLOUD_RESOURCE_ID,
85+
"arn:aws:lambda:us-east-1:123456789:function:test"),
86+
equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
87+
equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
9388
}
9489

9590
@Test
@@ -112,16 +107,12 @@ void handlerTracedWithException() {
112107
.hasKind(SpanKind.SERVER)
113108
.hasStatus(StatusData.error())
114109
.hasException(thrown)
115-
.hasAttributesSatisfying(
116-
attrs ->
117-
OpenTelemetryAssertions.assertThat(attrs)
118-
.containsOnly(
119-
entry(
120-
ResourceAttributes.CLOUD_RESOURCE_ID,
121-
"arn:aws:lambda:us-east-1:123456789:function:test"),
122-
entry(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
123-
entry(
124-
SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333")))));
110+
.hasAttributesSatisfyingExactly(
111+
equalTo(
112+
ResourceAttributes.CLOUD_RESOURCE_ID,
113+
"arn:aws:lambda:us-east-1:123456789:function:test"),
114+
equalTo(ResourceAttributes.CLOUD_ACCOUNT_ID, "123456789"),
115+
equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
125116
}
126117

127118
public static final class TestRequestHandler implements RequestStreamHandler {

‎instrumentation/aws-lambda/aws-lambda-core-1.0/testing/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/AbstractAwsLambdaTest.java

+7-22
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.instrumentation.awslambdacore.v1_0;
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
9+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
910
import static org.assertj.core.api.Assertions.catchThrowable;
10-
import static org.assertj.core.api.Assertions.entry;
1111
import static org.mockito.Mockito.when;
1212

1313
import com.amazonaws.services.lambda.runtime.Context;
@@ -65,13 +65,8 @@ void handlerTraced() {
6565
span ->
6666
span.hasName("my_function")
6767
.hasKind(SpanKind.SERVER)
68-
.hasAttributesSatisfying(
69-
attrs ->
70-
assertThat(attrs)
71-
.containsOnly(
72-
entry(
73-
SemanticAttributes.FAAS_INVOCATION_ID,
74-
"1-22-333")))));
68+
.hasAttributesSatisfyingExactly(
69+
equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
7570
}
7671

7772
@Test
@@ -88,13 +83,8 @@ void handlerTracedWithException() {
8883
.hasKind(SpanKind.SERVER)
8984
.hasStatus(StatusData.error())
9085
.hasException(thrown)
91-
.hasAttributesSatisfying(
92-
attrs ->
93-
assertThat(attrs)
94-
.containsOnly(
95-
entry(
96-
SemanticAttributes.FAAS_INVOCATION_ID,
97-
"1-22-333")))));
86+
.hasAttributesSatisfyingExactly(
87+
equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
9888
}
9989

10090
@Test
@@ -128,12 +118,7 @@ void handlerLinksToInfrastructureTrace() {
128118
AttributeKey.stringKey("source"),
129119
"x-ray-env"));
130120
}))
131-
.hasAttributesSatisfying(
132-
attrs ->
133-
assertThat(attrs)
134-
.containsOnly(
135-
entry(
136-
SemanticAttributes.FAAS_INVOCATION_ID,
137-
"1-22-333")))));
121+
.hasAttributesSatisfyingExactly(
122+
equalTo(SemanticAttributes.FAAS_INVOCATION_ID, "1-22-333"))));
138123
}
139124
}

0 commit comments

Comments
 (0)