feat: use test name to override config for a service (#48)

Author: saxenakshitiz

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/IntegrationTestServerUtil.java

@@ -8,6 +8,7 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpResponse.BodyHandlers;
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -25,12 +26,20 @@ public class IntegrationTestServerUtil {
   private static String[] services;
 
   public static void startServices(String[] services) {
+    startServices(Optional.empty(), services);
+  }
+
+  public static void startServices(String testName, String[] services) {
+    startServices(Optional.of(testName), services);
+  }
+
+  private static void startServices(Optional<String> testName, String[] services) {
     executorService = Executors.newFixedThreadPool(services.length);
     IntegrationTestServerUtil.services = services;
     for (String service:services) {
       executorService.submit(() -> {
         try {
-          IntegrationTestServiceLauncher.main(new String[] {service});
+          IntegrationTestServiceLauncher.launchService(testName, service);
         } catch (Throwable t) {
           System.out.println("Error starting the service with these message: "
               + t.getMessage());

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/IntegrationTestServiceLauncher.java

@@ -2,6 +2,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+
 import org.hypertrace.core.serviceframework.config.ConfigClient;
 import org.hypertrace.core.serviceframework.config.IntegrationTestConfigClientFactory;
 import org.slf4j.Logger;
@@ -20,21 +22,18 @@ public class IntegrationTestServiceLauncher {
   private static final Logger LOGGER = LoggerFactory.getLogger(PlatformServiceLauncher.class);
   private static final List<PlatformService> PLATFORM_SERVICES = new ArrayList<>();
 
-  /** @param serviceNames list of services to start */
-  public static void main(String[] serviceNames) {
-    for (String serviceName : serviceNames) {
-      try {
-        LOGGER.info("Trying to start PlatformService: {}", serviceName);
-        final ConfigClient configClient =
-            IntegrationTestConfigClientFactory.getConfigClientForService(serviceName);
-        PlatformService app = PlatformServiceFactory.get(configClient);
-        app.initialize();
-        Runtime.getRuntime().addShutdownHook(new Thread(app::shutdown));
-        PLATFORM_SERVICES.add(app);
-        app.start();
-      } catch (Exception e) {
-        LOGGER.error("Got exception while starting PlatformService: " + serviceName, e);
-      }
+  public static void launchService(Optional<String> testName, String serviceName) {
+    try {
+      LOGGER.info("Trying to start PlatformService: {}", serviceName);
+      final ConfigClient configClient =
+              IntegrationTestConfigClientFactory.getConfigClientForService(testName, serviceName);
+      PlatformService app = PlatformServiceFactory.get(configClient);
+      app.initialize();
+      Runtime.getRuntime().addShutdownHook(new Thread(app::shutdown));
+      PLATFORM_SERVICES.add(app);
+      app.start();
+    } catch (Exception e) {
+      LOGGER.error("Got exception while starting PlatformService: " + serviceName, e);
     }
   }
 

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/config/IntegrationTestConfigClient.java

@@ -3,6 +3,7 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -16,9 +17,16 @@ public class IntegrationTestConfigClient implements ConfigClient {
   private static final String INTEGRATION_TEST_CLUSTER = "local";
 
   private final String defaultServiceName;
+  private final Optional<String> defaultTestName;
 
   public IntegrationTestConfigClient(String defaultServiceName) {
     this.defaultServiceName = defaultServiceName;
+    this.defaultTestName = Optional.empty();
+  }
+
+  public IntegrationTestConfigClient(Optional<String> testName, String serviceName) {
+    this.defaultTestName = testName;
+    this.defaultServiceName = serviceName;
   }
 
   @Override
@@ -28,7 +36,8 @@ public Config getConfig() {
 
   @Override
   public Config getConfig(String service, String cluster, String pod, String container) {
-    return loadConfig(service, cluster, pod, container)
+    return defaultTestName.map(testName -> loadConfig(service, testName))
+        .orElse(ConfigFactory.empty())
         .withFallback(loadConfig(service, cluster, pod))
         .withFallback(loadConfig(service, cluster))
         .withFallback(loadConfig(service))

integrationtest-service-framework/src/main/java/org/hypertrace/core/serviceframework/config/IntegrationTestConfigClientFactory.java

@@ -2,6 +2,8 @@
 
 import org.hypertrace.core.serviceframework.IntegrationTestServiceLauncher;
 
+import java.util.Optional;
+
 /**
  * Used by {@link IntegrationTestServiceLauncher} to initialize
  * the config client for the respective service
@@ -11,4 +13,8 @@ public class IntegrationTestConfigClientFactory {
   public static ConfigClient getConfigClientForService(String serviceName) {
     return new IntegrationTestConfigClient(serviceName);
   }
-}
+
+  public static ConfigClient getConfigClientForService(Optional<String> testName, String serviceName) {
+    return new IntegrationTestConfigClient(testName, serviceName);
+  }
+}