Merge remote-tracking branch 'upstream/main' into feat/add_new_provid…

…er_type Signed-off-by: Simon Schrottner <[email protected]>
open-feature · Feb 6, 2025 · 057cf1b · 057cf1b
2 parents 0dd03b1 + 3c8ca74
commit 057cf1b
Show file tree

Hide file tree

Showing 29 changed files with 230 additions and 187 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Set up JDK 8
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
         with:
           java-version: '8'
           distribution: 'temurin'

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Set up JDK 8
         if: ${{ steps.release.outputs.releases_created }}
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
         with:
           java-version: '8'
           distribution: 'temurin'

diff --git a/.gitmodules b/.gitmodules
@@ -4,7 +4,7 @@
 [submodule "providers/flagd/test-harness"]
 	path = providers/flagd/test-harness
 	url = https://github.com/open-feature/test-harness.git
-	branch = v1.1.1
+	branch = v2.1.0
 [submodule "providers/flagd/spec"]
 	path = providers/flagd/spec
 	url = https://github.com/open-feature/spec.git
diff --git a/pom.xml b/pom.xml
@@ -104,14 +104,14 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.16.1</version>
+            <version>1.17.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy-agent</artifactId>
-            <version>1.16.1</version>
+            <version>1.17.0</version>
             <scope>test</scope>
         </dependency>
         <!-- End mockito workaround-->
