Minor fixes

Author: manuel-alvarez-alvarez

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

@@ -1,6 +1,5 @@
 package com.datadog.featureflag;
 
-import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.remoteconfig.ConfigurationPoller;
 import datadog.trace.api.Config;
@@ -26,13 +25,8 @@ public static void start(final SharedCommunicationObjects sco) {
           "Feature flags evaluation won't be started, remote config is likely disabled");
     }
 
-    final DDAgentFeaturesDiscovery features = sco.featuresDiscovery(config);
-    if (features.supportsEvpProxy()) {
-      EXPOSURE_WRITER = new ExposureWriterImpl(sco.agentUrl, config);
-      EXPOSURE_WRITER.init();
-    } else {
-      LOGGER.debug("Feature Flag exposures won't be submitted");
-    }
+    EXPOSURE_WRITER = new ExposureWriterImpl(sco.agentUrl, config);
+    EXPOSURE_WRITER.init();
 
     CONFIG_SERVICE = new FeatureFlagRemoteConfigServiceImpl(poller);
     CONFIG_SERVICE.init();

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

@@ -1,6 +1,5 @@
 package com.datadog.featureflag
 
-import datadog.communication.ddagent.DDAgentFeaturesDiscovery
 import datadog.communication.ddagent.SharedCommunicationObjects
 import datadog.remoteconfig.Capabilities
 import datadog.remoteconfig.ConfigurationDeserializer
@@ -16,15 +15,12 @@ class FeatureFlagSystemTest extends DDSpecification {
     setup:
     final poller = Mock(ConfigurationPoller)
     final sco = Mock(SharedCommunicationObjects)
-    final featuresDiscovery = Mock(DDAgentFeaturesDiscovery)
     sco.agentUrl = HttpUrl.get('http://localhost')
 
     when:
     FeatureFlagSystem.start(sco)
 
     then:
-    1 * sco.featuresDiscovery(_ as Config) >> featuresDiscovery
-    1 * featuresDiscovery.supportsEvpProxy() >> evpProxy
     1 * sco.configurationPoller(_ as Config) >> { poller }
     1 * poller.addCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES)
     1 * poller.addListener(Product.FFE_FLAGS, _ as ConfigurationDeserializer, _)
