Skip to content

Commit d503937

Browse files
lauritlaurit
authored
Remove guava dependency from testing-common (#13676)
1 parent 62e4de9 commit d503937

File tree

44 files changed

+90
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+90
-109
lines changed

‎instrumentation/armeria/armeria-1.3/javaagent/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ dependencies {
1919
testLibrary("com.linecorp.armeria:armeria-junit5:1.3.0")
2020

2121
testImplementation(project(":instrumentation:armeria:armeria-1.3:testing"))
22+
23+
// needed for latest dep tests
24+
testCompileOnly("com.google.errorprone:error_prone_annotations")
2225
}
2326

2427
tasks {

‎instrumentation/armeria/armeria-1.3/library/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ dependencies {
77
library("com.linecorp.armeria:armeria:1.3.0")
88

99
testImplementation(project(":instrumentation:armeria:armeria-1.3:testing"))
10+
11+
// needed for latest dep tests
12+
testCompileOnly("com.google.errorprone:error_prone_annotations")
1013
}
1114

1215
tasks {

‎instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ dependencies {
2323
testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
2424
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
2525
testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
26-
testImplementation("com.google.guava:guava")
2726

2827
testImplementation(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:testing"))
2928
testImplementation("uk.org.webcompere:system-stubs-jupiter")

‎instrumentation/aws-lambda/aws-lambda-core-1.0/testing/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ dependencies {
1010
api("org.junit-pioneer:junit-pioneer")
1111
api("org.mockito:mockito-junit-jupiter")
1212

13-
implementation("com.google.guava:guava")
14-
1513
implementation("io.opentelemetry:opentelemetry-api")
1614
implementation("com.github.stefanbirkner:system-lambda")
1715
}

‎instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939

4040
testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
4141
testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
42-
testImplementation("com.google.guava:guava")
4342
testImplementation("com.amazonaws:aws-lambda-java-serialization:1.1.5")
4443

4544
testImplementation(project(":instrumentation:aws-lambda:aws-lambda-events-2.2:testing"))

‎instrumentation/aws-lambda/aws-lambda-events-2.2/testing/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ dependencies {
1111
api("org.junit-pioneer:junit-pioneer")
1212
api("org.mockito:mockito-junit-jupiter")
1313

14-
implementation("com.google.guava:guava")
15-
1614
implementation("io.opentelemetry:opentelemetry-api")
1715
implementation("com.github.stefanbirkner:system-lambda")
1816
}

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws0ClientTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
2424
import static java.util.Arrays.asList;
2525
import static java.util.Collections.emptyMap;
26+
import static java.util.Collections.singletonMap;
2627
import static org.assertj.core.api.Assertions.assertThat;
2728
import static org.assertj.core.api.Assertions.catchThrowable;
2829

@@ -45,7 +46,6 @@
4546
import com.amazonaws.services.rds.AmazonRDSClient;
4647
import com.amazonaws.services.rds.model.DeleteOptionGroupRequest;
4748
import com.amazonaws.services.s3.AmazonS3Client;
48-
import com.google.common.collect.ImmutableMap;
4949
import io.opentelemetry.api.trace.Span;
5050
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
5151
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -137,7 +137,7 @@ private static Stream<Arguments> provideSendRequestArguments() {
137137
"PUT",
138138
1,
139139
(Function<AmazonS3Client, Object>) c -> c.createBucket("testbucket"),
140-
ImmutableMap.of("aws.bucket.name", "testbucket"),
140+
singletonMap("aws.bucket.name", "testbucket"),
141141
""),
142142
Arguments.of(
143143
new AmazonS3Client().withEndpoint(server.httpUri().toString()),
@@ -146,7 +146,7 @@ private static Stream<Arguments> provideSendRequestArguments() {
146146
"GET",
147147
1,
148148
(Function<AmazonS3Client, Object>) c -> c.getObject("someBucket", "someKey"),
149-
ImmutableMap.of("aws.bucket.name", "someBucket"),
149+
singletonMap("aws.bucket.name", "someBucket"),
150150
""),
151151
Arguments.of(
152152
new AmazonEC2Client().withEndpoint(server.httpUri().toString()),

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@ dependencies {
1818
// needed for SQS - using emq directly as localstack references emq v0.15.7 ie WITHOUT AWS trace header propagation
1919
implementation("org.elasticmq:elasticmq-rest-sqs_2.13")
2020

21-
implementation("com.google.guava:guava")
22-
2321
implementation("io.opentelemetry:opentelemetry-api")
2422
}

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
3434
import com.amazonaws.services.sqs.model.ReceiveMessageResult;
3535
import com.amazonaws.services.sqs.model.SendMessageRequest;
36-
import com.google.common.collect.ImmutableList;
3736
import io.opentelemetry.api.common.Attributes;
3837
import io.opentelemetry.api.trace.SpanKind;
3938
import io.opentelemetry.instrumentation.test.utils.PortUtils;
4039
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
4140
import io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes;
41+
import java.util.Collections;
4242
import org.elasticmq.rest.sqs.SQSRestServer;
4343
import org.elasticmq.rest.sqs.SQSRestServerBuilder;
4444
import org.junit.jupiter.api.AfterEach;
@@ -319,6 +319,6 @@ void testOnlyAddsAttributeNameOnceWhenRequestReused() {
319319
sqsClient.receiveMessage(receive);
320320
sqsClient.sendMessage(send);
321321
sqsClient.receiveMessage(receive);
322-
assertThat(receive.getAttributeNames()).isEqualTo(ImmutableList.of("AWSTraceHeader"));
322+
assertThat(receive.getAttributeNames()).isEqualTo(Collections.singletonList("AWSTraceHeader"));
323323
}
324324
}

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
2525
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
2626
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
27+
import static java.util.Collections.singletonList;
2728
import static org.assertj.core.api.Assertions.assertThat;
2829

2930
import com.amazonaws.auth.AWSStaticCredentialsProvider;
@@ -37,7 +38,6 @@
3738
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
3839
import com.amazonaws.services.sqs.model.ReceiveMessageResult;
3940
import com.amazonaws.services.sqs.model.SendMessageRequest;
40-
import com.google.common.collect.ImmutableList;
4141
import io.opentelemetry.api.common.Attributes;
4242
import io.opentelemetry.api.trace.SpanKind;
4343
import io.opentelemetry.instrumentation.test.utils.PortUtils;
@@ -183,7 +183,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
183183
attributes.add(
184184
satisfies(
185185
stringArrayKey("messaging.header.test_message_header"),
186-
val -> val.isEqualTo(ImmutableList.of("test"))));
186+
val -> val.isEqualTo(singletonList("test"))));
187187
}
188188

189189
span.hasName("testSdkSqs publish")
@@ -223,7 +223,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
223223
attributes.add(
224224
satisfies(
225225
stringArrayKey("messaging.header.test_message_header"),
226-
val -> val.isEqualTo(ImmutableList.of("test"))));
226+
val -> val.isEqualTo(singletonList("test"))));
227227
}
228228

229229
span.hasName("testSdkSqs receive")
@@ -262,7 +262,7 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
262262
attributes.add(
263263
satisfies(
264264
stringArrayKey("messaging.header.test_message_header"),
265-
val -> val.isEqualTo(ImmutableList.of("test"))));
265+
val -> val.isEqualTo(singletonList("test"))));
266266
}
267267
span.hasName("testSdkSqs process")
268268
.hasKind(SpanKind.CONSUMER)
@@ -475,6 +475,6 @@ void testOnlyAddsAttributeNameOnceWhenRequestReused() {
475475
sqsClient.receiveMessage(receive);
476476
sqsClient.sendMessage(send);
477477
sqsClient.receiveMessage(receive);
478-
assertThat(receive.getAttributeNames()).isEqualTo(ImmutableList.of("AWSTraceHeader"));
478+
assertThat(receive.getAttributeNames()).isEqualTo(singletonList("AWSTraceHeader"));
479479
}
480480
}

0 commit comments

Comments
 (0)