Skip to content

Commit 06046bd

Browse files
authored
Merge branch 'open-feature:main' into kb-open-feature-java-sdk-contrib-mirror
2 parents 2a290bb + 0b720f3 commit 06046bd

File tree

42 files changed

+971
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+971
-272
lines changed

.github/component_owners.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ components:
3535
- novalisdenahi
3636
providers/statsig:
3737
- liran2000
38+
providers/optimizely:
39+
- liran2000
3840
providers/multiprovider:
3941
- liran2000
4042
providers/ofrep-provider:

.release-please-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"hooks/open-telemetry": "3.3.1",
3-
"providers/flagd": "0.11.15",
4-
"providers/go-feature-flag": "0.4.3",
3+
"providers/flagd": "0.11.17",
4+
"providers/go-feature-flag": "1.0.1",
55
"providers/flagsmith": "0.0.12",
66
"providers/env-var": "0.0.12",
77
"providers/jsonlogic-eval-provider": "1.2.1",

hooks/open-telemetry/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>io.opentelemetry</groupId>
3232
<artifactId>opentelemetry-bom</artifactId>
33-
<version>1.54.0</version>
33+
<version>1.54.1</version>
3434
<type>pom</type>
3535
<scope>import</scope>
3636
</dependency>

mvnw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# ----------------------------------------------------------------------------
2020

2121
# ----------------------------------------------------------------------------
22-
# Apache Maven Wrapper startup batch script, version 3.3.3
22+
# Apache Maven Wrapper startup batch script, version 3.3.4
2323
#
2424
# Optional ENV vars
2525
# -----------------

mvnw.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@REM ----------------------------------------------------------------------------
2020

2121
@REM ----------------------------------------------------------------------------
22-
@REM Apache Maven Wrapper startup batch script, version 3.3.3
22+
@REM Apache Maven Wrapper startup batch script, version 3.3.4
2323
@REM
2424
@REM Optional ENV vars
2525
@REM MVNW_REPOURL - repo url base for downloading maven distribution

pom.xml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<module>providers/flipt</module>
4040
<module>providers/configcat</module>
4141
<module>providers/statsig</module>
42+
<module>providers/optimizely</module>
4243
<module>providers/multiprovider</module>
4344
<module>providers/ofrep</module>
4445
<module>tools/flagd-http-connector</module>
@@ -79,14 +80,14 @@
7980
<dependency>
8081
<groupId>io.cucumber</groupId>
8182
<artifactId>cucumber-bom</artifactId>
82-
<version>7.28.2</version>
83+
<version>7.29.0</version>
8384
<type>pom</type>
8485
<scope>import</scope>
8586
</dependency>
8687
<dependency>
8788
<groupId>org.mockito</groupId>
8889
<artifactId>mockito-bom</artifactId>
89-
<version>5.19.0</version>
90+
<version>5.20.0</version>
9091
<type>pom</type>
9192
<scope>import</scope>
9293
</dependency>
@@ -132,7 +133,7 @@
132133
<dependency>
133134
<groupId>org.assertj</groupId>
134135
<artifactId>assertj-core</artifactId>
135-
<version>3.27.4</version>
136+
<version>3.27.6</version>
136137
<scope>test</scope>
137138
</dependency>
138139

@@ -222,7 +223,7 @@
222223
</plugin>
223224
<plugin>
224225
<artifactId>maven-compiler-plugin</artifactId>
225-
<version>3.14.0</version>
226+
<version>3.14.1</version>
226227
</plugin>
227228

