fixup! feat: improve wait logic to a more elegant solution #1160

Signed-off-by: christian.lutnik <[email protected]>

Author: chrfwow

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java

@@ -239,7 +239,7 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
                     onReady();
                     syncResources.setPreviousEvent(ProviderEvent.PROVIDER_READY);
                     break;
-                    // intentional fall through, a not-ready change will trigger a ready.
+                // intentional fall through, a not-ready change will trigger a ready.
                 case PROVIDER_READY:
                     onReady();
                     syncResources.setPreviousEvent(ProviderEvent.PROVIDER_READY);
@@ -256,6 +256,8 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
                     log.info("Unknown event {}", flagdProviderEvent.getEvent());
             }
         }
+
+        log.info("give up lock on sync");
     }
 
     private void onConfigurationChanged(FlagdProviderEvent flagdProviderEvent) {
@@ -272,12 +274,19 @@ private void onReady() {
         if (syncResources.initialize()) {
             log.info("initialized FlagdProvider");
         }
+        log.info("on ready before error cancel");
         if (errorTask != null && !errorTask.isCancelled()) {
             errorTask.cancel(false);
             log.debug("Reconnection task cancelled as connection became READY.");
         }
-        this.emitProviderReady(
-                ProviderEventDetails.builder().message("connected to flagd").build());
+        log.info("on ready post error cancel");
+
+        // todo run in external thread to prevent deadlock
+        //new Thread(() -> {
+            this.emitProviderReady(
+                    ProviderEventDetails.builder().message("connected to flagd").build());
+        //}).start();
+
         log.info("post onready");
     }
 

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProviderSyncResources.java

@@ -46,7 +46,8 @@ public synchronized boolean initialize() {
         }
         this.initialized = true;
         this.notifyAll();
-        log.info("notified all");
+        log.info("notified all " + this.toString());
+
         return true;
     }
 
@@ -65,7 +66,7 @@ public synchronized boolean initialize() {
      *                               this object
      */
     public void waitForInitialization(long deadline) {
-        log.info("wait for init");
+        log.info("wait for init " + this);
         long start = System.currentTimeMillis();
         long end = start + deadline;
         while (!initialized && !isShutDown) {
@@ -84,12 +85,14 @@ public void waitForInitialization(long deadline) {
                 if (isShutDown) {
                     break;
                 }
+                log.info("waiting for " + remaining + " at " + System.currentTimeMillis());
                 try {
                     this.wait(remaining);
                 } catch (InterruptedException e) {
                     // try again. Leave the continue to make PMD happy
                     continue;
                 }
+                log.info("waiting ended  at " + System.currentTimeMillis());
             }
         }
         if (isShutDown) {

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunConfigCucumberTest.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Order;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.IncludeEngines;
-import org.junit.platform.suite.api.SelectFile;
+import org.junit.platform.suite.api.SelectDirectories;
 import org.junit.platform.suite.api.Suite;
 
 /**
@@ -16,7 +16,8 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-@SelectFile("test-harness/gherkin/config.feature")
+//@SelectFile("test-harness/gherkin/config.feature")
+@SelectDirectories("test-harness/gherkin")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.steps")
 public class RunConfigCucumberTest {}