Applied PR feedback

Author: manuel-alvarez-alvarez

dd-smoke-tests/featureflag/build.gradle renamed to dd-smoke-tests/feature-flagging/build.gradle

@@ -0,0 +1,18 @@
+package datadog.smoketest.springboot.openfeature;
+
+import datadog.trace.api.openfeature.Provider;
+import dev.openfeature.sdk.Client;
+import dev.openfeature.sdk.OpenFeatureAPI;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class OpenFeatureConfiguration {
+
+  @Bean
+  public Client openFeatureClient() {
+    OpenFeatureAPI api = OpenFeatureAPI.getInstance();
+    api.setProviderAndWait(new Provider());
+    return api.getClient();
+  }
+}

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

@@ -4,10 +4,8 @@
 
 import dev.openfeature.sdk.Client;
 import dev.openfeature.sdk.EvaluationContext;
-import dev.openfeature.sdk.FeatureProvider;
 import dev.openfeature.sdk.FlagEvaluationDetails;
 import dev.openfeature.sdk.MutableContext;
-import dev.openfeature.sdk.OpenFeatureAPI;
 import dev.openfeature.sdk.Structure;
 import dev.openfeature.sdk.Value;
 import java.util.HashMap;
@@ -16,7 +14,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,19 +27,8 @@ public class OpenFeatureController {
 
   private final Client client;
 
-  public OpenFeatureController() {
-    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());
-    return response;
+  public OpenFeatureController(final Client client) {
+    this.client = client;
   }
 
   @PostMapping(
@@ -53,7 +39,6 @@ public ResponseEntity<?> evaluate(@RequestBody final EvaluateRequest request) {
     try {
       final EvaluationContext context = context(request);
       FlagEvaluationDetails<?> details;
-      String reason;
       switch (request.getVariationType()) {
         case "BOOLEAN":
           details =

dd-smoke-tests/feature-flagging/src/main/java/datadog/smoketest/springboot/openfeature/OpenFeatureConfiguration.java

@@ -35,6 +35,7 @@ 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')
@@ -55,22 +56,6 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
     }
   }
 
-  void 'test open feature provider metadata'() {
-    setup:
-    final url = "http://localhost:${httpPort}/openfeature/provider-metadata"
-    final request = new Request.Builder().url(url).get().build()
-
-    when:
-    final response = client.newCall(request).execute()
-
-    then:
-    response.code() == 200
-    final responseBody = new JsonSlurper().parse(response.body().byteStream())
-    responseBody['metadata'] == 'datadog-openfeature-provider'
-    responseBody['providerClass'] == 'datadog.trace.api.openfeature.Provider'
-    responseBody != null
-  }
-
   void 'test remote config'() {
     when:
     final rcRequest = waitForRcClientRequest {req ->
@@ -84,6 +69,7 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
 
   void 'test open feature evaluation'() {
     setup:
+    setRemoteConfig("datadog/2/FFE_FLAGS/1/config", rcPayload)
     final url = "http://localhost:${httpPort}/openfeature/evaluate"
     final request = new Request.Builder()
     .url(url)
@@ -96,9 +82,9 @@ class OpenFeatureProviderSmokeTest extends AbstractServerSmokeTest {
     then:
     response.code() == 200
     final responseBody = new JsonSlurper().parse(response.body().byteStream())
-    assert responseBody.value == testCase.result.value
-    assert responseBody.variant == testCase.result.variant
-    assert responseBody.flagMetadata?.allocationKey == testCase.result.flagMetadata?.allocationKey
+    responseBody.value == testCase.result.value
+    responseBody.variant == testCase.result.variant
+    responseBody.flagMetadata?.allocationKey == testCase.result.flagMetadata?.allocationKey
     if (testCase.result.flagMetadata?.doLog) {
       waitForEvpProxyMessage(exposurePoll) {
         final exposure = it.v2 as ExposuresRequest