1. Rename the function names "setupSpec" and "cleanupSpec" to "setup" and "cleanup"

2. Collection tool class methods use static import

Signed-off-by: xiepuhuan <[email protected]>

Author: xiepuhuan

instrumentation/mongo/mongo-3.1/library/src/test/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesGetterTest.java

@@ -6,10 +6,10 @@
 package io.opentelemetry.instrumentation.mongo.v3_1;
 
 import static io.opentelemetry.instrumentation.mongo.v3_1.MongoTelemetryBuilder.DEFAULT_MAX_NORMALIZED_QUERY_LENGTH;
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Arrays;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -84,8 +84,7 @@ void shouldTruncateArray() {
         sanitizeStatementAcrossVersions(
             extractor,
             new BsonDocument("cmd", new BsonString("c"))
-                .append(
-                    "f1", new BsonArray(Arrays.asList(new BsonString("c1"), new BsonString("c2"))))
+                .append("f1", new BsonArray(asList(new BsonString("c1"), new BsonString("c2"))))
                 .append("f2", new BsonString("c3")));
 
     // This can vary because of different whitespace for different MongoDB versions

instrumentation/mongo/mongo-3.1/testing/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/AbstractMongo31ClientTest.java

@@ -35,15 +35,15 @@ public abstract class AbstractMongo31ClientTest
   private MongoClient client;
 
   @BeforeAll
-  public void setupSpec() {
+  public void setup() {
     MongoClientOptions.Builder options =
         MongoClientOptions.builder().description("some-description");
     configureMongoClientOptions(options);
     client = new MongoClient(new ServerAddress(host, port), options.build());
   }
 
   @AfterAll
-  public void cleanupSpec() {
+  public void cleanup() {
     if (client != null) {
       client.close();
     }

instrumentation/mongo/mongo-3.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v3_7/MongoClientTest.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.mongo.v3_7;
 
 import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT;
+import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -22,7 +23,6 @@
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import java.util.ArrayList;
-import java.util.Arrays;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.Document;
@@ -40,7 +40,7 @@ class MongoClientTest extends AbstractMongoClientTest<MongoCollection<Document>>
   private MongoClient client;
 
   @BeforeAll
-  void setupSpec() {
+  void setup() {
     client =
         MongoClients.create(
             MongoClientSettings.builder()
@@ -53,7 +53,7 @@ void setupSpec() {
   }
 
   @AfterAll
-  void cleanupSpec() {
+  void cleanup() {
     if (client != null) {
       client.close();
       client = null;
@@ -196,7 +196,7 @@ protected MongoCollection<Document> setupGetMore(String dbName, String collectio
                   MongoDatabase db = client.getDatabase(dbName);
                   MongoCollection<Document> coll = db.getCollection(collectionName);
                   coll.insertMany(
-                      Arrays.asList(
+                      asList(
                           new Document("_id", 0), new Document("_id", 1), new Document("_id", 2)));
                   return coll;
                 });

instrumentation/mongo/mongo-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/Mongo4ReactiveClientTest.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.mongo.v4_0;
 
+import static java.util.Collections.singletonList;
+
 import com.mongodb.MongoClientSettings;
 import com.mongodb.ServerAddress;
 import com.mongodb.client.result.DeleteResult;
@@ -17,7 +19,6 @@
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
@@ -45,12 +46,12 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
   private final List<AutoCloseable> cleanup = new ArrayList<>();
 
   @BeforeAll
-  public void setupSpec() {
+  public void setup() {
     client = MongoClients.create("mongodb://" + host + ":" + port);
   }
 
   @AfterAll
-  public void cleanupSpec() throws Exception {
+  public void cleanup() throws Exception {
     if (client != null) {
       client.close();
       client = null;
@@ -100,7 +101,7 @@ public void createCollectionCallingBuildTwice(String dbName, String collectionNa
     MongoClientSettings.Builder settings =
         MongoClientSettings.builder()
             .applyToClusterSettings(
-                builder -> builder.hosts(Collections.singletonList(new ServerAddress(host, port))));
+                builder -> builder.hosts(singletonList(new ServerAddress(host, port))));
     settings.build();
     MongoClient tmpClient = MongoClients.create(settings.build());
     cleanup.add(tmpClient);

instrumentation/mongo/mongo-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientTest.java

@@ -5,6 +5,9 @@
 
 package io.opentelemetry.javaagent.instrumentation.mongo.v4_0;
 
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+
 import com.mongodb.MongoClientSettings;
 import com.mongodb.ServerAddress;
 import com.mongodb.client.MongoClient;
@@ -17,8 +20,6 @@
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.Document;
@@ -35,12 +36,12 @@ class MongoClientTest extends AbstractMongoClientTest<MongoCollection<Document>>
   private MongoClient client;
 
   @BeforeAll
-  public void setupSpec() {
+  public void setup() {
     client = MongoClients.create("mongodb://" + host + ":" + port);
   }
 
   @AfterAll
-  public void cleanupSpec() {
+  public void cleanup() {
     if (client != null) {
       client.close();
       client = null;
@@ -74,7 +75,7 @@ public void createCollectionCallingBuildTwice(String dbName, String collectionNa
     MongoClientSettings settings =
         MongoClientSettings.builder()
             .applyToClusterSettings(
-                builder -> builder.hosts(Collections.singletonList(new ServerAddress(host, port))))
+                builder -> builder.hosts(singletonList(new ServerAddress(host, port))))
             .build();
     MongoDatabase db = MongoClients.create(settings).getDatabase(dbName);
     db.createCollection(collectionName);
@@ -169,7 +170,7 @@ public MongoCollection<Document> setupGetMore(String dbName, String collectionNa
                   MongoDatabase db = client.getDatabase(dbName);
                   MongoCollection<Document> coll = db.getCollection(collectionName);
                   coll.insertMany(
-                      Arrays.asList(
+                      asList(
                           new Document("_id", 0), new Document("_id", 1), new Document("_id", 2)));
                   return coll;
                 });

instrumentation/mongo/mongo-async-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientTest.java

@@ -37,7 +37,7 @@ class MongoAsyncClientTest extends AbstractMongoClientTest<MongoCollection<Docum
   private MongoClient client;
 
   @BeforeAll
-  public void setupSpec() {
+  public void setup() {
     client =
         MongoClients.create(
             MongoClientSettings.builder()
@@ -51,7 +51,7 @@ public void setupSpec() {
   }
 
   @AfterAll
-  public void cleanupSpec() {
+  public void cleanup() {
     if (client != null) {
       client.close();
       client = null;

instrumentation/mongo/mongo-common/testing/src/main/java/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.java

@@ -45,7 +45,7 @@ public abstract class AbstractMongoClientTest<T> {
   protected int port;
 
   @BeforeAll
-  void setupSpec() {
+  void setup() {
     mongodb =
         new GenericContainer<>("mongo:4.0")
             .withExposedPorts(27017)
@@ -56,7 +56,7 @@ void setupSpec() {
   }
 
   @AfterAll
-  void cleanupSpec() {
+  void cleanup() {
     if (mongodb != null) {
       mongodb.stop();
     }