228229
<!-- automatically derive a module name from the groupId and artifactId -->
@@ -242,7 +243,7 @@
242243
<plugin>
243244
<groupId>org.apache.maven.plugins</groupId>
244245
<artifactId>maven-surefire-plugin</artifactId>
245-
<version>3.5.3</version>
246+
<version>3.5.4</version>
246247
<configuration>
247248
<excludes>
248249
<!-- tests to exclude -->
@@ -304,14 +305,11 @@
304305
<plugin>
305306
<groupId>org.apache.maven.plugins</groupId>
306307
<artifactId>maven-javadoc-plugin</artifactId>
307-
<version>3.11.3</version>
308+
<version>3.12.0</version>
308309
<configuration>
309310
<failOnWarnings>${javadoc.failOnWarnings}</failOnWarnings>
310-
<sourceFileExcludes>
311-
<sourceFileExclude>**/GoFeatureFlagProviderOptions.java</sourceFileExclude>
312-
</sourceFileExcludes>
313311
<excludePackageNames>
314-
dev.openfeature.flagd.grpc,dev.openfeature.contrib.providers.gofeatureflag.exception,dev.openfeature.contrib.providers.gofeatureflag.bean
312+
dev.openfeature.flagd.grpc
315313
</excludePackageNames>
316314
<doclint>all,-missing
317315
</doclint> <!-- ignore missing javadoc, these are enforced with more customizability in the checkstyle plugin -->
@@ -378,7 +376,7 @@
378376
<plugin>
379377
<groupId>org.sonatype.central</groupId>
380378
<artifactId>central-publishing-maven-plugin</artifactId>
381-
<version>0.8.0</version>
379+
<version>0.9.0</version>
382380
<extensions>true</extensions>
383381
<configuration>
384382
<publishingServerId>central</publishingServerId>
@@ -417,7 +415,7 @@
417415
<dependency>
418416
<groupId>com.puppycrawl.tools</groupId>
419417
<artifactId>checkstyle</artifactId>
420-
<version>11.0.1</version>
418+
<version>11.1.0</version>
421419
</dependency>
422420
</dependencies>
423421
<executions>
@@ -487,7 +485,7 @@
487485
<plugin>
488486
<groupId>com.diffplug.spotless</groupId>
489487
<artifactId>spotless-maven-plugin</artifactId>
490-
<version>2.46.1</version>
488+
<version>3.0.0</version>
491489
<configuration>
492490
<!-- optional: limit format enforcement to just the files changed by this feature branch -->
493491
<!-- <ratchetFrom>origin/main</ratchetFrom>-->
@@ -563,15 +561,15 @@
563561
<plugin>
564562
<groupId>org.apache.maven.plugins</groupId>
565563
<artifactId>maven-surefire-plugin</artifactId>
566-
<version>3.5.3</version>
564+
<version>3.5.4</version>
567565
<configuration>
568566
<skipTests>${skip.tests}</skipTests>
569567
</configuration>
570568
</plugin>
571569
<plugin>
572570
<groupId>org.apache.maven.plugins</groupId>
573571
<artifactId>maven-compiler-plugin</artifactId>
574-
<version>3.14.0</version>
572+
<version>3.14.1</version>
575573
<executions>
576574
<execution>
577575
<id>default-testCompile</id>

