Further fixes

Author: manuel-alvarez-alvarez

dd-java-agent/agent-featureflag/src/test/groovy/com/datadog/featureflag/utils/AbstractJsonTestSuiteBasedTests.groovy renamed to dd-java-agent/agent-featureflag/src/test/groovy/com/datadog/featureflag/AbstractJsonTestSuiteBasedTests.groovy

@@ -1,4 +1,4 @@
-package com.datadog.featureflag.utils
+package com.datadog.featureflag
 
 import static com.datadog.featureflag.utils.TestUtils.EvaluationTest
 import static com.datadog.featureflag.utils.TestUtils.parseConfiguration

dd-java-agent/agent-featureflag/src/test/groovy/com/datadog/featureflag/ExposureWriterTests.groovy

@@ -4,7 +4,6 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 import com.datadog.featureflag.exposure.ExposureEvent
 import com.datadog.featureflag.exposure.ExposuresRequest
-import com.datadog.featureflag.utils.AbstractJsonTestSuiteBasedTests
 import com.datadog.featureflag.utils.TestUtils
 import com.squareup.moshi.Moshi
 import datadog.trace.agent.test.server.http.TestHttpServer

dd-java-agent/agent-featureflag/src/test/groovy/com/datadog/featureflag/FeatureFlagEvaluatorTests.groovy

@@ -2,7 +2,6 @@ package com.datadog.featureflag
 
 import static com.datadog.featureflag.utils.TestUtils.parseConfiguration
 
-import com.datadog.featureflag.utils.AbstractJsonTestSuiteBasedTests
 import com.datadog.featureflag.utils.TestUtils
 import datadog.trace.api.featureflag.FeatureFlagEvaluator
 

dd-smoke-tests/springboot-java-11/build.gradle

@@ -25,7 +25,6 @@ dependencies {
   implementation project(':dd-smoke-tests:iast-util:iast-util-11')
 
   // open feature flag provider
-  implementation(libs.openfeature.sdk)
   api(project(':dd-trace-api:openfeature'))
 }
 

dd-trace-api/openfeature/src/main/java/datadog/trace/api/openfeature/Provider.java

@@ -110,8 +110,7 @@ private ImmutableMetadata mapFlagMetadata(final Map<String, Object> metadata) {
             builder.addInteger(key, (Integer) value);
           } else if (value instanceof Float) {
             builder.addFloat(key, (Float) value);
-          }
-          if (value instanceof Long) {
+          } else if (value instanceof Long) {
             builder.addLong(key, (Long) value);
           } else if (value instanceof Double) {
             builder.addDouble(key, (Double) value);
@@ -120,7 +119,7 @@ private ImmutableMetadata mapFlagMetadata(final Map<String, Object> metadata) {
           } else if (value instanceof Boolean) {
             builder.addBoolean(key, (Boolean) value);
           } else {
-            LOGGER.warn(
+            LOGGER.debug(
                 "Invalid key provided in metadata {}:{}",
                 key,
                 value == null ? "null" : value.getClass());
@@ -142,10 +141,12 @@ private <V, R> ProviderEvaluation<V> mapResolution(
             .reason(result.getReason())
             .variant(result.getVariant())
             .flagMetadata(mapFlagMetadata(result.getFlagMetadata()))
+            .errorCode(mapErrorCode(result.getErrorCode()))
+            .errorMessage(result.getErrorMessage())
             .build();
   }
 
-  private static ErrorCode errorCode(final ResolutionError code) {
+  private static ErrorCode mapErrorCode(final ResolutionError code) {
     try {
       return ErrorCode.valueOf(code.name());
     } catch (final IllegalArgumentException e) {

metadata/supported-configurations.json

@@ -183,6 +183,7 @@
     "DD_EXCEPTION_REPLAY_MAX_FRAMES_TO_CAPTURE": ["A"],
     "DD_EXPERIMENTAL_API_SECURITY_ENABLED": ["A"],
     "DD_EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL": ["A"],
+    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": ["A"],
     "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": ["A"],
     "DD_FORCE_CLEAR_TEXT_HTTP_FOR_INTAKE_CLIENT": ["A"],
     "DD_GIT_BRANCH": ["A"],