Merge branch 'main' into feat/Update-in-process-resolver-to-support-flag-metadata

Author: toddbaert

.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 = v0.5.19
+	branch = v0.5.21
 [submodule "providers/flagd/spec"]
 	path = providers/flagd/spec
 	url = https://github.com/open-feature/spec.git

.release-please-manifest.json

@@ -1,6 +1,6 @@
 {
   "providers/flagd": "0.10.5",
-  "hooks/open-telemetry": "3.2.0",
+  "hooks/open-telemetry": "3.2.1",
   "providers/go-feature-flag": "0.4.0",
   "providers/flagsmith": "0.0.9",
   "providers/env-var": "0.0.7",

hooks/open-telemetry/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [3.2.1](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.hooks.otel-v3.2.0...dev.openfeature.contrib.hooks.otel-v3.2.1) (2025-01-13)
+
+
+### 🐛 Bug Fixes
+
+* **deps:** move to io.opentelemetry.semconv:opentelemetry-semconv ([#1041](https://github.com/open-feature/java-sdk-contrib/issues/1041)) ([18d2557](https://github.com/open-feature/java-sdk-contrib/commit/18d25572c592bf46f4e0856917c667cd661545e2))
+* **deps:** update dependency io.opentelemetry:opentelemetry-bom to v1.44.0 ([#1068](https://github.com/open-feature/java-sdk-contrib/issues/1068)) ([d659630](https://github.com/open-feature/java-sdk-contrib/commit/d659630701786cd1f6ca495cb4e5364349b336da))
+* **deps:** update dependency io.opentelemetry:opentelemetry-bom to v1.46.0 ([#1154](https://github.com/open-feature/java-sdk-contrib/issues/1154)) ([5eb6847](https://github.com/open-feature/java-sdk-contrib/commit/5eb68479b8a127a3efc4ea183a7a17644df9a31a))
+* **deps:** update opentelemetry-java monorepo to v1.43.0 ([#1020](https://github.com/open-feature/java-sdk-contrib/issues/1020)) ([67682a8](https://github.com/open-feature/java-sdk-contrib/commit/67682a8d8a0a69c157e0d4a78bf541c5c7c60971))
+* **deps:** update opentelemetry-java monorepo to v1.44.1 ([#1070](https://github.com/open-feature/java-sdk-contrib/issues/1070)) ([4d5fe86](https://github.com/open-feature/java-sdk-contrib/commit/4d5fe86a488a8781ab7efefb4a5958c4fae01c17))
+* **deps:** update opentelemetry-java monorepo to v1.45.0 ([#1096](https://github.com/open-feature/java-sdk-contrib/issues/1096)) ([b8a79e7](https://github.com/open-feature/java-sdk-contrib/commit/b8a79e75850567a512849f2bc70aad2c88443445))
+
+
+### 🧹 Chore
+
+* update min SDK version ([#1152](https://github.com/open-feature/java-sdk-contrib/issues/1152)) ([519a8de](https://github.com/open-feature/java-sdk-contrib/commit/519a8de805761d55325daed7a1f8b65252bc3b01))
+
 ## [3.2.0](https://github.com/open-feature/java-sdk-contrib/compare/dev.openfeature.contrib.hooks.otel-v3.1.2...dev.openfeature.contrib.hooks.otel-v3.2.0) (2024-09-25)
 
 ### 🐛 Bug Fixes

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>3.2.0</version>
+    <version>3.2.1</version>
 </dependency>
 ```
 

hooks/open-telemetry/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>dev.openfeature.contrib.hooks</groupId>
     <artifactId>otel</artifactId>
-    <version>3.2.0</version> <!--x-release-please-version -->
+    <version>3.2.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.45.0</version>
+                <version>1.46.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

hooks/open-telemetry/src/main/java/dev/openfeature/contrib/hooks/otel/MetricsHook.java

@@ -134,7 +134,7 @@ public void error(HookContext ctx, Exception error, Map hints) {
     }
 
     @Override
-    public void finallyAfter(HookContext ctx, Map hints) {
+    public void finallyAfter(HookContext ctx, FlagEvaluationDetails details, Map hints) {
         activeFlagEvaluationsCounter.add(-1, Attributes.of(flagKeyAttributeKey, ctx.getFlagKey()));
     }
 

hooks/open-telemetry/src/test/java/dev/openfeature/contrib/hooks/otel/MetricsHookTest.java

@@ -188,7 +188,7 @@ public void finally_stage_validation() {
         final MetricsHook metricHook = new MetricsHook(telemetryExtension.getOpenTelemetry());
 
         // when
-        metricHook.finallyAfter(commonHookContext, null);
+        metricHook.finallyAfter(commonHookContext, null, null);
         List<MetricData> metrics = telemetryExtension.getMetrics();
 
         // then

hooks/open-telemetry/version.txt

@@ -1 +1 @@
-3.2.0
+3.2.1

pom.xml

@@ -67,8 +67,8 @@
             <!-- this can be overriden in child POMs to support specific SDK requirements -->
             <groupId>dev.openfeature</groupId>
             <artifactId>sdk</artifactId>
-            <!-- 1.12 <= v < 2.0 -->
-            <version>[1.12,2.0)</version>
+            <!-- 1.14 <= v < 2.0 (excluding 2.0 pre-releases)-->
+            <version>[1.14,1.99999)</version>
             <!-- use the version provided at runtime -->
             <scope>provided</scope>
         </dependency>

providers/flagd/pom.xml

@@ -116,7 +116,7 @@
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-api</artifactId>
-            <version>1.45.0</version>
+            <version>1.46.0</version>
         </dependency>
 
         <dependency>