clean up

Signed-off-by: Konvalinka <lea.konvalinka@dynatrace.com>

Author: leakonvalinka

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

@@ -136,7 +136,7 @@ public void initialize(EvaluationContext evaluationContext) throws Exception {
     public void shutdown() {
         synchronized (syncResources) {
             try {
-                if (syncResources.isShutDown()) {
+                if (!syncResources.isInitialized() || syncResources.isShutDown()) {
                     return;
                 }
 

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/connector/sync/SyncStreamQueueSource.java

@@ -138,6 +138,7 @@ private void observeSyncStream() {
                     observer.metadata = getMetadata();
                 } catch (StatusRuntimeException metaEx) {
                     if (fatalStatusCodes.contains(metaEx.getStatus().getCode().name())) {
+                        log.debug("Fatal status code for metadata request: {}, not retrying", metaEx.getStatus().getCode());
                         enqueueFatal(String.format("Fatal: Failed to connect for metadata request, not retrying for error %s", metaEx.getStatus().getCode()));
                     } else {
                         // retry for other status codes
@@ -153,6 +154,7 @@ private void observeSyncStream() {
                     syncFlags(observer);
                 } catch (StatusRuntimeException ex) {
                     if (fatalStatusCodes.contains(ex.getStatus().getCode().toString())) {
+                        log.debug("Fatal status code during sync stream: {}, not retrying", ex.getStatus().getCode());
                         enqueueFatal(String.format("Fatal: Failed to connect for metadata request, not retrying for error %s", ex.getStatus().getCode()));
                     } else {
                         // retry for other status codes

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/rpc/RpcResolver.java

@@ -424,6 +424,10 @@ private void handleErrorOrComplete() {
         onProviderEvent.accept(new FlagdProviderEvent(ProviderEvent.PROVIDER_STALE));
     }
 
+    /**
+     * Handles fatal error events (i.e. error codes defined in fatalStatusCodes) by transitioning the provider into
+     * fatal state
+     */
     private void handleFatalError() {
         log.debug("Emitting provider error event");
 

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/ProviderSteps.java

@@ -53,7 +53,7 @@ public static void beforeAll() throws IOException {
                 .withExposedService("flagd", 8015, Wait.forListeningPort())
                 .withExposedService("flagd", 8080, Wait.forListeningPort())
                 .withExposedService("envoy", 9211, Wait.forListeningPort())
-                .withExposedService("envoy", 9212, Wait.forListeningPort())
+                .withExposedService("envoy", FORBIDDEN_PORT, Wait.forListeningPort())
                 .withStartupTimeout(Duration.ofSeconds(45));
         container.start();
     }