@@ -189,21 +189,21 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-java</artifactId>
-            <version>7.20.1</version>
+            <version>7.21.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit-platform-engine</artifactId>
-            <version>7.20.1</version>
+            <version>7.21.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-picocontainer</artifactId>
-            <version>7.20.1</version>
+            <version>7.21.0</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/providers/flagd/pom.xml b/providers/flagd/pom.xml
@@ -15,9 +15,9 @@
     <properties>
         <!-- exclusion expression for e2e tests -->
         <testExclusions>**/e2e/*.java</testExclusions>
-        <io.grpc.version>1.69.1</io.grpc.version>
+        <io.grpc.version>1.70.0</io.grpc.version>
         <!-- caution - updating this will break compatibility with older protobuf-java versions -->
-        <protobuf-java.min.version>3.25.5</protobuf-java.min.version>
+        <protobuf-java.min.version>3.25.6</protobuf-java.min.version>
     </properties>
 
     <name>flagd</name>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.1</version>
         </dependency>
 
         <dependency>
@@ -128,7 +128,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.17.2</version>
+            <version>1.18.0</version>
         </dependency>
 
         <dependency>
@@ -150,14 +150,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>toxiproxy</artifactId>
-            <version>1.20.4</version>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>5.5.0</version>
             <scope>test</scope>
         </dependency>
         <!-- uncomment for logoutput during test runs -->
-
-        <dependency>
+         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>2.0.16</version>
@@ -254,7 +253,7 @@
                 <configuration>
                     <protocArtifact>com.google.protobuf:protoc:3.25.5:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.68.2:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.69.1:exe:${os.detected.classifier}</pluginArtifact>
                     <protoSourceRoot>${project.basedir}/schemas/protobuf/</protoSourceRoot>
                 </configuration>
                 <executions>

diff --git a/providers/flagd/spec b/providers/flagd/spec
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java
@@ -210,7 +210,7 @@ EvaluationContext getEnrichedContext() {
     private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
 
         synchronized (eventsLock) {
-            log.info("FlagdProviderEvent: {}", flagdProviderEvent);
+            log.info("FlagdProviderEvent: {}", flagdProviderEvent.getEvent());
             eventsLock.syncMetadata = flagdProviderEvent.getSyncMetadata();
             if (flagdProviderEvent.getSyncMetadata() != null) {
                 eventsLock.enrichedContext = contextEnricher.apply(flagdProviderEvent.getSyncMetadata());

diff --git a/...src/main/java/dev/openfeature/contrib/providers/flagd/resolver/common/ChannelMonitor.java b/...src/main/java/dev/openfeature/contrib/providers/flagd/resolver/common/ChannelMonitor.java
@@ -47,8 +47,11 @@ public static void monitorChannelState(
                     log.debug("onConnectionLost is null");
                 }
             }
-            // Re-register the state monitor to watch for the next state transition.
-            monitorChannelState(currentState, channel, onConnectionReady, onConnectionLost);
+            if (currentState != ConnectivityState.SHUTDOWN) {
+                log.debug("shutting down grpc channel");
+                // Re-register the state monitor to watch for the next state transition.
+                monitorChannelState(currentState, channel, onConnectionReady, onConnectionLost);
+            }
         });
     }
 

diff --git a/.../main/java/dev/openfeature/contrib/providers/flagd/resolver/grpc/EventStreamObserver.java b/.../main/java/dev/openfeature/contrib/providers/flagd/resolver/grpc/EventStreamObserver.java
@@ -64,6 +64,7 @@ public void onCompleted() {}
      * @param value the event stream response containing configuration change data
      */
     private void handleConfigurationChangeEvent(EventStreamResponse value) {
+        log.debug("Received provider change event");
         List<String> changedFlags = new ArrayList<>();
 
         Map<String, Value> data = value.getData().getFieldsMap();
@@ -80,7 +81,7 @@ private void handleConfigurationChangeEvent(EventStreamResponse value) {
      * Handles provider readiness events by clearing the cache (if enabled) and notifying listeners of readiness.
      */
     private void handleProviderReadyEvent() {
-        log.info("Received provider ready event");
+        log.debug("Received provider ready event");
         onReady.accept(new FlagdProviderEvent(ProviderEvent.PROVIDER_READY));
     }
 }
diff --git a/.../contrib/providers/flagd/resolver/process/storage/connector/grpc/GrpcStreamConnector.java b/.../contrib/providers/flagd/resolver/process/storage/connector/grpc/GrpcStreamConnector.java
@@ -118,7 +118,6 @@ void observeEventStream(final BlockingQueue<QueuePayload> writeTo, final AtomicB
                     metadataException = e;
                 }
 
-                log.info("stream");
                 while (!shutdown.get()) {
                     final GrpcResponseModel response = streamReceiver.take();
                     if (response.isComplete()) {

diff --git a/providers/flagd/src/main/resources/simplelogger.properties b/providers/flagd/src/main/resources/simplelogger.properties
@@ -0,0 +1,3 @@
+org.org.slf4j.simpleLogger.defaultLogLevel=debug
+
+io.grpc.level=trace
diff --git a/...roviders/flagd/RunConfigCucumberTest.java → ...b/providers/flagd/ConfigCucumberTest.java b/...roviders/flagd/RunConfigCucumberTest.java → ...b/providers/flagd/ConfigCucumberTest.java
@@ -18,5 +18,5 @@
 @IncludeEngines("cucumber")
 @SelectFile("test-harness/gherkin/config.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
-@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.steps")
-public class RunConfigCucumberTest {}
+@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.steps.config")
+public class ConfigCucumberTest {}
diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdProviderTest.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdProviderTest.java
@@ -46,7 +46,6 @@
 import dev.openfeature.sdk.Reason;
 import dev.openfeature.sdk.Structure;
 import dev.openfeature.sdk.Value;
-import io.cucumber.java.AfterAll;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -60,7 +59,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedConstruction;
 
@@ -90,15 +90,15 @@ class FlagdProviderTest {
             .build();
     private static final String STRING_VALUE = "hi!";
 
-    private static OpenFeatureAPI api;
+    private OpenFeatureAPI api;
 
-    @BeforeAll
-    public static void init() {
+    @BeforeEach
+    public void init() {
         api = OpenFeatureAPI.getInstance();
     }
 
-    @AfterAll
-    public static void cleanUp() {
+    @AfterEach
+    public void cleanUp() {
         api.shutdown();
     }
 

diff --git a/...iders/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/FlagdContainer.java b/...iders/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/FlagdContainer.java
@@ -1,9 +1,9 @@
 package dev.openfeature.contrib.providers.flagd.e2e;
 
+import dev.openfeature.contrib.providers.flagd.Config;
 import java.io.File;
 import java.nio.file.Files;
 import java.util.List;
-import org.apache.logging.log4j.util.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
@@ -25,19 +25,25 @@ public class FlagdContainer extends GenericContainer<FlagdContainer> {
         }
     }
 
-    private String feature;
-
     public FlagdContainer() {
-        this("");
+        super(generateContainerName());
+        this.addExposedPorts(8013, 8014, 8015, 8080);
     }
 
-    public FlagdContainer(String feature) {
-        super(generateContainerName(feature));
-        this.withReuse(true);
-        this.feature = feature;
-        if (!"socket".equals(this.feature)) this.addExposedPorts(8013, 8014, 8015, 8016);
+    public int getPort(Config.Resolver resolver) {
+        switch (resolver) {
+            case RPC:
+                return getMappedPort(8013);
+            case IN_PROCESS:
+                return getMappedPort(8015);
+            default:
+                return 0;
+        }
     }
 
+    public String getLaunchpadUrl() {
+        return this.getHost() + ":" + this.getMappedPort(8080);
+    }
     /**
      * @return a {@link org.testcontainers.containers.GenericContainer} instance of envoy container using
      * flagd sync service as backend expose on port 9211
@@ -52,11 +58,8 @@ public static GenericContainer envoy() {
                 .withNetworkAliases("envoy");
     }
 
-    public static @NotNull String generateContainerName(String feature) {
+    public static @NotNull String generateContainerName() {
         String container = "ghcr.io/open-feature/flagd-testbed";
-        if (!Strings.isBlank(feature)) {
-            container += "-" + feature;
-        }
         container += ":v" + version;
         return container;
     }

diff --git a/...ers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunInProcessTest.java b/...ers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunInProcessTest.java
@@ -6,6 +6,7 @@
 
 import dev.openfeature.contrib.providers.flagd.Config;
 import org.apache.logging.log4j.core.config.Order;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.junit.platform.suite.api.BeforeSuite;
 import org.junit.platform.suite.api.ConfigurationParameter;
 import org.junit.platform.suite.api.ExcludeTags;
@@ -30,6 +31,7 @@
 @IncludeTags("in-process")
 @ExcludeTags({"unixsocket", "targetURI"})
 @Testcontainers
+@Isolated
 public class RunInProcessTest {
 
     @BeforeSuite

diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/State.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/State.java
@@ -6,6 +6,7 @@
 import dev.openfeature.contrib.providers.flagd.e2e.steps.FlagSteps;
 import dev.openfeature.contrib.providers.flagd.e2e.steps.ProviderType;
 import dev.openfeature.sdk.Client;
+import dev.openfeature.sdk.FeatureProvider;
 import dev.openfeature.sdk.FlagEvaluationDetails;
 import dev.openfeature.sdk.MutableContext;
 import java.util.LinkedList;
@@ -15,6 +16,7 @@
 public class State {
     public ProviderType providerType;
     public Client client;
+    public FeatureProvider provider;
     public List<Event> events = new LinkedList<>();
     public Optional<Event> lastEvent;
     public FlagSteps.Flag flag;

diff --git a/...ers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/EventSteps.java b/...ers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/EventSteps.java
@@ -25,7 +25,7 @@ public EventSteps(State state) {
     @Given("a {} event handler")
     public void a_stale_event_handler(String eventType) {
         state.client.on(mapEventType(eventType), eventDetails -> {
-            log.info("event tracked for {} ", eventType);
+            log.info("event tracked for {} at {} ms ", eventType, System.currentTimeMillis() % 100_000);
             state.events.add(new Event(eventType, eventDetails));
         });
     }
@@ -47,24 +47,24 @@ public void a_stale_event_handler(String eventType) {
 
     @When("a {} event was fired")
     public void eventWasFired(String eventType) throws InterruptedException {
-        eventHandlerShouldBeExecutedWithin(eventType, 10000);
-        // we might be too fast in the execution
-        Thread.sleep(500);
+        eventHandlerShouldBeExecutedWithin(eventType, 8000);
     }
 
     @Then("the {} event handler should have been executed")
     public void eventHandlerShouldBeExecuted(String eventType) {
-        eventHandlerShouldBeExecutedWithin(eventType, 30000);
+        eventHandlerShouldBeExecutedWithin(eventType, 10000);
     }
 
     @Then("the {} event handler should have been executed within {int}ms")
     public void eventHandlerShouldBeExecutedWithin(String eventType, int ms) {
         log.info("waiting for eventtype: {}", eventType);
-        await().atMost(ms, MILLISECONDS)
+        await().alias("waiting for eventtype " + eventType)
+                .atMost(ms, MILLISECONDS)
+                .pollInterval(10, MILLISECONDS)
                 .until(() -> state.events.stream().anyMatch(event -> event.type.equals(eventType)));
         state.lastEvent = state.events.stream()
                 .filter(event -> event.type.equals(eventType))
                 .findFirst();
-        state.events.removeIf(event -> event.type.equals(eventType));
+        state.events.clear();
     }
 }
diff --git a/...ders/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/FlagSteps.java b/...ders/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/FlagSteps.java
@@ -1,8 +1,6 @@
 package dev.openfeature.contrib.providers.flagd.e2e.steps;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.awaitility.Awaitility.await;
 
 import dev.openfeature.contrib.providers.flagd.e2e.State;
 import dev.openfeature.sdk.FlagEvaluationDetails;
@@ -70,15 +68,9 @@ public void the_variant_should_be(String variant) {
     }
 
     @Then("the flag should be part of the event payload")
-    @Then("the flag was modified")
     public void the_flag_was_modified() {
-        await().atMost(5000, MILLISECONDS).until(() -> state.events.stream()
-                .anyMatch(event -> event.type.equals("change")
-                        && event.details.getFlagsChanged().contains(state.flag.name)));
-        state.lastEvent = state.events.stream()
-                .filter(event -> event.type.equals("change")
-                        && event.details.getFlagsChanged().contains(state.flag.name))
-                .findFirst();
+        Event event = state.lastEvent.orElseThrow(AssertionError::new);
+        assertThat(event.details.getFlagsChanged()).contains(state.flag.name);
     }
 
     public class Flag {
+22 −1		specification.json
+3 −0		specification/README.md
+60 −0		specification/appendix-d-observability.md
+27 −0		specification/assets/gherkin/metadata.feature
+104 −3		specification/sections/04-hooks.md
+2 −0		specification/types.md
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		org.org.slf4j.simpleLogger.defaultLogLevel=debug

		io.grpc.level=trace