fix e2e tests

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

Author: leakonvalinka

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

@@ -1,7 +1,10 @@
 package dev.openfeature.contrib.providers.flagd;
 
 import dev.openfeature.contrib.providers.flagd.resolver.rpc.cache.CacheType;
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 
 /** Helper class to hold configuration default values. */
@@ -36,6 +39,7 @@ public final class Config {
     static final String FLAGD_RETRY_BACKOFF_MAX_MS_VAR_NAME = "FLAGD_RETRY_BACKOFF_MAX_MS";
     static final String STREAM_DEADLINE_MS_ENV_VAR_NAME = "FLAGD_STREAM_DEADLINE_MS";
     static final String SOURCE_SELECTOR_ENV_VAR_NAME = "FLAGD_SOURCE_SELECTOR";
+    static final String FATAL_STATUS_CODES_ENV_VAR_NAME = "FLAGD_FATAL_STATUS_CODES";
     /**
      * Environment variable to fetch Provider id.
      *
@@ -91,6 +95,16 @@ static long fallBackToEnvOrDefault(String key, long defaultValue) {
         }
     }
 
+    static List<String> fallBackToEnvOrDefaultList(String key, List<String> defaultValue) {
+        try {
+            return System.getenv(key) != null ? Arrays.stream(System.getenv(key).split(","))
+                    .map(String::trim)
+                    .collect(Collectors.toList()) : defaultValue;
+        } catch (Exception e) {
+            return defaultValue;
+        }
+    }
+
     static Resolver fromValueProvider(Function<String, String> provider) {
         final String resolverVar = provider.apply(RESOLVER_ENV_VAR);
         if (resolverVar == null) {

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

@@ -1,6 +1,7 @@
 package dev.openfeature.contrib.providers.flagd;
 
 import static dev.openfeature.contrib.providers.flagd.Config.fallBackToEnvOrDefault;
+import static dev.openfeature.contrib.providers.flagd.Config.fallBackToEnvOrDefaultList;
 import static dev.openfeature.contrib.providers.flagd.Config.fromValueProvider;
 
 import dev.openfeature.contrib.providers.flagd.resolver.process.storage.connector.QueueSource;
@@ -10,7 +11,6 @@
 import io.grpc.ClientInterceptor;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 import lombok.Builder;
@@ -129,7 +129,7 @@ public class FlagdOptions {
      * Defaults to empty list
      */
     @Builder.Default
-    private List<String> fatalStatusCodes = new ArrayList<>();
+    private List<String> fatalStatusCodes = fallBackToEnvOrDefaultList(Config.FATAL_STATUS_CODES_ENV_VAR_NAME, List.of());
 
     /**
      * Selector to be used with flag sync gRPC contract.

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/storage/StorageState.java

@@ -1,6 +1,6 @@
 package dev.openfeature.contrib.providers.flagd.resolver.process.storage;
 
-/** Satus of the storage. */
+/** Status of the storage. */
 public enum StorageState {
     /** Storage is upto date and working as expected. */
     OK,

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

@@ -141,13 +141,13 @@ private void observeSyncStream() {
                     observer.metadata = getMetadata();
                 } catch (StatusRuntimeException metaEx) {
                     if (fatalStatusCodes.contains(metaEx.getStatus().getCode().name())) {
-                        //throw new FatalError("Failed to connect for metadata request, not retrying for error " + metaEx.getStatus());
-                        enqueueFatal("Fatal: Failed to connect for metadata request, not retrying for error " + 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
+                        String message = metaEx.getMessage();
+                        log.debug("Metadata request error: {}, will restart", message, metaEx);
+                        enqueueError(String.format("Error in getMetadata request: %s", message));
                     }
-                    // retry for other status codes
-                    String message = metaEx.getMessage();
-                    log.debug("Metadata request error: {}, will restart", message, metaEx);
-                    enqueueError(String.format("Error in getMetadata request: %s", message));
                     shouldThrottle.set(true);
                     continue;
                 }
@@ -156,13 +156,12 @@ private void observeSyncStream() {
                     syncFlags(observer);
                 } catch (StatusRuntimeException ex) {
                     if (fatalStatusCodes.contains(ex.getStatus().getCode().toString())) {
-                        //throw new FatalError("Failed to connect for metadata request, not retrying for error " + ex.getStatus().getCode());
-                        enqueueFatal("Fatal: Failed to connect for metadata request, not retrying for error " + ex.getStatus().getCode());
-                        return;
+                        enqueueFatal(String.format("Fatal: Failed to connect for metadata request, not retrying for error %s", ex.getStatus().getCode()));
+                    } else {
+                        // retry for other status codes
+                        log.error("Unexpected sync stream exception, will restart.", ex);
+                        enqueueError(String.format("Error in syncStream: %s", ex.getMessage()));
                     }
-                    // retry for other status codes
-                    log.error("Unexpected sync stream exception, will restart.", ex);
-                    enqueueError(String.format("Error in syncStream: %s", ex.getMessage()));
                     shouldThrottle.set(true);
                 }
             } catch (InterruptedException ie) {

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunInProcessTest.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("in-process")
-@ExcludeTags({"unixsocket"})
+@ExcludeTags({"unixsocket","sync-port"})
 @Testcontainers
 public class RunInProcessTest {