Remove tag usage as it is not supported in perf.send

JAVA-5813

Author: vbabanin

.evergreen/.evg.yml

@@ -2329,7 +2329,7 @@ buildvariants:
   run_on: rhel90-dbx-perf-large
   tasks:
     - name: "perf"
-    - name: "netty-perf"
+    - name: "perf-netty"
 
 - name: plain-auth-test
   display_name: "PLAIN (LDAP) Auth test"

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractBsonDocumentBenchmark.java

@@ -29,7 +29,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 
 public abstract class AbstractBsonDocumentBenchmark<T> extends Benchmark {
 
@@ -42,7 +41,7 @@ public abstract class AbstractBsonDocumentBenchmark<T> extends Benchmark {
     private int fileLength;
 
     public AbstractBsonDocumentBenchmark(final String name, final String resourcePath, final Codec<T> codec) {
-        super(Collections.emptyList(), name);
+        super(name);
         this.resourcePath = resourcePath;
         this.codec = codec;
     }

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractFindBenchmark.java

@@ -37,11 +37,8 @@ public abstract class AbstractFindBenchmark<T> extends AbstractMongoBenchmark {
 
     private int fileLength;
 
-    public AbstractFindBenchmark(final List<String> tags,
-                                 final String name,
-                                 final String resourcePath,
-                                 final Class<T> clazz) {
-        super(tags, name);
+    public AbstractFindBenchmark(final String name, final String resourcePath, final Class<T> clazz) {
+        super(name);
         this.resourcePath = resourcePath;
         this.clazz = clazz;
     }

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractGridFSBenchmark.java

@@ -21,18 +21,14 @@
 import com.mongodb.client.gridfs.GridFSBucket;
 import com.mongodb.client.gridfs.GridFSBuckets;
 
-import java.util.List;
-
 public abstract class AbstractGridFSBenchmark extends AbstractMongoBenchmark {
     private final String resourcePath;
     protected MongoDatabase database;
     protected GridFSBucket bucket;
     protected byte[] fileBytes;
 
-    public AbstractGridFSBenchmark(final List<String> tags,
-                                   final String name,
-                                   final String resourcePath) {
-        super(tags, name);
+    public AbstractGridFSBenchmark(final String name, final String resourcePath) {
+        super(name);
         this.resourcePath = resourcePath;
     }
 

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractInsertBenchmark.java

@@ -24,7 +24,6 @@
 import org.bson.json.JsonReader;
 
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 
 public abstract class AbstractInsertBenchmark<T> extends AbstractMongoBenchmark {
 
@@ -36,11 +35,8 @@ public abstract class AbstractInsertBenchmark<T> extends AbstractMongoBenchmark
     protected int fileLength;
     protected T document;
 
-    protected AbstractInsertBenchmark(final List<String> tags,
-                                      final String name,
-                                      final String resourcePath,
-                                      final Class<T> clazz) {
-        super(tags, name);
+    protected AbstractInsertBenchmark(final String name, final String resourcePath, final Class<T> clazz) {
+        super(name);
         this.resourcePath = resourcePath;
         this.clazz = clazz;
     }

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/AbstractMongoBenchmark.java

@@ -22,8 +22,6 @@
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 
-import java.util.List;
-
 public abstract class AbstractMongoBenchmark extends Benchmark {
 
     protected static final int GRIDFS_READING_THREAD_POOL_SIZE = 8;
@@ -38,9 +36,8 @@ public abstract class AbstractMongoBenchmark extends Benchmark {
     protected static final String COLLECTION_NAME = "corpus";
     protected MongoClientSettings mongoClientSettings;
 
-    public AbstractMongoBenchmark(final List<String> tags,
-                                  final String name) {
-        super(tags, name);
+    public AbstractMongoBenchmark(final String name) {
+        super(name);
     }
 
     protected MongoClient client;

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindManyBenchmark.java

@@ -19,19 +19,9 @@
 
 import com.mongodb.client.MongoCursor;
 
-import java.util.Collections;
-import java.util.List;
-
 public class FindManyBenchmark<T> extends AbstractFindBenchmark<T> {
-
-    private static final String TEST_NAME = "Find many and empty the cursor";
-
     public FindManyBenchmark(final String resourcePath, final Class<T> clazz) {
-        this(Collections.emptyList(), resourcePath, clazz);
-    }
-
-    public FindManyBenchmark(final List<String> tags, final String resourcePath, final Class<T> clazz) {
-        super(tags, TEST_NAME, resourcePath, clazz);
+        super("Find many and empty the cursor", resourcePath, clazz);
     }
 
     @Override

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/FindOneBenchmark.java

@@ -21,19 +21,10 @@
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
 
-import java.util.Collections;
-import java.util.List;
-
 public class FindOneBenchmark<T> extends AbstractFindBenchmark<T> {
 
-    private static final String TEST_NAME = "Find one by ID";
-
     public FindOneBenchmark(final String resourcePath, Class<T> clazz) {
-        this(Collections.emptyList(), resourcePath, clazz);
-    }
-
-    public FindOneBenchmark(final List<String> tags, final String resourcePath, Class<T> clazz) {
-        super(tags, TEST_NAME, resourcePath, clazz);
+        super("Find one by ID", resourcePath, clazz);
     }
 
     @Override

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSDownloadBenchmark.java

@@ -21,20 +21,13 @@
 import org.bson.types.ObjectId;
 
 import java.io.ByteArrayInputStream;
-import java.util.Collections;
-import java.util.List;
 
 public class GridFSDownloadBenchmark extends AbstractGridFSBenchmark {
-    private static final String TEST_NAME = "GridFS download";
 
     private ObjectId fileId;
 
-    public GridFSDownloadBenchmark(final List<String> tags, final String resourcePath) {
-        super(tags, TEST_NAME, resourcePath);
-    }
-
     public GridFSDownloadBenchmark(final String resourcePath) {
-        super(Collections.emptyList(), TEST_NAME, resourcePath);
+        super("GridFS download", resourcePath);
     }
 
     @Override

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileDownloadBenchmark.java

@@ -29,8 +29,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -39,20 +37,15 @@
 
 public class GridFSMultiFileDownloadBenchmark extends AbstractMongoBenchmark {
 
-    public static final String TEST_NAME = "GridFS multi-file download";
     private GridFSBucket bucket;
 
     private ExecutorService gridFSService;
     private ExecutorService fileService;
 
     private File tempDirectory;
 
-    public GridFSMultiFileDownloadBenchmark(final List<String> tags) {
-        super(tags, TEST_NAME);
-    }
-
     public GridFSMultiFileDownloadBenchmark() {
-        super(Collections.emptyList(), TEST_NAME);
+        super("GridFS multi-file download");
     }
 
     @Override

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSMultiFileUploadBenchmark.java

@@ -27,8 +27,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -37,20 +35,16 @@
 
 public class GridFSMultiFileUploadBenchmark extends AbstractMongoBenchmark {
 
-    private static final String TEST_NAME = "GridFS multi-file upload";
     private MongoDatabase database;
     private GridFSBucket bucket;
 
     private ExecutorService fileService;
 
-    public GridFSMultiFileUploadBenchmark(final List<String> tags) {
-        super(tags, TEST_NAME);
-    }
-
     public GridFSMultiFileUploadBenchmark() {
-        super(Collections.emptyList(), TEST_NAME);
+        super("GridFS multi-file upload");
     }
 
+
     @Override
     public void setUp() throws Exception {
         super.setUp();

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/GridFSUploadBenchmark.java

@@ -18,23 +18,11 @@
 package com.mongodb.benchmark.benchmarks;
 
 import java.io.ByteArrayInputStream;
-import java.util.Collections;
-import java.util.List;
 
 public class GridFSUploadBenchmark extends AbstractGridFSBenchmark {
-    private static final String TEST_NAME = "GridFS upload";
-
-    public GridFSUploadBenchmark(final List<String> tags, final String resourcePath) {
-        super(tags, TEST_NAME, resourcePath);
-    }
 
     public GridFSUploadBenchmark(final String resourcePath) {
-        super(Collections.emptyList(), TEST_NAME, resourcePath);
-    }
-
-    @Override
-    public String getName() {
-        return "GridFS upload";
+        super("GridFS upload", resourcePath);
     }
 
     @Override

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertManyBenchmark.java

@@ -18,20 +18,14 @@
 package com.mongodb.benchmark.benchmarks;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class InsertManyBenchmark<T> extends AbstractInsertBenchmark<T> {
     private final int numDocuments;
     private final List<T> documentList;
 
     public InsertManyBenchmark(final String name, final String resourcePath, final int numDocuments, final Class<T> clazz) {
-        this(Collections.emptyList(), name, resourcePath, numDocuments, clazz);
-    }
-
-    public InsertManyBenchmark(final List<String> tags, final String name, final String resourcePath, final int numDocuments,
-                               final Class<T> clazz) {
-        super(tags, name + " doc bulk insert", resourcePath, clazz);
+        super(name + " doc bulk insert", resourcePath, clazz);
         this.numDocuments = numDocuments;
         documentList = new ArrayList<>(numDocuments);
     }

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/InsertOneBenchmark.java

@@ -17,22 +17,13 @@
 
 package com.mongodb.benchmark.benchmarks;
 
-import java.util.Collections;
-import java.util.List;
-
 public class InsertOneBenchmark<T> extends AbstractInsertBenchmark<T> {
     private final int numIterations;
     private final IdRemover<T> idRemover;
 
     public InsertOneBenchmark(final String name, final String resourcePath, final int numIterations, final Class<T> clazz,
                               final IdRemover<T> idRemover) {
-        this(Collections.emptyList(), name, resourcePath, numIterations, clazz, idRemover);
-    }
-
-    public InsertOneBenchmark(final List<String> tags, final String name, final String resourcePath, final int numIterations,
-                              final Class<T> clazz,
-                              final IdRemover<T> idRemover) {
-        super(tags, name + " doc insertOne", resourcePath, clazz);
+        super(name + " doc insertOne", resourcePath, clazz);
         this.numIterations = numIterations;
         this.idRemover = idRemover;
     }

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileExportBenchmark.java

@@ -42,18 +42,14 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-;
-
 public class MultiFileExportBenchmark extends AbstractMongoBenchmark {
 
-    public static final String TEST_NAME = "LDJSON multi-file export";
     private MongoDatabase database;
 
     private MongoCollection<RawBsonDocument> collection;
@@ -63,11 +59,7 @@ public class MultiFileExportBenchmark extends AbstractMongoBenchmark {
     private File tempDirectory;
 
     public MultiFileExportBenchmark() {
-        super(Collections.emptyList(), TEST_NAME);
-    }
-
-    public MultiFileExportBenchmark(final List<String> tags) {
-        super(tags, TEST_NAME);
+        super("LDJSON multi-file export");
     }
 
     @Override

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/MultiFileImportBenchmark.java

@@ -31,17 +31,13 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-;
-
 public class MultiFileImportBenchmark extends AbstractMongoBenchmark {
-    public static final String TEST_NAME = "LDJSON multi-file import";
     private MongoDatabase database;
 
     private MongoCollection<RawBsonDocument> collection;
@@ -50,11 +46,7 @@ public class MultiFileImportBenchmark extends AbstractMongoBenchmark {
     private ExecutorService documentWritingService;
 
     public MultiFileImportBenchmark() {
-        super(Collections.emptyList(), TEST_NAME);
-    }
-
-    public MultiFileImportBenchmark(final List<String> tags) {
-        super(tags, TEST_NAME);
+        super("LDJSON multi-file import");
     }
 
     @Override

driver-benchmarks/src/main/com/mongodb/benchmark/benchmarks/RunCommandBenchmark.java

@@ -26,24 +26,14 @@
 import org.bson.io.BasicOutputBuffer;
 import org.bson.json.JsonReader;
 
-import java.util.Collections;
-import java.util.List;
-
 public class RunCommandBenchmark<T extends Bson> extends AbstractMongoBenchmark {
 
-    private static final String TEST_NAME = "Run command";
     private MongoDatabase database;
     private final Codec<T> codec;
     private final T command;
 
     public RunCommandBenchmark(final Codec<T> codec) {
-        super(Collections.emptyList(), TEST_NAME);
-        this.codec = codec;
-        this.command = createCommand();
-    }
-
-    public RunCommandBenchmark(final List<String> tags, final Codec<T> codec) {
-        super(tags, TEST_NAME);
+        super("Run command");
         this.codec = codec;
         this.command = createCommand();
     }