Merge branch 'main' into improve-wait-logic-to-a-more-elegant-solution-#1160

# Conflicts:
#	providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/FlagdProvider.java
#	providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/EventSteps.java

Author: chrfwow

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
           cache: maven
 
       - name: Cache local Maven repository
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/release-please.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Cache local Maven repository
         if: ${{ steps.release.outputs.releases_created }}
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  "providers/flagd": "0.11.2",
+  "providers/flagd": "0.11.3",
   "hooks/open-telemetry": "3.2.1",
   "providers/go-feature-flag": "0.4.2",
   "providers/flagsmith": "0.0.9",

providers/flagd/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.11.3](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.11.2...dev.openfeature.contrib.providers.flagd-v0.11.3) (2025-02-18)
+
+
+### 🐛 Bug Fixes
+
+* enriched context lost on some events ([#1226](https://github.com/open-feature/java-sdk-contrib/issues/1226)) ([aefa941](https://github.com/open-feature/java-sdk-contrib/commit/aefa9410442baa5d801350e9b039ea27b9b8a41d))
+
+
+### 🧹 Chore
+
+* **deps:** update dependency providers/flagd/test-harness to v2.2.0 ([#1223](https://github.com/open-feature/java-sdk-contrib/issues/1223)) ([5f75991](https://github.com/open-feature/java-sdk-contrib/commit/5f75991a59a2bb098ef5b927ecdace61e1baf0fd))
+* **deps:** update providers/flagd/spec digest to 54952f3 ([#1218](https://github.com/open-feature/java-sdk-contrib/issues/1218)) ([5a19a8d](https://github.com/open-feature/java-sdk-contrib/commit/5a19a8ddf881b9591b9416d4b859d8c656a63519))
+* **deps:** update providers/flagd/test-harness digest to ec1d75c ([#1198](https://github.com/open-feature/java-sdk-contrib/issues/1198)) ([3fe0871](https://github.com/open-feature/java-sdk-contrib/commit/3fe0871d4765228983cc6da5de0bf8b2f66854a6))
+* update testbed ([#1225](https://github.com/open-feature/java-sdk-contrib/issues/1225)) ([020c9a1](https://github.com/open-feature/java-sdk-contrib/commit/020c9a14fedddd3fec450a87db45dead0c33f4c2))
+
 ## [0.11.2](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.11.1...dev.openfeature.contrib.providers.flagd-v0.11.2) (2025-02-13)
 
 

providers/flagd/README.md

@@ -8,7 +8,7 @@ This provider is designed to use flagd's [evaluation protocol](https://github.co
 <dependency>
   <groupId>dev.openfeature.contrib.providers</groupId>
   <artifactId>flagd</artifactId>
-  <version>0.11.2</version>
+  <version>0.11.3</version>
 </dependency>
 ```
 <!-- x-release-please-end-version -->

providers/flagd/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>dev.openfeature.contrib.providers</groupId>
     <artifactId>flagd</artifactId>
-    <version>0.11.2</version> <!--x-release-please-version -->
+    <version>0.11.3</version> <!--x-release-please-version -->
 
     <properties>
         <!-- exclusion expression for e2e tests -->
@@ -158,7 +158,7 @@
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>5.5.0</version>
+            <version>5.5.1</version>
             <scope>test</scope>
         </dependency>
         <!-- uncomment for logoutput during test runs -->

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

@@ -118,7 +118,6 @@ public List<Hook> getProviderHooks() {
 
     @Override
     public void initialize(EvaluationContext evaluationContext) throws Exception {
-        log.info("called initialize");
         synchronized (syncResources) {
             if (syncResources.isInitialized()) {
                 return;
@@ -183,19 +182,6 @@ public ProviderEvaluation<Value> getObjectEvaluation(String key, Value defaultVa
         return flagResolver.objectEvaluation(key, defaultValue, ctx);
     }
 
-    /**
-     * An unmodifiable view of a Structure representing the latest result of the
-     * SyncMetadata.
-     * Set on initial connection and updated with every reconnection.
-     * see:
-     * https://buf.build/open-feature/flagd/docs/main:flagd.sync.v1#flagd.sync.v1.FlagSyncService.GetMetadata
-     *
-     * @return Object map representing sync metadata
-     */
-    protected Structure getSyncMetadata() {
-        return syncResources.getSyncMetadata();
-    }
-
     /**
      * The updated context mixed into all evaluations based on the sync-metadata.
      *
@@ -205,6 +191,7 @@ EvaluationContext getEnrichedContext() {
         return syncResources.getEnrichedContext();
     }
 
+    @SuppressWarnings("checkstyle:fallthrough")
     private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
         log.info("FlagdProviderEvent event {} ", flagdProviderEvent.getEvent());
         synchronized (syncResources) {
@@ -228,11 +215,15 @@ private void onProviderEvent(FlagdProviderEvent flagdProviderEvent) {
                         onConfigurationChanged(flagdProviderEvent);
                         break;
                     }
-                    onReady();
-                    syncResources.setPreviousEvent(ProviderEvent.PROVIDER_READY);
-                    break;
-
+                    // intentional fall through
                 case PROVIDER_READY:
+                    /*
+                     * Sync metadata is used to enrich the context, and is immutable in flagd,
+                     * so we only need it to be fetched once at READY.
+                     */
+                    if (flagdProviderEvent.getSyncMetadata() != null) {
+                        syncResources.setEnrichedContext(contextEnricher.apply(flagdProviderEvent.getSyncMetadata()));
+                    }
                     onReady();
                     syncResources.setPreviousEvent(ProviderEvent.PROVIDER_READY);
                     break;

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/FlagdProviderTest.java

@@ -671,7 +671,6 @@ void updatesSyncMetadataWithCallback() throws Exception {
             provider.initialize(ctx);
 
             // the onConnectionEvent should have updated the sync metadata and the
-            assertEquals(val, provider.getSyncMetadata().getValue(key).asString());
             assertEquals(val, provider.getEnrichedContext().getValue(key).asString());
 
             // call the hook manually and make sure the enriched context is returned

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", "events"})
+@ExcludeTags({"unixsocket", "targetURI", "reconnect", "customCert", "events", "contextEnrichment"})
 @Testcontainers
 public class RunFileTest {
 

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

@@ -17,6 +17,8 @@
 @Slf4j
 public class EventSteps extends AbstractSteps {
 
+    private static final int EVENT_TIMEOUT_MS = 12_000;
+
     public EventSteps(State state) {
         super(state);
         state.events = new LinkedList<>();
@@ -46,13 +48,13 @@ public void a_stale_event_handler(String eventType) {
     }
 
     @When("a {} event was fired")
-    public void eventWasFired(String eventType) throws InterruptedException {
-        eventHandlerShouldBeExecutedWithin(eventType, 10000);
+    public void eventWasFired(String eventType) {
+        eventHandlerShouldBeExecutedWithin(eventType, EVENT_TIMEOUT_MS);
     }
 
     @Then("the {} event handler should have been executed")
     public void eventHandlerShouldBeExecuted(String eventType) {
-        eventHandlerShouldBeExecutedWithin(eventType, 10000);
+        eventHandlerShouldBeExecutedWithin(eventType, EVENT_TIMEOUT_MS);
     }
 
     @Then("the {} event handler should have been executed within {int}ms")