providers/flagd/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## [0.11.17](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.11.16...dev.openfeature.contrib.providers.flagd-v0.11.17) (2025-10-15)
4+
5+
6+
### 🐛 Bug Fixes
7+
8+
* **security:** force netty-codec-http2 4.1.125 ([#1615](https://github.com/open-feature/java-sdk-contrib/issues/1615)) ([0b0070c](https://github.com/open-feature/java-sdk-contrib/commit/0b0070cacf79dfd475fb3ce0c0dbdffd7e02fe8a))
9+
10+
## [0.11.16](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.11.15...dev.openfeature.contrib.providers.flagd-v0.11.16) (2025-10-14)
11+
12+
13+
### 🐛 Bug Fixes
14+
15+
* **flagd:** fix wrong environment variable and test execution ([#1589](https://github.com/open-feature/java-sdk-contrib/issues/1589)) ([e1d8e54](https://github.com/open-feature/java-sdk-contrib/commit/e1d8e54cb15f7e9f27626c60cebded3690a84698))
16+
* **flagd:** improve stream observer, refine retry policy; don't use retry to avoid busy loop ([#1590](https://github.com/open-feature/java-sdk-contrib/issues/1590)) ([791f38c](https://github.com/open-feature/java-sdk-contrib/commit/791f38cdcdb12f7d7c8ec457ecea968f1ec5d048))
17+
318
## [0.11.15](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.providers.flagd-v0.11.14...dev.openfeature.contrib.providers.flagd-v0.11.15) (2025-09-05)
419

520

providers/flagd/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This provider is designed to use flagd's [evaluation protocol](https://github.co
88
<dependency>
99
<groupId>dev.openfeature.contrib.providers</groupId>
1010
<artifactId>flagd</artifactId>
11-
<version>0.11.15</version>
11+
<version>0.11.17</version>
1212
</dependency>
1313
```
1414
<!-- x-release-please-end-version -->

providers/flagd/pom.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</parent>
1212
<groupId>dev.openfeature.contrib.providers</groupId>
1313
<artifactId>flagd</artifactId>
14-
<version>0.11.15</version> <!--x-release-please-version -->
14+
<version>0.11.17</version> <!--x-release-please-version -->
1515

1616
<properties>
1717
<!-- exclusion expression for e2e tests -->
1818
<testExclusions>**/e2e/*.java</testExclusions>
19-
<io.grpc.version>1.75.0</io.grpc.version>
19+
<io.grpc.version>1.76.0</io.grpc.version>
2020
<!-- caution - updating this will break compatibility with older protobuf-java versions -->
2121
<protobuf-java.min.version>3.25.6</protobuf-java.min.version>
2222
</properties>
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>io.opentelemetry</groupId>
125125
<artifactId>opentelemetry-api</artifactId>
126-
<version>1.54.0</version>
126+
<version>1.54.1</version>
127127
</dependency>
128128

129129
<dependency>
@@ -180,6 +180,13 @@
180180
<!-- caution - updating this will break compatibility with older protobuf-java versions -->
181181
<version>${protobuf-java.min.version}</version>
182182
</dependency>
183+
184+
<!-- temporary override for https://www.cve.org/CVERecord?id=CVE-2025-58057 -->
185+
<dependency>
186+
<groupId>io.netty</groupId>
187+
<artifactId>netty-codec-http2</artifactId>
188+
<version>4.1.125.Final</version>
189+
</dependency>
183190
</dependencies>
184191

185192
</dependencyManagement>
@@ -198,7 +205,7 @@
198205
<plugin>
199206
<groupId>org.codehaus.mojo</groupId>
200207
<artifactId>exec-maven-plugin</artifactId>
201-
<version>3.5.1</version>
208+
<version>3.6.0</version>
202209
<executions>
203210
<execution>
204211
<id>update-schemas-submodule</id>
@@ -299,7 +306,7 @@
299306
<plugin>
300307
<groupId>org.codehaus.mojo</groupId>
301308
<artifactId>exec-maven-plugin</artifactId>
302-
<version>3.5.1</version>
309+
<version>3.6.0</version>
303310
<executions>
304311
<execution>
305312
<id>update-test-harness-submodule</id>

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public final class Config {
1414
static final String DEFAULT_HOST = "localhost";
1515

1616
static final int DEFAULT_DEADLINE = 500;
17+
static final int DEFAULT_MAX_RETRY_BACKOFF_MS = 12000;
1718
static final int DEFAULT_STREAM_DEADLINE_MS = 10 * 60 * 1000;
1819
static final int DEFAULT_STREAM_RETRY_GRACE_PERIOD = 5;
1920
static final int DEFAULT_MAX_CACHE_SIZE = 1000;
@@ -29,12 +30,20 @@ public final class Config {
2930
static final String SERVER_CERT_PATH_ENV_VAR_NAME = "FLAGD_SERVER_CERT_PATH";
3031
static final String CACHE_ENV_VAR_NAME = "FLAGD_CACHE";
3132
static final String MAX_CACHE_SIZE_ENV_VAR_NAME = "FLAGD_MAX_CACHE_SIZE";
32-
static final String MAX_EVENT_STREAM_RETRIES_ENV_VAR_NAME = "FLAGD_MAX_EVENT_STREAM_RETRIES";
3333
static final String BASE_EVENT_STREAM_RETRY_BACKOFF_MS_ENV_VAR_NAME = "FLAGD_RETRY_BACKOFF_MS";
3434
static final String DEADLINE_MS_ENV_VAR_NAME = "FLAGD_DEADLINE_MS";
35+
static final String FLAGD_RETRY_BACKOFF_MAX_MS_VAR_NAME = "FLAGD_RETRY_BACKOFF_MAX_MS";
3536
static final String STREAM_DEADLINE_MS_ENV_VAR_NAME = "FLAGD_STREAM_DEADLINE_MS";
3637
static final String SOURCE_SELECTOR_ENV_VAR_NAME = "FLAGD_SOURCE_SELECTOR";
38+
/**
39+
* Environment variable to fetch Provider id.
40+
*
41+
* @deprecated please use {@link #PROVIDER_ID_ENV_VAR_NAME}
42+
*/
43+
@Deprecated(forRemoval = true)
3744
static final String SOURCE_PROVIDER_ID_ENV_VAR_NAME = "FLAGD_SOURCE_PROVIDER_ID";
45+
46+
static final String PROVIDER_ID_ENV_VAR_NAME = "FLAGD_PROVIDER_ID";
3847
static final String OFFLINE_SOURCE_PATH = "FLAGD_OFFLINE_FLAG_SOURCE_PATH";
3948
static final String OFFLINE_POLL_MS = "FLAGD_OFFLINE_POLL_MS";
4049
static final String KEEP_ALIVE_MS_ENV_VAR_NAME_OLD = "FLAGD_KEEP_ALIVE_TIME";

0 commit comments

Comments
 (0)