channelfactory does not shutdown

Author: nicklasl

openfeature-provider/java/src/main/java/com/spotify/confidence/ChannelFactory.java

@@ -22,9 +22,8 @@
  *   <li>Debugging: add custom logging or tracing interceptors
  * </ul>
  *
- * <p><strong>Lifecycle:</strong> The factory is responsible for managing the lifecycle of all
- * channels it creates. When {@link #shutdown()} is called, it should shut down all channels that
- * were created via {@link #create(String, List)}.
+ * <p><strong>Channel Lifecycle:</strong> Channels created by this factory must be shut down by the
+ * caller when they are no longer needed. The factory does not manage channel lifecycles.
  */
 public interface ChannelFactory {
   /**
@@ -35,13 +34,4 @@ public interface ChannelFactory {
    * @return a configured ManagedChannel
    */
   ManagedChannel create(String target, List<ClientInterceptor> defaultInterceptors);
-
-  /**
-   * Shuts down all channels created by this factory. This method should be called when the provider
-   * is shutting down to ensure proper resource cleanup.
-   *
-   * <p>Implementations should shut down all channels that were created via {@link #create(String,
-   * List)} and wait for them to terminate gracefully.
-   */
-  void shutdown();
 }

openfeature-provider/java/src/main/java/com/spotify/confidence/DefaultChannelFactory.java

@@ -7,10 +7,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Default implementation of ChannelFactory that creates standard gRPC channels with security
@@ -22,13 +18,9 @@
  *   <li>Uses TLS by default, unless CONFIDENCE_GRPC_PLAINTEXT=true
  *   <li>Adds a default deadline interceptor (1 minute timeout)
  *   <li>Applies any additional interceptors passed via defaultInterceptors
- *   <li>Tracks all created channels and shuts them down when {@link #shutdown()} is called
  * </ul>
  */
 public class DefaultChannelFactory implements ChannelFactory {
-  private static final Logger logger = LoggerFactory.getLogger(DefaultChannelFactory.class);
-  private final List<ManagedChannel> channels = new CopyOnWriteArrayList<>();
-
   @Override
   public ManagedChannel create(String target, List<ClientInterceptor> defaultInterceptors) {
     final boolean useGrpcPlaintext =
@@ -45,28 +37,6 @@ public ManagedChannel create(String target, List<ClientInterceptor> defaultInter
     List<ClientInterceptor> allInterceptors = new ArrayList<>(defaultInterceptors);
     allInterceptors.add(new DefaultDeadlineClientInterceptor(Duration.ofMinutes(1)));
 
-    ManagedChannel channel =
-        builder.intercept(allInterceptors.toArray(new ClientInterceptor[0])).build();
-    channels.add(channel);
-    return channel;
-  }
-
-  @Override
-  public void shutdown() {
-    logger.debug("Shutting down {} channels created by DefaultChannelFactory", channels.size());
-    for (ManagedChannel channel : channels) {
-      try {
-        channel.shutdown();
-        if (!channel.awaitTermination(5, TimeUnit.SECONDS)) {
-          logger.warn("Channel did not terminate within 5 seconds, forcing shutdown");
-          channel.shutdownNow();
-        }
-      } catch (InterruptedException e) {
-        logger.warn("Interrupted while shutting down channel", e);
-        channel.shutdownNow();
-        Thread.currentThread().interrupt();
-      }
-    }
-    channels.clear();
+    return builder.intercept(allInterceptors.toArray(new ClientInterceptor[0])).build();
   }
 }

openfeature-provider/java/src/main/java/com/spotify/confidence/GrpcWasmFlagLogger.java

@@ -5,13 +5,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.spotify.confidence.flags.resolver.v1.InternalFlagLoggerServiceGrpc;
 import com.spotify.confidence.flags.resolver.v1.WriteFlagLogsRequest;
-import io.grpc.CallOptions;
-import io.grpc.Channel;
-import io.grpc.ClientCall;
-import io.grpc.ClientInterceptor;
-import io.grpc.ForwardingClientCall;
-import io.grpc.Metadata;
-import io.grpc.MethodDescriptor;
+import io.grpc.*;
+
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +30,7 @@ public class GrpcWasmFlagLogger implements WasmFlagLogger {
   private final ExecutorService executorService;
   private final FlagLogWriter writer;
   private final Duration shutdownTimeout;
+  private ManagedChannel channel;
 
   @VisibleForTesting
   public GrpcWasmFlagLogger(String clientSecret, FlagLogWriter writer) {
@@ -71,9 +67,9 @@ public GrpcWasmFlagLogger(String clientSecret, ChannelFactory channelFactory) {
                 });
   }
 
-  private static InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub createAuthStub(
-      ChannelFactory channelFactory, String clientSecret) {
-    final var channel = createConfidenceChannel(channelFactory);
+  private InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub createAuthStub(
+          ChannelFactory channelFactory, String clientSecret) {
+    this.channel = createConfidenceChannel(channelFactory);
     return addAuthInterceptor(InternalFlagLoggerServiceGrpc.newBlockingStub(channel), clientSecret);
   }
 
@@ -181,6 +177,9 @@ private void sendSync(WriteFlagLogsRequest request) {
    */
   @Override
   public void shutdown() {
+    if (channel != null) {
+      channel.shutdown();
+    }
     executorService.shutdown();
     try {
       if (!executorService.awaitTermination(shutdownTimeout.toMillis(), TimeUnit.MILLISECONDS)) {

openfeature-provider/java/src/main/java/com/spotify/confidence/OpenFeatureLocalResolveProvider.java

@@ -315,9 +315,6 @@ public void shutdown() {
     // writes
     this.wasmResolveApi.close();
 
-    if (this.channelFactory != null) {
-      this.channelFactory.shutdown();
-    }
     FeatureProvider.super.shutdown();
   }
 

openfeature-provider/java/src/test/java/com/spotify/confidence/ChannelFactoryTest.java

@@ -34,11 +34,6 @@ public ManagedChannel create(String target, List<ClientInterceptor> interceptors
             }
             return builder.build();
           }
-
-          @Override
-          public void shutdown() {
-            // Test implementation - no-op
-          }
         };
 
     new OpenFeatureLocalResolveProvider(new LocalProviderConfig(customFactory), "clientsecret");

openfeature-provider/java/src/test/java/com/spotify/confidence/OpenFeatureLocalResolveProviderIntegrationTest.java

@@ -112,22 +112,13 @@ void setUp() throws Exception {
     // Create custom channel factory that connects to in-process server
     final ChannelFactory testChannelFactory =
         new ChannelFactory() {
-          private final List<ManagedChannel> channels = new ArrayList<>();
-
           @Override
           public ManagedChannel create(String target, List<ClientInterceptor> interceptors) {
             InProcessChannelBuilder builder = InProcessChannelBuilder.forName(serverName);
             if (!interceptors.isEmpty()) {
               builder.intercept(interceptors.toArray(new ClientInterceptor[0]));
             }
-            ManagedChannel channel = builder.build();
-            this.channels.add(channel);
-            return channel;
-          }
-
-          @Override
-          public void shutdown() {
-            channels.stream().forEach(ManagedChannel::shutdown);
+            return builder.build();
           }
         };