Merge branch 'master' into vandonr/proto

Author: vandonr

.github/CODEOWNERS

@@ -57,8 +57,10 @@ dd-java-agent/instrumentation/spring-security-5/ @DataDog/asm-java
 **/Iast*.java                          @DataDog/asm-java
 **/Iast*.groovy                        @DataDog/asm-java
 **/rasp/                               @Datadog/asm-java
-**/*Rasp*.java                          @DataDog/asm-java
-**/*Rasp*.groovy                        @DataDog/asm-java
+**/*Rasp*.java                         @DataDog/asm-java
+**/*Rasp*.groovy                       @DataDog/asm-java
+**/*Waf*.java                          @DataDog/asm-java
+**/*Waf*.groovy                        @DataDog/asm-java
 
 # @DataDog/data-jobs-monitoring
 dd-java-agent/instrumentation/spark/            @DataDog/data-jobs-monitoring

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/CiVisibilitySettings.java

@@ -142,9 +142,9 @@ public CiVisibilitySettings fromJson(Map<String, Object> json) {
           getBoolean(json, "flaky_test_retries_enabled", false),
           getBoolean(json, "impacted_tests_enabled", false),
           getBoolean(json, "known_tests_enabled", false),
-          EarlyFlakeDetectionSettingsJsonAdapter.INSTANCE.fromJson(
+          EarlyFlakeDetectionSettings.JsonAdapter.INSTANCE.fromJson(
               (Map<String, Object>) json.get("early_flake_detection")),
-          TestManagementSettingsJsonAdapter.INSTANCE.fromJson(
+          TestManagementSettings.JsonAdapter.INSTANCE.fromJson(
               (Map<String, Object>) json.get("test_management")));
     }
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java

@@ -84,7 +84,7 @@ public ConfigurationApiImpl(BackendApi backendApi, CiVisibilityMetricCollector m
         new Moshi.Builder()
             .add(ConfigurationsJsonAdapter.INSTANCE)
             .add(CiVisibilitySettings.JsonAdapter.INSTANCE)
-            .add(EarlyFlakeDetectionSettingsJsonAdapter.INSTANCE)
+            .add(EarlyFlakeDetectionSettings.JsonAdapter.INSTANCE)
             .add(MetaDtoJsonAdapter.INSTANCE)
             .build();
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/EarlyFlakeDetectionSettings.java

@@ -1,8 +1,14 @@
 package datadog.trace.civisibility.config;
 
+import com.squareup.moshi.FromJson;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 public class EarlyFlakeDetectionSettings {
 
@@ -34,15 +40,6 @@ public List<ExecutionsByDuration> getExecutionsByDuration() {
     return executionsByDuration;
   }
 
-  public int getExecutions(long durationMillis) {
-    for (ExecutionsByDuration e : executionsByDuration) {
-      if (durationMillis <= e.durationMillis) {
-        return e.executions;
-      }
-    }
-    return 0;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -62,38 +59,84 @@ public int hashCode() {
     return Objects.hash(enabled, executionsByDuration, faultySessionThreshold);
   }
 
-  public static final class ExecutionsByDuration {
-    public final long durationMillis;
-    public final int executions;
-
-    public ExecutionsByDuration(long durationMillis, int executions) {
-      this.durationMillis = durationMillis;
-      this.executions = executions;
+  public static final class Serializer {
+    public static void serialize(
+        datadog.trace.civisibility.ipc.serialization.Serializer serializer,
+        EarlyFlakeDetectionSettings settings) {
+      if (!settings.enabled) {
+        serializer.write((byte) 0);
+        return;
+      }
+      serializer.write((byte) 1);
+      serializer.write(settings.faultySessionThreshold);
+      serializer.write(settings.executionsByDuration, ExecutionsByDuration.Serializer::serialize);
     }
 
-    public long getDurationMillis() {
-      return durationMillis;
-    }
+    public static EarlyFlakeDetectionSettings deserialize(ByteBuffer buf) {
+      boolean enabled = datadog.trace.civisibility.ipc.serialization.Serializer.readByte(buf) != 0;
+      if (!enabled) {
+        return EarlyFlakeDetectionSettings.DEFAULT;
+      }
 
-    public int getExecutions() {
-      return executions;
+      int faultySessionThreshold =
+          datadog.trace.civisibility.ipc.serialization.Serializer.readInt(buf);
+      List<ExecutionsByDuration> executionsByDuration =
+          datadog.trace.civisibility.ipc.serialization.Serializer.readList(
+              buf, ExecutionsByDuration.Serializer::deserialize);
+      return new EarlyFlakeDetectionSettings(enabled, executionsByDuration, faultySessionThreshold);
     }
+  }
+
+  public static final class JsonAdapter {
+    public static final JsonAdapter INSTANCE = new JsonAdapter();
 
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
+    @FromJson
+    public EarlyFlakeDetectionSettings fromJson(Map<String, Object> json) {
+      if (json == null) {
+        return EarlyFlakeDetectionSettings.DEFAULT;
       }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
+
+      Boolean enabled = (Boolean) json.get("enabled");
+      Double faultySessionThreshold = (Double) json.get("faulty_session_threshold");
+
+      List<ExecutionsByDuration> executionsByDuration;
+      Map<String, Double> slowTestRetries = (Map<String, Double>) json.get("slow_test_retries");
+      if (slowTestRetries != null) {
+        executionsByDuration = new ArrayList<>(slowTestRetries.size());
+        for (Map.Entry<String, Double> e : slowTestRetries.entrySet()) {
+          long durationMillis = parseDuration(e.getKey());
+          int retries = e.getValue().intValue();
+          executionsByDuration.add(new ExecutionsByDuration(durationMillis, retries));
+        }
+        executionsByDuration.sort(Comparator.comparingLong(r -> r.durationMillis));
+      } else {
+        executionsByDuration = Collections.emptyList();
       }
-      ExecutionsByDuration that = (ExecutionsByDuration) o;
-      return durationMillis == that.durationMillis && executions == that.executions;
+
+      return new EarlyFlakeDetectionSettings(
+          enabled != null ? enabled : false,
+          executionsByDuration,
+          faultySessionThreshold != null ? faultySessionThreshold.intValue() : -1);
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(durationMillis, executions);
+    private static long parseDuration(String duration) {
+      char lastCharacter = duration.charAt(duration.length() - 1);
+      int numericValue = Integer.parseInt(duration.substring(0, duration.length() - 1));
+      TimeUnit timeUnit;
+      switch (lastCharacter) {
+        case 's':
+          timeUnit = TimeUnit.SECONDS;
+          break;
+        case 'm':
+          timeUnit = TimeUnit.MINUTES;
+          break;
+        case 'h':
+          timeUnit = TimeUnit.HOURS;
+          break;
+        default:
+          throw new IllegalArgumentException("Unexpected duration unit: " + lastCharacter);
+      }
+      return timeUnit.toMillis(numericValue);
     }
   }
 }