More fixes

Author: manuel-alvarez-alvarez

dd-java-agent/agent-featureflag/src/main/java/com/datadog/featureflag/FeatureFlagEvaluatorImpl.java

@@ -10,7 +10,8 @@
 import com.datadog.featureflag.ufc.v1.ShardRange;
 import com.datadog.featureflag.ufc.v1.Split;
 import com.datadog.featureflag.ufc.v1.Variant;
-import datadog.trace.api.featureflag.FeatureFlagConfiguration;
+import datadog.trace.api.featureflag.FeatureFlagConfig;
+import datadog.trace.api.featureflag.FeatureFlagConfigListener;
 import datadog.trace.api.featureflag.FeatureFlagEvaluator;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -25,19 +26,17 @@
 import java.util.Objects;
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class FeatureFlagEvaluatorImpl
-    implements FeatureFlagEvaluator, Consumer<FeatureFlagConfiguration> {
+public class FeatureFlagEvaluatorImpl implements FeatureFlagEvaluator, FeatureFlagConfigListener {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(FeatureFlagEvaluatorImpl.class);
   private final AtomicReference<ServerConfiguration> configuration = new AtomicReference<>();
 
   @Override
-  public void accept(final FeatureFlagConfiguration serverConfiguration) {
+  public void onConfigurationChanged(final FeatureFlagConfig serverConfiguration) {
     configuration.getAndSet((ServerConfiguration) serverConfiguration);
   }
 
@@ -344,10 +343,14 @@ private <T> T mapValue(final Class<T> target, final Object value) {
       return (T) Boolean.valueOf(value.toString());
     }
     if (target == Integer.class) {
-      return (T) ((Integer) Double.valueOf(value.toString()).intValue());
+      final Number number =
+          value instanceof Number ? ((Number) value) : Double.valueOf(value.toString());
+      return (T) ((Integer) number.intValue());
     }
     if (target == Double.class) {
-      return (T) Double.valueOf(value.toString());
+      final Number number =
+          value instanceof Number ? ((Number) value) : Double.valueOf(value.toString());
+      return (T) ((Double) number.doubleValue());
     }
     return (T) value;
   }

dd-java-agent/agent-featureflag/src/main/java/com/datadog/featureflag/FeatureFlagRemoteConfigServiceImpl.java

@@ -1,7 +1,5 @@
 package com.datadog.featureflag;
 
-import static datadog.trace.api.featureflag.FeatureFlag.getConfigListeners;
-
 import com.datadog.featureflag.ufc.v1.ServerConfiguration;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
@@ -11,6 +9,7 @@
 import datadog.remoteconfig.ConfigurationPoller;
 import datadog.remoteconfig.PollingRateHinter;
 import datadog.remoteconfig.Product;
+import datadog.trace.api.featureflag.FeatureFlag;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import javax.annotation.Nullable;
@@ -45,7 +44,7 @@ public void accept(
       final String configKey,
       @Nullable final ServerConfiguration configuration,
       final PollingRateHinter pollingRateHinter) {
-    getConfigListeners().forEach(consumer -> consumer.accept(configuration));
+    FeatureFlag.dispatch(configuration);
   }
 
   private static class UniversalFlagConfigDeserializer

dd-java-agent/agent-featureflag/src/main/java/com/datadog/featureflag/FeatureFlagSystem.java

@@ -8,7 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class FeatureFlagSystem {
+public class FeatureFlagSystem extends FeatureFlag {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(FeatureFlagSystem.class);
   private static final int EXPOSURE_WRITER_CAPACITY = 100_000;
@@ -35,8 +35,8 @@ public static void start(final SharedCommunicationObjects sco) {
             sco.agentUrl,
             config);
     final FeatureFlagEvaluatorImpl evaluator = new FeatureFlagEvaluatorImpl();
-    FeatureFlag.addConfigListener(evaluator);
-    FeatureFlag.init(new ExposureWriterEvaluatorAdapter(EXPOSURE_WRITER, evaluator));
+    FeatureFlag.addListener(evaluator);
+    FeatureFlag.setEvaluator(new ExposureWriterEvaluatorAdapter(EXPOSURE_WRITER, evaluator));
 
     CONFIG_SERVICE = new FeatureFlagRemoteConfigServiceImpl(poller);
     CONFIG_SERVICE.init();

dd-java-agent/agent-featureflag/src/main/java/com/datadog/featureflag/ufc/v1/ServerConfiguration.java

@@ -1,9 +1,9 @@
 package com.datadog.featureflag.ufc.v1;
 
-import datadog.trace.api.featureflag.FeatureFlagConfiguration;
+import datadog.trace.api.featureflag.FeatureFlagConfig;
 import java.util.Map;
 
-public class ServerConfiguration implements FeatureFlagConfiguration {
+public class ServerConfiguration implements FeatureFlagConfig {
   public final String createdAt;
   public final String format;
   public final Environment environment;

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

@@ -42,7 +42,7 @@ class ExposureWriterTests extends AbstractJsonTestSuiteBasedTests {
     setup:
     def writer = Mock(ExposureWriter)
     def evaluator = new FeatureFlagEvaluatorImpl()
-    evaluator.accept(configuration)
+    evaluator.onConfigurationChanged(configuration)
     evaluator = new ExposureWriterEvaluatorAdapter(writer, evaluator)
     final context = buildContext(evaluation)
 
@@ -65,7 +65,7 @@ class ExposureWriterTests extends AbstractJsonTestSuiteBasedTests {
     def writer = Mock(ExposureWriter)
     final cacheCapacity = 5
     def evaluator = new FeatureFlagEvaluatorImpl()
-    evaluator.accept(configuration)
+    evaluator.onConfigurationChanged(configuration)
     evaluator = new ExposureWriterEvaluatorAdapter(cacheCapacity, writer, evaluator)
 
     when: 'populating the cache'
@@ -95,7 +95,7 @@ class ExposureWriterTests extends AbstractJsonTestSuiteBasedTests {
     def writer = new ExposureWriterImpl(100_000, 100L, TimeUnit.MILLISECONDS, HttpUrl.get(server.address), Config.get())
     writer.init()
     def evaluator = new FeatureFlagEvaluatorImpl()
-    evaluator.accept(configuration)
+    evaluator.onConfigurationChanged(configuration)
     evaluator = new ExposureWriterEvaluatorAdapter(writer, evaluator)
     def evaluations = testCases.findAll {
       it.result?.flagMetadata?.doLog == true

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

@@ -24,7 +24,7 @@ class FeatureFlagEvaluatorTests extends AbstractJsonTestSuiteBasedTests {
   void 'test no context'() {
     setup:
     final evaluator = new FeatureFlagEvaluatorImpl()
-    evaluator.accept(configuration)
+    evaluator.onConfigurationChanged(configuration)
     final testCase = testCases.first()
 
     when:
@@ -39,7 +39,7 @@ class FeatureFlagEvaluatorTests extends AbstractJsonTestSuiteBasedTests {
   void 'test feature flag evaluation'() {
     setup:
     final evaluator = new FeatureFlagEvaluatorImpl()
-    evaluator.accept(configuration)
+    evaluator.onConfigurationChanged(configuration)
     final context = buildContext(evaluation)
 
     when:
@@ -52,10 +52,10 @@ class FeatureFlagEvaluatorTests extends AbstractJsonTestSuiteBasedTests {
     evaluation << testCases
   }
 
-  void 'test feature flag dates format'() {
+  void 'test feature flag date parsing'() {
     setup:
     final evaluator = new FeatureFlagEvaluatorImpl()
-    evaluator.accept(parseConfiguration('data/flags-dates-v1.json'))
+    evaluator.onConfigurationChanged(parseConfiguration('data/flags-dates-v1.json'))
     final evaluation = new TestUtils.EvaluationTest(
       flag: 'start-and-end-date-test',
       variationType: 'STRING',

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

@@ -8,25 +8,25 @@ import datadog.remoteconfig.ConfigurationPoller
 import datadog.remoteconfig.PollingRateHinter
 import datadog.remoteconfig.Product
 import datadog.trace.api.featureflag.FeatureFlag
+import datadog.trace.api.featureflag.FeatureFlagConfigListener
 import datadog.trace.test.util.DDSpecification
-import java.util.function.Consumer
 
 class FeatureFlagRemoteConfigServiceTest extends DDSpecification {
 
-  private Consumer<ServerConfiguration> consumer
+  private FeatureFlagConfigListener listener
 
   void setup() {
-    consumer = Mock(Consumer<ServerConfiguration>)
+    listener = Mock(FeatureFlagConfigListener)
   }
 
   void cleanup() {
-    FeatureFlag.removeConfigListener {consumer}
+    FeatureFlag.removeListener(listener)
   }
 
   void 'test new config received'() {
     setup:
     final poller = Mock(ConfigurationPoller)
-    FeatureFlag.addConfigListener(consumer)
+    FeatureFlag.addListener(listener)
     final service = new FeatureFlagRemoteConfigServiceImpl(poller)
     final config = fetchConfiguration( 'data/flags-v1.json').bytes
     ConfigurationDeserializer<ServerConfiguration> deserializer = null
@@ -43,7 +43,7 @@ class FeatureFlagRemoteConfigServiceTest extends DDSpecification {
     service.accept('test', deserializer.deserialize(config), Mock(PollingRateHinter))
 
     then:
-    1 * consumer.accept({
+    1 * listener.onConfigurationChanged({
       ServerConfiguration ufc ->
       ufc.createdAt == '2024-04-17T19:40:53.716Z'
       && ufc.format == 'SERVER'

dd-smoke-tests/openfeature/build.gradle

@@ -0,0 +1,36 @@
+import org.springframework.boot.gradle.tasks.bundling.BootJar
+
+plugins {
+  id 'java'
+  id 'org.springframework.boot' version '2.7.15'
+  id 'io.spring.dependency-management' version '1.0.15.RELEASE'
+}
+
+ext {
+  minJavaVersionForTests = JavaVersion.VERSION_11
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+apply from: "$rootDir/gradle/spring-boot-plugin.gradle"
+description = 'Open Feature provider Smoke Tests.'
+
+tasks.named("compileJava", JavaCompile) {
+  configureCompiler(it, 11, JavaVersion.VERSION_11)
+}
+
+dependencies {
+  implementation project(':dd-trace-openfeature')
+  implementation 'org.springframework.boot:spring-boot-starter-web'
+  testImplementation project(':dd-smoke-tests')
+}
+
+tasks.withType(Test).configureEach {
+  dependsOn "bootJar"
+  def bootJarTask = tasks.named('bootJar', BootJar)
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get()
+      }
+    })
+}

dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/SpringbootApplication.java

@@ -0,0 +1,14 @@
+package datadog.smoketest.springboot;
+
+import java.lang.management.ManagementFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringbootApplication {
+
+  public static void main(final String[] args) {
+    SpringApplication.run(SpringbootApplication.class, args);
+    System.out.println("Started in " + ManagementFactory.getRuntimeMXBean().getUptime() + "ms");
+  }
+}

dd-smoke-tests/springboot-java-11/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java renamed to dd-smoke-tests/openfeature/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureController.java

@@ -29,18 +29,15 @@ public class OpenFeatureController {
 
   private final Client client;
 
-  static {
-    OpenFeatureAPI.getInstance().setProvider(new datadog.trace.api.openfeature.Provider());
-  }
-
   public OpenFeatureController() {
-    this.client = OpenFeatureAPI.getInstance().getClient();
+    OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+    api.setProviderAndWait(new datadog.trace.api.openfeature.Provider());
+    this.client = api.getClient();
   }
 
   @GetMapping("/provider-metadata")
   public Map<String, Object> getProviderMetadata() {
     FeatureProvider provider = OpenFeatureAPI.getInstance().getProvider();
-
     Map<String, Object> response = new HashMap<>();
     response.put("providerClass", provider.getClass());
     response.put("metadata", provider.getMetadata().getName());