Fix compilation issues

Author: manuel-alvarez-alvarez

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -656,7 +656,7 @@ public void execute() {
       maybeStartDebugger(instrumentation, scoClass, sco);
       maybeStartRemoteConfig(scoClass, sco);
       maybeStartAiGuard();
-      maybeStartFeatureFlag(instrumentation, scoClass, sco);
+      maybeStartFeatureFlag(scoClass, sco);
 
       if (telemetryEnabled) {
         startTelemetry(instrumentation, scoClass, sco);
@@ -1078,16 +1078,15 @@ private static void maybeStartLLMObs(Instrumentation inst, Class<?> scoClass, Ob
     }
   }
 
-  private static void maybeStartFeatureFlag(
-      final Instrumentation inst, final Class<?> scoClass, final Object sco) {
+  private static void maybeStartFeatureFlag(final Class<?> scoClass, final Object sco) {
     if (featureFlagEnabled) {
       StaticEventLogger.begin("Feature Flag");
 
       try {
         final Class<?> ffSysClass =
             AGENT_CLASSLOADER.loadClass("com.datadog.featureflag.FeatureFlagSystem");
-        final Method ffSysMethod = ffSysClass.getMethod("start", Instrumentation.class, scoClass);
-        ffSysMethod.invoke(null, inst, sco);
+        final Method ffSysMethod = ffSysClass.getMethod("start", scoClass);
+        ffSysMethod.invoke(null, sco);
       } catch (final Throwable e) {
         log.warn("Not starting Feature Flag subsystem", e);
       }

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

@@ -51,6 +51,9 @@ public Resolution<Object> evaluate(
 
   @Override
   public void addListener(final Listener listener) {
+    if (configuration.get() != null) {
+      listener.onInitialized();
+    }
     synchronized (listeners) {
       this.listeners.add(listener);
     }

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

@@ -1,6 +1,7 @@
 package com.datadog.featureflag.evaluator
 
 import com.datadog.featureflag.FeatureFlagEvaluatorImpl
+import datadog.trace.api.featureflag.FeatureFlag
 import datadog.trace.api.openfeature.Provider
 import dev.openfeature.sdk.Client
 import dev.openfeature.sdk.EvaluationContext
@@ -15,18 +16,16 @@ class FeatureFlagEvaluatorTests extends BaseFeatureFlagsTest {
   @Shared
   protected Client client
 
-  @Shared
-  protected FeatureFlagEvaluatorImpl evaluator
-
   void setup() {
-    evaluator = new FeatureFlagEvaluatorImpl()
-    OpenFeatureAPI.getInstance().setProviderAndWait(new Provider(evaluator))
+    final evaluator = new FeatureFlagEvaluatorImpl()
+    evaluator.accept(configuration)
+    FeatureFlag.EVALUATOR = evaluator
+    OpenFeatureAPI.getInstance().setProviderAndWait(new Provider())
     client = OpenFeatureAPI.getInstance().getClient()
   }
 
   void 'test feature flag evaluation'() {
     setup:
-    evaluator.accept(configuration)
     final testCase = input["testCase"] as TestCase
     final context = buildContext(testCase)
 

dd-trace-api/openfeature/build.gradle.kts

@@ -11,6 +11,12 @@ val minJavaVersionForTests by extra(JavaVersion.VERSION_11)
 
 description = "open-feature"
 
+idea {
+  module {
+    jdkName = "11"
+  }
+}
+
 dependencies {
   api(libs.slf4j)
   api(libs.openfeature.sdk)
@@ -21,8 +27,13 @@ fun AbstractCompile.configureCompiler(javaVersionInteger: Int, compatibilityVers
   (project.extra["configureCompiler"] as Closure<*>).call(this, javaVersionInteger, compatibilityVersion, unsetReleaseFlagReason)
 }
 
-listOf("compileJava", "compileTestJava").forEach {
-  tasks.named<JavaCompile>(it) {
+listOf(JavaCompile::class.java, GroovyCompile::class.java).forEach { compileTaskType ->
+  tasks.withType(compileTaskType).configureEach {
     configureCompiler(11, JavaVersion.VERSION_11)
   }
 }
+
+tasks.withType<Javadoc>().configureEach {
+  // TODO ensure it uses JDK 11
+  enabled = false
+}

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

@@ -1,6 +1,7 @@
 package datadog.trace.api.openfeature;
 
-import datadog.trace.api.featureflag.FeatureFlag;
+import static datadog.trace.api.featureflag.FeatureFlag.EVALUATOR;
+
 import datadog.trace.api.featureflag.FeatureFlagEvaluator;
 import dev.openfeature.sdk.ErrorCode;
 import dev.openfeature.sdk.EvaluationContext;
@@ -21,15 +22,15 @@ public class Provider extends EventProvider implements Metadata, FeatureFlagEval
   private static final Logger LOGGER = LoggerFactory.getLogger(Provider.class);
   private static final String METADATA = "datadog-openfeature-provider";
 
-  private final FeatureFlagEvaluator evaluator;
-
   public Provider() {
-    this(FeatureFlag.EVALUATOR);
+    EVALUATOR.addListener(this);
   }
 
-  Provider(final FeatureFlagEvaluator evaluator) {
-    this.evaluator = evaluator;
-    this.evaluator.addListener(this);
+  @Override
+  public void onInitialized() {
+    emit(
+        ProviderEvent.PROVIDER_READY,
+        ProviderEventDetails.builder().message("Provider ready").build());
   }
 
   @Override
@@ -39,13 +40,6 @@ public void onConfigurationChanged() {
         ProviderEventDetails.builder().message("New configuration received").build());
   }
 
-  @Override
-  public void onInitialized() {
-    emit(
-        ProviderEvent.PROVIDER_READY,
-        ProviderEventDetails.builder().message("Provider ready").build());
-  }
-
   @Override
   public Metadata getMetadata() {
     return this;
@@ -60,7 +54,7 @@ public String getName() {
   public ProviderEvaluation<Boolean> getBooleanEvaluation(
       final String key, final Boolean defaultValue, final EvaluationContext ctx) {
     try {
-      return map(Boolean.class, evaluator.evaluate(key, defaultValue, new ContextAdapter(ctx)));
+      return map(Boolean.class, EVALUATOR.evaluate(key, defaultValue, new ContextAdapter(ctx)));
     } catch (final FeatureFlagEvaluator.EvaluationError e) {
       return fromError(e, defaultValue);
     }
@@ -70,7 +64,7 @@ public ProviderEvaluation<Boolean> getBooleanEvaluation(
   public ProviderEvaluation<String> getStringEvaluation(
       final String key, final String defaultValue, final EvaluationContext ctx) {
     try {
-      return map(String.class, evaluator.evaluate(key, defaultValue, new ContextAdapter(ctx)));
+      return map(String.class, EVALUATOR.evaluate(key, defaultValue, new ContextAdapter(ctx)));
     } catch (final FeatureFlagEvaluator.EvaluationError e) {
       return fromError(e, defaultValue);
     }
@@ -80,7 +74,7 @@ public ProviderEvaluation<String> getStringEvaluation(
   public ProviderEvaluation<Integer> getIntegerEvaluation(
       final String key, final Integer defaultValue, final EvaluationContext ctx) {
     try {
-      return map(Integer.class, evaluator.evaluate(key, defaultValue, new ContextAdapter(ctx)));
+      return map(Integer.class, EVALUATOR.evaluate(key, defaultValue, new ContextAdapter(ctx)));
     } catch (final FeatureFlagEvaluator.EvaluationError e) {
       return fromError(e, defaultValue);
     }
@@ -90,7 +84,7 @@ public ProviderEvaluation<Integer> getIntegerEvaluation(
   public ProviderEvaluation<Double> getDoubleEvaluation(
       final String key, final Double defaultValue, final EvaluationContext ctx) {
     try {
-      return map(Double.class, evaluator.evaluate(key, defaultValue, new ContextAdapter(ctx)));
+      return map(Double.class, EVALUATOR.evaluate(key, defaultValue, new ContextAdapter(ctx)));
     } catch (final FeatureFlagEvaluator.EvaluationError e) {
       return fromError(e, defaultValue);
     }
@@ -100,7 +94,7 @@ public ProviderEvaluation<Double> getDoubleEvaluation(
   public ProviderEvaluation<Value> getObjectEvaluation(
       final String key, final Value defaultValue, final EvaluationContext ctx) {
     try {
-      return map(Value.class, evaluator.evaluate(key, defaultValue, new ContextAdapter(ctx)));
+      return map(Value.class, EVALUATOR.evaluate(key, defaultValue, new ContextAdapter(ctx)));
     } catch (final FeatureFlagEvaluator.EvaluationError e) {
       return fromError(e, defaultValue);
     }