Merge remote-tracking branch 'origin/feature/flipt' into feature/flipt

open-feature · Oct 11, 2023 · f73aa98 · f73aa98
2 parents 51c11cc + b3a1c2b
commit f73aa98
Show file tree

Hide file tree

Showing 29 changed files with 545 additions and 78 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -48,8 +48,8 @@ jobs:
         env:
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
 
-      # Release Please has already incremented versions and published tags, so we just need to publish.
-      - name: Maven Verify Deploy
+      # Release Please has already incremented versions and published tags, so we just need to publish (skip tests).
+      - name: Maven Verify Deploy -DskipTests
         if: ${{ steps.release.outputs.releases_created }}
         # The nexus-staging-maven-plugin doesn't follow maven conventions. It stages all the projects with the last submodule: https://help.sonatype.com/repomanager2/staging-releases/configuring-your-project-for-deployment
         # This means there's no way to skip publishing of a particular module in a multi-module build, so we iterate over each module and publish them individually,

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,6 +1,6 @@
 {
-  "providers/flagd": "0.6.4",
-  "hooks/open-telemetry": "2.1.0",
+  "providers/flagd": "0.6.6",
+  "hooks/open-telemetry": "2.1.1",
   "providers/go-feature-flag": "0.2.13",
   "providers/flagsmith": "0.0.8",
   "providers/env-var": "0.0.4",

diff --git a/hooks/open-telemetry/CHANGELOG.md b/hooks/open-telemetry/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.1.1](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.hooks.otel-v2.1.0...dev.openfeature.contrib.hooks.otel-v2.1.1) (2023-10-09)
+
+
+### 🐛 Bug Fixes
+
+* **deps:** update dependency io.opentelemetry:opentelemetry-bom to v1.30.0 ([#428](https://github.com/open-feature/java-sdk-contrib/issues/428)) ([ffcbc47](https://github.com/open-feature/java-sdk-contrib/commit/ffcbc4745471a9be6c51428fa83693475bc5110d))
+* **deps:** update dependency io.opentelemetry:opentelemetry-bom to v1.30.1 ([#433](https://github.com/open-feature/java-sdk-contrib/issues/433)) ([0fe21e9](https://github.com/open-feature/java-sdk-contrib/commit/0fe21e9b3dc1e16bb28f285fa89f0a62c5c4a6fb))
+* **deps:** update dependency io.opentelemetry:opentelemetry-bom to v1.31.0 ([#475](https://github.com/open-feature/java-sdk-contrib/issues/475)) ([4873ebc](https://github.com/open-feature/java-sdk-contrib/commit/4873ebc83bf12afe365fec33fcc874c90e48cc91))
+
+
+### 🧹 Chore
+
+* fix dependencies for flagd and OTel hook ([#471](https://github.com/open-feature/java-sdk-contrib/issues/471)) ([8a0c8cf](https://github.com/open-feature/java-sdk-contrib/commit/8a0c8cfa675363ecbef5467fea7ffc28d4b69e97))
+
 ## [2.1.0](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.hooks.otel-v2.0.0...dev.openfeature.contrib.hooks.otel-v2.1.0) (2023-08-21)
 
 

diff --git a/hooks/open-telemetry/README.md b/hooks/open-telemetry/README.md
@@ -12,7 +12,7 @@ These hooks can be used to determine the impact a feature has on a request, enab
 <dependency>
     <groupId>dev.openfeature.contrib.hooks</groupId>
     <artifactId>otel</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
 </dependency>
 ```
 

diff --git a/hooks/open-telemetry/pom.xml b/hooks/open-telemetry/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>dev.openfeature.contrib.hooks</groupId>
     <artifactId>otel</artifactId>
-    <version>2.1.0</version> <!--x-release-please-version -->
+    <version>2.1.1</version> <!--x-release-please-version -->
 
     <name>open-telemetry-hook</name>
     <description>Open Telemetry Hook</description>
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-bom</artifactId>
-                <version>1.30.1</version>
+                <version>1.31.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -48,8 +48,7 @@
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
-            <version>1.28.0-alpha</version>
-            <scope>provided</scope>
+            <version>1.30.1-alpha</version>
         </dependency>
 
         <dependency>

diff --git a/hooks/open-telemetry/version.txt b/hooks/open-telemetry/version.txt
@@ -1 +1 @@
-2.1.0
+2.1.1
diff --git a/pom.xml b/pom.xml
@@ -149,35 +149,42 @@
             <artifactId>mockito-inline</artifactId>
             <version>4.11.0</version>
             <scope>test</scope>
-          </dependency>
+        </dependency>
 
-          <dependency>
+        <dependency>
             <groupId>uk.org.webcompere</groupId>
             <artifactId>system-stubs-core</artifactId>
             <version>2.0.3</version>
             <scope>test</scope>
-          </dependency>
+        </dependency>
 
-          <dependency>
+        <dependency>
             <groupId>uk.org.webcompere</groupId>
             <artifactId>system-stubs-jupiter</artifactId>
-            <version>2.1.2</version>
+            <version>2.1.3</version>
             <scope>test</scope>
-          </dependency>
+        </dependency>
 
-          <dependency>
+        <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-java</artifactId>
             <version>7.14.0</version>
             <scope>test</scope>
-          </dependency>
+        </dependency>
 
-          <dependency>
+        <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit-platform-engine</artifactId>
             <version>7.14.0</version>
             <scope>test</scope>
-          </dependency>
+        </dependency>
+
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.2.0</version>
+            <scope>test</scope>
+        </dependency>
         <!-- end test -->
     </dependencies>
 

diff --git a/providers/flagd/CHANGELOG.md b/providers/flagd/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.6.6](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.6.5...dev.openfeature.contrib.providers.flagd-v0.6.6) (2023-10-10)
+
+
+### 🐛 Bug Fixes
+
+* **deps:** update dependency org.semver4j:semver4j to v5.2.2 ([#480](https://github.com/open-feature/java-sdk-contrib/issues/480)) ([05a2535](https://github.com/open-feature/java-sdk-contrib/commit/05a2535f6223d923ce878e824dbac0ba1c06415e))
+
+
+### ✨ New Features
+
+* flagd in process offline mode ([#473](https://github.com/open-feature/java-sdk-contrib/issues/473)) ([6920557](https://github.com/open-feature/java-sdk-contrib/commit/6920557708528fa858b3febd7f0700255e598576))
+
+## [0.6.5](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.6.4...dev.openfeature.contrib.providers.flagd-v0.6.5) (2023-10-09)
+
+
+### 🐛 Bug Fixes
+
+* **deps:** update dependency io.opentelemetry:opentelemetry-api to v1.31.0 ([#474](https://github.com/open-feature/java-sdk-contrib/issues/474)) ([f4f28d8](https://github.com/open-feature/java-sdk-contrib/commit/f4f28d8413f56d25355ce0331b6cf1f8b8de7229))
+* int/float auto-conversion ([#472](https://github.com/open-feature/java-sdk-contrib/issues/472)) ([63b541c](https://github.com/open-feature/java-sdk-contrib/commit/63b541c166188552764da9df3326754ea6d65b77))
+
+
+### 🧹 Chore
+
+* fix dependencies for flagd and OTel hook ([#471](https://github.com/open-feature/java-sdk-contrib/issues/471)) ([8a0c8cf](https://github.com/open-feature/java-sdk-contrib/commit/8a0c8cfa675363ecbef5467fea7ffc28d4b69e97))
+* flagd change log level from error to warn ([#465](https://github.com/open-feature/java-sdk-contrib/issues/465)) ([d03be0c](https://github.com/open-feature/java-sdk-contrib/commit/d03be0c366876a84bcf169d5404ea2ea144e7fab))
+
 ## [0.6.4](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.6.3...dev.openfeature.contrib.providers.flagd-v0.6.4) (2023-09-28)
 
 

diff --git a/providers/flagd/README.md b/providers/flagd/README.md
@@ -12,7 +12,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.6.4</version>
+  <version>0.6.6</version>
 </dependency>
 ```
 <!-- x-release-please-end-version -->
@@ -51,6 +51,21 @@ FlagdProvider flagdProvider = new FlagdProvider(
 
 In the above example, in-process handlers attempt to connect to a sync service on address `localhost:8013` to obtain [flag definitions](https://github.com/open-feature/schemas/blob/main/json/flagd-definitions.json).
 
+In-process resolver can also work in an offline mode. To enable this mode, you should provide a valid flag configuration file with the option `offlineFlagSourcePath`.
+The file must contain a valid flagd flag source file.
+
+```java
+FlagdProvider flagdProvider = new FlagdProvider(
+        FlagdOptions.builder()
+                .resolverType(Config.Evaluator.IN_PROCESS)
+                .offlineFlagSourcePath("PATH")
+                .build());
+```
+
+Provider will not detect file changes nor re-read the file after the initial read.
+This mode is useful for local development, test cases and for offline application.
+For a full-featured, production-ready file-based implementation, use the RPC evaluator in combination with the flagd standalone application, which can be configured to watch files for changes.
+
 ### Configuration options
 
 Options can be defined in the constructor or as environment variables, with constructor options having the highest

diff --git a/providers/flagd/architecture.png b/providers/flagd/architecture.png
diff --git a/providers/flagd/pom.xml b/providers/flagd/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>dev.openfeature.contrib.providers</groupId>
     <artifactId>flagd</artifactId>
-    <version>0.6.4</version> <!--x-release-please-version -->
+    <version>0.6.6</version> <!--x-release-please-version -->
 
     <properties>
         <!-- exclusion expression for e2e tests -->
@@ -54,7 +54,7 @@
             <!-- we only support unix sockets on linux, via epoll native lib -->
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
-            <version>4.1.99.Final</version>
+            <version>4.1.100.Final</version>
             <!-- TODO: with 5+ (still alpha), arm is support and we should package multiple versions -->
             <classifier>linux-x86_64</classifier>
         </dependency>
@@ -119,13 +119,19 @@
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-api</artifactId>
-            <version>1.30.1</version>
+            <version>1.31.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.semver4j</groupId>
             <artifactId>semver4j</artifactId>
-            <version>5.2.1</version>
+            <version>5.2.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.16.0</version>
         </dependency>
 
     </dependencies>
@@ -314,6 +320,22 @@
                                     </arguments>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>copy-gherkin-flagd.feature</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <!-- copy the feature spec we want to test into resources so them can be easily loaded -->
+                                    <!-- run: cp test-harness/features/flagd.feature src/test/resources/features/ -->
+                                    <executable>cp</executable>
+                                    <arguments>
+                                        <argument>test-harness/gherkin/flagd.feature</argument>
+                                        <argument>src/test/resources/features/</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                 </plugins>