Merge branch 'main' into fix/fixing_missing_selector

Author: aepfli

Diff for: providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/common/ChannelMonitor.java

@@ -48,7 +48,7 @@ public static void monitorChannelState(
                 }
             }
             if (currentState != ConnectivityState.SHUTDOWN) {
-                log.debug("shutting down grpc channel");
+                log.debug("continuing to monitor the grpc channel");
                 // Re-register the state monitor to watch for the next state transition.
                 monitorChannelState(currentState, channel, onConnectionReady, onConnectionLost);
             }

Diff for: providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/connector/grpc/GrpcStreamConnector.java

@@ -120,6 +120,7 @@ void observeEventStream(final BlockingQueue<QueuePayload> writeTo, final AtomicB
                     // instead of logging and throwing here, retain the exception and handle in the
                     // stream logic below
                     metadataException = e;
+                    log.debug("Metadata exception: {}", e.getMessage(), e);
                 }
 
                 while (!shutdown.get()) {
@@ -133,7 +134,10 @@ void observeEventStream(final BlockingQueue<QueuePayload> writeTo, final AtomicB
 
                     Throwable streamException = response.getError();
                     if (streamException != null || metadataException != null) {
-                        log.debug("Exception in GRPC connection");
+                        log.debug(
+                                "Exception in GRPC connection, streamException {}, metadataException {}",
+                                streamException,
+                                metadataException);
                         if (!writeTo.offer(new QueuePayload(
                                 QueuePayloadType.ERROR, "Error from stream or metadata", metadataResponse))) {
                             log.error("Failed to convey ERROR status, queue is full");

Diff for: providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFileTest.java

@@ -28,7 +28,7 @@
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.steps")
 @ConfigurationParameter(key = OBJECT_FACTORY_PROPERTY_NAME, value = "io.cucumber.picocontainer.PicoFactory")
 @IncludeTags("file")
-@ExcludeTags({"unixsocket", "targetURI", "reconnect", "customCert"})
+@ExcludeTags({"unixsocket", "targetURI", "reconnect", "customCert", "events"})
 @Testcontainers
 public class RunFileTest {
 

Diff for: providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunInProcessTest.java

@@ -13,6 +13,7 @@
 import org.junit.platform.suite.api.IncludeEngines;
 import org.junit.platform.suite.api.IncludeTags;
 import org.junit.platform.suite.api.SelectDirectories;
+import org.junit.platform.suite.api.SelectFile;
 import org.junit.platform.suite.api.Suite;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -22,9 +23,9 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectDirectories("test-harness/gherkin")
+//@SelectDirectories("test-harness/gherkin")
 // if you want to run just one feature file, use the following line instead of @SelectDirectories
-// @SelectFile("test-harness/gherkin/connection.feature")
+@SelectFile("test-harness/gherkin/selector.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.steps")
 @ConfigurationParameter(key = OBJECT_FACTORY_PROPERTY_NAME, value = "io.cucumber.picocontainer.PicoFactory")