Fix failing tests

Author: manuel-alvarez-alvarez

dd-java-agent/instrumentation/spring-webmvc-5.3/src/test/groovy/test/boot/EndpointCollectorSpringBootTest.groovy

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod
 import org.springframework.web.servlet.config.annotation.EnableWebMvc
 
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ENDPOINT_DISCOVERY
+import static datadog.trace.api.config.AppSecConfig.API_SECURITY_ENDPOINT_COLLECTION_ENABLED
 
 @SpringBootTest(classes = DiscoveryController)
 @EnableWebMvc
@@ -35,6 +36,11 @@ class EndpointCollectorSpringBootTest extends AgentTestRunner {
     }
   }
 
+  @Override
+  protected void configurePreAgent() {
+    injectSysConfig(API_SECURITY_ENDPOINT_COLLECTION_ENABLED, "true")
+  }
+
   void 'test endpoint discovery'() {
     when:
     final endpoints = EndpointCollector.get().drain().toList().findAll { it.path == ENDPOINT_DISCOVERY.path }

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy

@@ -84,6 +84,7 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_B
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.WEBSOCKET
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+import static datadog.trace.api.config.AppSecConfig.API_SECURITY_ENDPOINT_COLLECTION_ENABLED
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_QUERY_STRING
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_RAW_RESOURCE
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_SERVER_TAG_QUERY_STRING
@@ -163,6 +164,8 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
     injectSysConfig(REQUEST_HEADER_TAGS, 'x-datadog-test-request-header:request_header_tag')
     // We don't inject a matching response header tag here since it would be always on and show up in all the tests
     injectSysConfig(TRACE_WEBSOCKET_MESSAGES_ENABLED, "true")
+    // allow endpoint discover for the tests
+    injectSysConfig(API_SECURITY_ENDPOINT_COLLECTION_ENABLED, "true")
   }
 
   // used in blocking tests to check if the handler was skipped

internal-api/build.gradle

@@ -197,6 +197,8 @@ excludedClassesCoverage += [
   // POJO
   'datadog.trace.api.iast.util.Cookie',
   'datadog.trace.api.iast.util.Cookie.Builder',
+  'datadog.trace.api.telemetry.Endpoint',
+  'datadog.trace.api.telemetry.Endpoint.Method',
   'datadog.trace.api.telemetry.LogCollector.RawLogMessage',
   "datadog.trace.api.telemetry.MetricCollector.DistributionSeriesPoint",
   "datadog.trace.api.telemetry.MetricCollector",

internal-api/src/main/java/datadog/trace/api/telemetry/Endpoint.java

@@ -149,17 +149,4 @@ static <E extends Enum<E>, C extends Collection<E>> List<String> parseMethods(fi
       return result;
     }
   }
-
-  public interface Authentication {
-    String JWT = "JWT";
-    String BASIC = "basic";
-    String OAUTH = "oauth";
-    String OIDC = "OIDC";
-    String API_KEY = "api_key";
-    String SESSION = "session";
-    String M_TLS = "mTLS";
-    String SAML = "SAML";
-    String FORM = "Form";
-    String OTHER = "other";
-  }
 }

internal-api/src/test/groovy/datadog/trace/api/telemetry/EndpointCollectorTest.groovy

@@ -0,0 +1,37 @@
+package datadog.trace.api.telemetry
+
+import datadog.trace.test.util.DDSpecification
+
+class EndpointCollectorTest extends DDSpecification {
+
+  void 'no metrics - drain empty list'() {
+    when:
+    final list = EndpointCollector.get().drain()
+
+    then:
+    !list.hasNext()
+  }
+
+  void 'set iterator'() {
+    setup:
+    final expected = (0..10).collect { index ->
+      new Endpoint()
+        .first(index == 0)
+        .type(Endpoint.Type.REST)
+        .operation(Endpoint.Operation.HTTP_REQUEST)
+        .path("/$index")
+        .requestBodyType(['application/json'])
+        .responseBodyType(['plain/text'])
+        .responseCode([200])
+        .authentication(['JWT'])
+        .method(Endpoint.Method.METHODS[index % Endpoint.Method.METHODS.size()])
+    }
+    EndpointCollector.get().supplier(expected.iterator())
+
+    when:
+    final received = EndpointCollector.get().drain().toList()
+
+    then:
+    received == expected
+  }
+}

telemetry/src/main/java/datadog/telemetry/endpoint/EndpointPeriodicAction.java

@@ -8,9 +8,19 @@
 
 public class EndpointPeriodicAction implements TelemetryRunnable.TelemetryPeriodicAction {
 
+  private final EndpointCollector collector;
+
+  public EndpointPeriodicAction() {
+    this(EndpointCollector.get());
+  }
+
+  public EndpointPeriodicAction(EndpointCollector collector) {
+    this.collector = collector;
+  }
+
   @Override
   public void doIteration(final TelemetryService service) {
-    for (final Iterator<Endpoint> it = EndpointCollector.get().drain(); it.hasNext(); ) {
+    for (final Iterator<Endpoint> it = collector.drain(); it.hasNext(); ) {
       if (!service.addEndpoint(it.next())) {
         break;
       }

telemetry/src/test/groovy/datadog/telemetry/endpoint/EndpointPeriodicActionTest.groovy

@@ -0,0 +1,25 @@
+package datadog.telemetry.endpoint
+
+import datadog.telemetry.TelemetryService
+import datadog.trace.api.telemetry.Endpoint
+import datadog.trace.api.telemetry.EndpointCollector
+import spock.lang.Specification
+
+class EndpointPeriodicActionTest extends Specification {
+
+  void 'test that common metrics are joined before being sent to telemetry #iterationIndex'() {
+    given:
+    final endpoint = new Endpoint().first(true).type('REST').method("GET").operation('http.request').path("/test")
+    final service = Mock(TelemetryService)
+    final endpointCollector = Mock(EndpointCollector)
+    final action = new EndpointPeriodicAction(endpointCollector)
+
+    when:
+    action.doIteration(service)
+
+    then:
+    1 * endpointCollector.drain() >> [endpoint].iterator()
+    1 * service.addEndpoint(endpoint)
+    0 * _
+  }
+}