fix: change server sequence (#108)

hypertrace · Nov 15, 2024 · 100e1a7 · 100e1a7
1 parent cc1001d
commit 100e1a7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java b/...src/main/java/org/hypertrace/core/serviceframework/grpc/GrpcPlatformServiceContainer.java
@@ -97,12 +97,15 @@ protected void doInit() {
                         serviceContainerEnvironment))
             .collect(Collectors.toUnmodifiableList());
 
+    // Servers are processed in order. We want in process to be the last to start (so health check
+    // only returns when all other servers are up) and the last to shut down (so all other servers
+    // have drained external requests)
     this.servers =
         Stream.concat(
+                providedServers.stream(),
                 Stream.of(
                     new ConstructedServer(
-                        this.getInProcessServerName(), inProcessServerBuilder.build())),
-                providedServers.stream())
+                        this.getInProcessServerName(), inProcessServerBuilder.build())))
             .collect(Collectors.toUnmodifiableList());
 
     this.healthClient =