Merge branch 'master' into dougqh/atomics-benchmark

Author: dougqh

communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java

@@ -231,9 +231,14 @@ private void processInfoResponseHeaders(Response response) {
   private boolean processInfoResponse(State newState, String response) {
     try {
       Map<String, Object> map = RESPONSE_ADAPTER.fromJson(response);
+      final Object endpointObj = map.get("endpoints");
+      if (!(endpointObj instanceof List)) {
+        log.debug("Bad response received from the agent. Ignoring it.");
+        return false;
+      }
       discoverStatsDPort(map);
       newState.version = (String) map.get("version");
-      Set<String> endpoints = new HashSet<>((List<String>) map.get("endpoints"));
+      Set<String> endpoints = new HashSet<>((List<String>) endpointObj);
 
       String foundMetricsEndpoint = null;
       if (metricsEnabled) {

communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy

@@ -187,6 +187,28 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
     0 * _
   }
 
+  def "test fallback when /info empty"() {
+    setup:
+    OkHttpClient client = Mock(OkHttpClient)
+    DDAgentFeaturesDiscovery features = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, false, true)
+
+    when: "/info is empty"
+    features.discover()
+
+    then:
+    1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/info" }) >> { Request request -> infoResponse(request, "{}") }
+    0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.6/stats" }) >> { Request request -> clientError(request) }
+    0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.5/traces" }) >> { Request request -> success(request) }
+    1 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.4/traces" }) >> { Request request -> success(request) }
+    0 * client.newCall({ Request request -> request.url().toString() == "http://localhost:8125/v0.3/traces" }) >> { Request request -> success(request) }
+    features.getMetricsEndpoint() == null
+    !features.supportsMetrics()
+    features.getTraceEndpoint() == V04_ENDPOINT
+    !features.supportsLongRunning()
+    features.state() == PROBE_STATE
+    0 * _
+  }
+
   def "test fallback when /info not found"() {
     setup:
     OkHttpClient client = Mock(OkHttpClient)

components/http/http-api/build.gradle.kts

@@ -0,0 +1,35 @@
+plugins {
+  `java-library`
+  `java-test-fixtures`
+}
+
+apply(from = "$rootDir/gradle/java.gradle")
+
+description = "HTTP Client API"
+
+val minimumBranchCoverage by extra(0) // extra(0.7) -- need a library implementation
+val minimumInstructionCoverage by extra(0) // extra(0.7) -- need a library implementation
+
+// Exclude interfaces for test coverage
+val excludedClassesCoverage by extra(
+  listOf(
+    "datadog.http.client.HttpClient",
+    "datadog.http.client.HttpClient.Builder",
+    "datadog.http.client.HttpRequest",
+    "datadog.http.client.HttpRequest.Builder",
+    "datadog.http.client.HttpRequestBody",
+    "datadog.http.client.HttpRequestBody.MultipartBuilder",
+    "datadog.http.client.HttpRequestListener",
+    "datadog.http.client.HttpResponse",
+    "datadog.http.client.HttpUrl",
+    "datadog.http.client.HttpUrl.Builder",
+  )
+)
+
+dependencies {
+  // Add API implementations to test providers
+  // testRuntimeOnly(project(":components:http:http-lib-jdk"))
+  // testRuntimeOnly(project(":components:http:http-lib-okhttp"))
+  // Add MockServer for test fixtures
+  testFixturesImplementation("org.mock-server:mockserver-junit-jupiter-no-dependencies:5.14.0")
+}

components/http/http-api/src/main/java/datadog/http/client/HttpClient.java

@@ -0,0 +1,113 @@
+package datadog.http.client;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.Proxy;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import javax.annotation.Nullable;
+
+/**
+ * This interface is an abstraction for HTTP clients, providing request execution capabilities. This
+ * abstraction is implementation-agnostic and can be backed by third party libraries of the JDK
+ * itself.
+ *
+ * <p>HttpClient instances should be reused across requests for connection pooling.
+ */
+public interface HttpClient {
+  /**
+   * Executes an HTTP request synchronously and returns the response. The caller is responsible for
+   * closing the response.
+   *
+   * @param request the request to execute
+   * @return the HTTP response
+   * @throws IOException if an I/O error occurs
+   */
+  HttpResponse execute(HttpRequest request) throws IOException;
+
+  /**
+   * Executes an HTTP request asynchronously and returns a {@link CompletableFuture}. The caller is
+   * responsible for closing the response.
+   *
+   * @param request the request to execute
+   * @return a CompletableFuture that completes with the HTTP response
+   */
+  CompletableFuture<HttpResponse> executeAsync(HttpRequest request);
+
+  /**
+   * Creates a new {@link Builder} for constructing HTTP clients.
+   *
+   * @return a new http client builder
+   */
+  static Builder newBuilder() {
+    return HttpProviders.newClientBuilder();
+  }
+
+  /** Builder for constructing {@link HttpClient} instances. */
+  interface Builder {
+    /**
+     * Sets the client timeouts, including the connection.
+     *
+     * @param timeout the timeout duration
+     * @return this builder
+     */
+    Builder connectTimeout(Duration timeout);
+
+    /**
+     * Sets the proxy configuration.
+     *
+     * @param proxy the proxy to use
+     * @return this builder
+     */
+    Builder proxy(Proxy proxy);
+
+    /**
+     * Sets proxy authentication credentials.
+     *
+     * @param username the proxy username
+     * @param password the proxy password, or {@code null} to use an empty password
+     * @return this builder
+     */
+    Builder proxyAuthenticator(String username, @Nullable String password);
+
+    /**
+     * Configures the client to use a Unix domain socket.
+     *
+     * @param socketFile the Unix domain socket file
+     * @return this builder
+     */
+    Builder unixDomainSocket(File socketFile);
+
+    /**
+     * Configures the client to use a named pipe (Windows).
+     *
+     * @param pipeName the named pipe name
+     * @return this builder
+     */
+    Builder namedPipe(String pipeName);
+
+    /**
+     * Forces clear text (HTTP) connections, disabling TLS.
+     *
+     * @param clearText {@code true} to force HTTP, {@code false} to allow HTTPS
+     * @return this builder
+     */
+    Builder clearText(boolean clearText);
+
+    /**
+     * Sets a custom executor for executing async requests.
+     *
+     * @param executor the executor to use for async requests
+     * @return this builder
+     */
+    Builder executor(Executor executor);
+
+    /**
+     * Builds the {@link HttpClient} with the configured settings.
+     *
+     * @return the constructed HttpClient
+     */
+    HttpClient build();
+  }
+}