@@ -38,9 +34,6 @@ class FeatureFlagSystemTest extends DDSpecification {
     1 * poller.removeCapabilities(Capabilities.CAPABILITY_FFE_FLAG_CONFIGURATION_RULES)
     1 * poller.stop()
     0 * _
-
-    where:
-    evpProxy << [true, false]
   }
 
   void 'test that a poller is required'() {

dd-smoke-tests/featureflag/src/test/groovy/datadog/smoketest/springboot/OpenFeatureProviderSmokeTest.groovy

@@ -1,20 +1,26 @@
 package datadog.smoketest.springboot
 
+import com.squareup.moshi.Moshi
 import datadog.remoteconfig.Capabilities
 import datadog.remoteconfig.Product
 import datadog.smoketest.AbstractServerSmokeTest
+import datadog.trace.api.featureflag.exposure.ExposuresRequest
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import okhttp3.MediaType
 import okhttp3.Request
 import okhttp3.RequestBody
+import okio.Okio
 import spock.lang.Shared
 
 class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
 
   @Shared
   private final rcPayload = JsonOutput.toJson(new JsonSlurper().parse(Thread.currentThread().contextClassLoader.getResource("ffe/flags-v1.json")))
 
+  @Shared
+  private final moshi = new Moshi.Builder().build().adapter(ExposuresRequest)
+
   @Override
   ProcessBuilder createProcessBuilder() {
     setRemoteConfig("datadog/2/FFE_FLAGS/1/config", rcPayload)
@@ -31,6 +37,16 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
     return builder
   }
 
+  @Override
+  Closure decodedEvpProxyMessageCallback() {
+    return { String path, byte[] body ->
+      if (!path.contains('api/v2/exposures')) {
+        return null
+      }
+      return moshi.fromJson(Okio.buffer(Okio.source(new ByteArrayInputStream(body))))
+    }
+  }
+
   void 'test open feature provider metadata'() {
     setup:
     final url = "http://localhost:${httpPort}/openfeature/provider-metadata"
@@ -74,6 +90,12 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
     final responseBody = new JsonSlurper().parse(response.body().byteStream())
     final value = responseBody.value
     assert value == testCase.result.value
+    waitForEvpProxyMessage {
+      final exposure = it.v2 as ExposuresRequest
+      return exposure.events.first().with {
+        it.flag.key == testCase.flag && it.subject.id == testCase.targetingKey
+      }
+    }
 
     where:
     testCase << new JsonSlurper().parse(Thread.currentThread().contextClassLoader.getResource("ffe/test-cases.json"))

dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy

@@ -47,6 +47,15 @@ abstract class AbstractSmokeTest extends ProcessManager {
   @Shared
   private Throwable telemetryDecodingFailure = null
 
+  @Shared
+  private Closure decodeEvpMessage = decodedEvpProxyMessageCallback()
+
+  @Shared
+  protected CopyOnWriteArrayList<Tuple2<String, ?>> evpProxyMessages = new CopyOnWriteArrayList()
+
+  @Shared
+  private Throwable evpProxyMessageDecodingFailure = null
+
   @Shared
   protected TestHttpServer.Headers lastTraceRequestHeaders = null
 
@@ -70,7 +79,8 @@ abstract class AbstractSmokeTest extends ProcessManager {
           "endpoints": [
             "/v0.4/traces",
             "/v0.5/traces",
-            "/telemetry/proxy/"
+            "/telemetry/proxy/",
+            "/evp_proxy/v2/",
           ],
           "client_drop_p0s": true,
           "span_meta_structs": true,
@@ -165,6 +175,22 @@ abstract class AbstractSmokeTest extends ProcessManager {
         }
         response.status(202).send()
       }
+      prefix("/evp_proxy/v2/") {
+        try {
+          final path = request.path.toString()
+          final body = request.getBody()
+          final decoded = decodeEvpMessage.call(path, body)
+          if (decoded) {
+            evpProxyMessages.add(new Tuple2<>(path, decodeEvpMessage.call(path, body)))
+          }
+          response.status(200).send()
+        } catch (Throwable t) {
+          println("=== Failure during evp proxy message decoding ===")
+          t.printStackTrace(System.out)
+          evpProxyMessageDecodingFailure = t
+          throw t
+        }
+      }
     }
   }
 
@@ -252,6 +278,10 @@ abstract class AbstractSmokeTest extends ProcessManager {
     if (traceDecodingFailure != null) {
       throw traceDecodingFailure
     }
+    evpProxyMessages.clear()
+    if (evpProxyMessageDecodingFailure) {
+      throw evpProxyMessageDecodingFailure
+    }
   }
 
   def setupSpec() {
@@ -275,6 +305,10 @@ abstract class AbstractSmokeTest extends ProcessManager {
     null
   }
 
+  Closure decodedEvpProxyMessageCallback() {
+    null
+  }
+
   void setRemoteConfig(String path, String jsonData) {
     def targets = """
 {
@@ -378,6 +412,21 @@ abstract class AbstractSmokeTest extends ProcessManager {
     return message
   }
 
+  <T> Tuple2<String, T> waitForEvpProxyMessage(final Function<Tuple2<String, T>, Boolean> predicate) {
+    waitForEvpProxyMessage(defaultPoll, predicate)
+  }
+
+  <T> Tuple2<String, T> waitForEvpProxyMessage(final PollingConditions poll, final Function<Tuple2<String, T>, Boolean> predicate) {
+    def message = null
+    poll.eventually {
+      if (evpProxyMessageDecodingFailure != null) {
+        throw evpProxyMessageDecodingFailure
+      }
+      assert (message = evpProxyMessages.find { predicate.apply(it) }) != null
+    }
+    return message
+  }
+
   List<DecodedTrace> getTraces() {
     decodeTraces
   }

products/openfeature/build.gradle.kts

@@ -61,3 +61,7 @@ tasks.withType<Javadoc>().configureEach {
 tasks.named<CheckForbiddenApis>("forbiddenApisMain") {
   failOnMissingClasses = false
 }
+
+tasks.named<Jar>("jar") {
+  archiveBaseName.set("dd-openfeature")
+}

products/openfeature/src/main/java/datadog/trace/api/openfeature/Provider.java

@@ -35,7 +35,7 @@ public void initialize(final EvaluationContext context) throws Exception {
       emit(
           ProviderEvent.PROVIDER_READY,
           ProviderEventDetails.builder().message("Provider ready").build());
-    } catch (final Exception e) {
+    } catch (final Throwable e) {
       final String message = "Failed to initialize Datadog provider, is the tracer configured?";
       LOGGER.error(message, e);
       emit(ProviderEvent.PROVIDER_ERROR, ProviderEventDetails.builder().message(message).build());