Remove serviceId hack for load balancer testing (#868)

JAVA-4463

Author: jyemin

.evergreen/.evg.yml

@@ -223,7 +223,7 @@ functions:
       params:
         script: |
           ${PREPARE_SHELL}
-          REQUIRE_API_VERSION=${REQUIRE_API_VERSION} MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
+          REQUIRE_API_VERSION=${REQUIRE_API_VERSION} LOAD_BALANCER=${LOAD_BALANCER} MONGODB_VERSION=${VERSION} TOPOLOGY=${TOPOLOGY} AUTH=${AUTH} SSL=${SSL} STORAGE_ENGINE=${STORAGE_ENGINE} ORCHESTRATION_FILE=${ORCHESTRATION_FILE} sh ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with the MONGODB_URI for the cluster
     - command: expansions.update
       params:
@@ -828,6 +828,8 @@ tasks:
     - name: load-balancer-test
       commands:
         - func: "bootstrap mongo-orchestration"
+          vars:
+            LOAD_BALANCER: 'true'
         - func: "run load-balancer"
         - func: "run load-balancer tests"
 

driver-core/src/main/com/mongodb/internal/connection/DescriptionHelper.java

@@ -42,7 +42,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.mongodb.assertions.Assertions.assertNotNull;
 import static com.mongodb.connection.ConnectionDescription.getDefaultMaxMessageSize;
 import static com.mongodb.connection.ConnectionDescription.getDefaultMaxWriteBatchSize;
 import static com.mongodb.connection.ServerConnectionState.CONNECTED;
@@ -60,13 +59,6 @@
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 public final class DescriptionHelper {
-
-    private static volatile boolean manufactureServiceId = false;
-
-    public static void enableServiceIdManufacturing() {
-        manufactureServiceId = true;
-    }
-
     static ConnectionDescription createConnectionDescription(final ClusterConnectionMode clusterConnectionMode,
                                                              final ConnectionId connectionId, final BsonDocument helloResult) {
         ConnectionDescription connectionDescription = new ConnectionDescription(connectionId,
@@ -82,10 +74,6 @@ static ConnectionDescription createConnectionDescription(final ClusterConnection
             ObjectId serviceId = getServiceId(helloResult);
             if (serviceId != null) {
                 connectionDescription = connectionDescription.withServiceId(serviceId);
-            } else if (manufactureServiceId) {
-                TopologyVersion topologyVersion = getTopologyVersion(helloResult);
-                assertNotNull(topologyVersion);
-                connectionDescription = connectionDescription.withServiceId(topologyVersion.getProcessId());
             } else {
                 throw new MongoClientException("Driver attempted to initialize in load balancing mode, but the server does not support "
                         + "this mode");

driver-core/src/test/functional/com/mongodb/ClusterFixture.java

@@ -87,7 +87,6 @@
 import static com.mongodb.connection.ClusterType.STANDALONE;
 import static com.mongodb.internal.connection.ClusterDescriptionHelper.getPrimaries;
 import static com.mongodb.internal.connection.ClusterDescriptionHelper.getSecondaries;
-import static com.mongodb.internal.connection.DescriptionHelper.enableServiceIdManufacturing;
 import static java.lang.String.format;
 import static java.lang.Thread.sleep;
 import static java.util.Arrays.asList;
@@ -128,14 +127,6 @@ public final class ClusterFixture {
 
     static {
         Runtime.getRuntime().addShutdownHook(new ShutdownHook());
-
-        ConnectionString defaultConnectionString = getConnectionStringFromSystemProperty(MONGODB_URI_SYSTEM_PROPERTY_NAME);
-        if (defaultConnectionString != null) {
-            Boolean loadBalanced = defaultConnectionString.isLoadBalanced();
-            if (loadBalanced != null && loadBalanced) {
-                enableServiceIdManufacturing();
-            }
-        }
     }
 
     private ClusterFixture() {