Fix smoke tests

Author: manuel-alvarez-alvarez

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

@@ -1,5 +1,6 @@
 package com.datadog.featureflag;
 
+import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.remoteconfig.ConfigurationPoller;
 import datadog.trace.api.Config;
@@ -25,8 +26,13 @@ public static void start(final SharedCommunicationObjects sco) {
           "Feature flags evaluation won't be started, remote config is likely disabled");
     }
 
-    EXPOSURE_WRITER = new ExposureWriterImpl(sco.agentUrl, config);
-    EXPOSURE_WRITER.init();
+    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");
+    }
 
     CONFIG_SERVICE = new FeatureFlagRemoteConfigServiceImpl(poller);
     CONFIG_SERVICE.init();
@@ -35,8 +41,14 @@ public static void start(final SharedCommunicationObjects sco) {
   }
 
   public static void stop() {
-    EXPOSURE_WRITER.close();
-    CONFIG_SERVICE.close();
+    if (EXPOSURE_WRITER != null) {
+      EXPOSURE_WRITER.close();
+      EXPOSURE_WRITER = null;
+    }
+    if (CONFIG_SERVICE != null) {
+      CONFIG_SERVICE.close();
+      CONFIG_SERVICE = null;
+    }
     LOGGER.debug("Feature Flag system stopped");
   }
 }

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

@@ -1,5 +1,6 @@
 package com.datadog.featureflag
 
+import datadog.communication.ddagent.DDAgentFeaturesDiscovery
 import datadog.communication.ddagent.SharedCommunicationObjects
 import datadog.remoteconfig.Capabilities
 import datadog.remoteconfig.ConfigurationDeserializer
@@ -15,12 +16,15 @@ 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, _)
@@ -34,6 +38,9 @@ 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'() {
@@ -48,5 +55,8 @@ class FeatureFlagSystemTest extends DDSpecification {
 
     then:
     thrown(IllegalStateException)
+
+    cleanup:
+    FeatureFlagSystem.stop()
   }
 }

dd-smoke-tests/openfeature/build.gradle renamed to dd-smoke-tests/featureflag/build.gradle

@@ -21,6 +21,7 @@ tasks.named("compileJava", JavaCompile) {
 dependencies {
   implementation project(':products:openfeature')
   implementation 'org.springframework.boot:spring-boot-starter-web'
+
   testImplementation project(':dd-smoke-tests')
 }
 

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

@@ -21,7 +21,6 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
 
     final springBootShadowJar = System.getProperty("datadog.smoketest.springboot.shadowJar.path")
     final command = [javaPath()]
-    command.add('-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005')
     command.addAll(defaultJavaProperties)
     command.add('-Ddd.trace.debug=true')
     command.add('-Ddd.remote_config.enabled=true')

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

@@ -172,6 +172,7 @@ include(
   ":dd-smoke-tests:crashtracking",
   ":dd-smoke-tests:custom-systemloader",
   ":dd-smoke-tests:dynamic-config",
+  ":dd-smoke-tests:featureflag",
   ":dd-smoke-tests:field-injection",
   ":dd-smoke-tests:gradle",
   ":dd-smoke-tests:grpc-1.5",
@@ -185,7 +186,6 @@ include(
   ":dd-smoke-tests:lib-injection",
   ":dd-smoke-tests:log-injection",
   ":dd-smoke-tests:maven",
-  ":dd-smoke-tests:openfeature",
   ":dd-smoke-tests:opentracing",
   ":dd-smoke-tests:opentelemetry",
   ":dd-smoke-tests:osgi",