WIP

Author: evanchooly

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/Configuration.java

@@ -12,6 +12,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * Stores debugger configuration for a service with: - Probe definitions - filters (allow/deny) -
@@ -22,6 +23,7 @@ public class Configuration {
   /** Stores classes & packages filtering (allow or deny lists) */
   public static class FilterList {
     private final List<String> packagePrefixes;
+
     private final List<String> classes;
 
     public FilterList(List<String> packagePrefixes, List<String> classes) {
@@ -46,8 +48,12 @@ public String toString() {
     @Generated
     @Override
     public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
       FilterList allowList = (FilterList) o;
       return Objects.equals(packagePrefixes, allowList.packagePrefixes)
           && Objects.equals(classes, allowList.classes);
@@ -63,43 +69,26 @@ public int hashCode() {
   @Json(name = "id")
   private final String service;
 
-  private final Collection<MetricProbe> metricProbes;
-  private final Collection<LogProbe> logProbes;
-  private final Collection<SpanProbe> spanProbes;
-  private final Collection<TriggerProbe> triggerProbes;
-  private final Collection<SpanDecorationProbe> spanDecorationProbes;
+  private final List<ProbeDefinition> probes = new ArrayList<>();
+
   private final FilterList allowList;
+
   private final FilterList denyList;
+
   private final LogProbe.Sampling sampling;
 
-  public Configuration(String service, Collection<LogProbe> logProbes) {
-    this(service, null, logProbes, null);
+  public Configuration(String serviceName, List<ProbeDefinition> probes) {
+    this(serviceName, probes, null, null, null);
   }
 
   public Configuration(
       String serviceName,
-      Collection<MetricProbe> metricProbes,
-      Collection<LogProbe> logProbes,
-      Collection<SpanProbe> spanProbes) {
-    this(serviceName, metricProbes, logProbes, spanProbes, null, null, null, null, null);
-  }
-
-  public Configuration(
-      String serviceName,
-      Collection<MetricProbe> metricProbes,
-      Collection<LogProbe> logProbes,
-      Collection<SpanProbe> spanProbes,
-      Collection<TriggerProbe> triggerProbes,
-      Collection<SpanDecorationProbe> spanDecorationProbes,
+      List<ProbeDefinition> probes,
       FilterList allowList,
       FilterList denyList,
       LogProbe.Sampling sampling) {
     this.service = serviceName;
-    this.metricProbes = metricProbes;
-    this.logProbes = logProbes;
-    this.spanProbes = spanProbes;
-    this.triggerProbes = triggerProbes;
-    this.spanDecorationProbes = spanDecorationProbes;
+    this.probes.addAll(probes);
     this.allowList = allowList;
     this.denyList = denyList;
     this.sampling = sampling;
@@ -109,24 +98,32 @@ public String getService() {
     return service;
   }
 
+  @SuppressWarnings("unchecked")
+  public <T extends ProbeDefinition> List<T> getProbes(Class<T> type) {
+    return (List<T>)
+        probes.stream()
+            .filter(probe -> probe.getClass().isAssignableFrom(type))
+            .collect(Collectors.toList());
+  }
+
   public Collection<MetricProbe> getMetricProbes() {
-    return metricProbes;
+    return getProbes(MetricProbe.class);
   }
 
   public Collection<LogProbe> getLogProbes() {
-    return logProbes;
+    return getProbes(LogProbe.class);
   }
 
   public Collection<SpanProbe> getSpanProbes() {
-    return spanProbes;
+    return getProbes(SpanProbe.class);
   }
 
   public Collection<TriggerProbe> getTriggerProbes() {
-    return triggerProbes;
+    return getProbes(TriggerProbe.class);
   }
 
   public Collection<SpanDecorationProbe> getSpanDecorationProbes() {
-    return spanDecorationProbes;
+    return getProbes(SpanDecorationProbe.class);
   }
 
   public FilterList getAllowList() {
@@ -141,24 +138,8 @@ public LogProbe.Sampling getSampling() {
     return sampling;
   }
 
-  public Collection<ProbeDefinition> getDefinitions() {
-    Collection<ProbeDefinition> result = new ArrayList<>();
-    if (triggerProbes != null) {
-      result.addAll(triggerProbes);
-    }
-    if (metricProbes != null) {
-      result.addAll(metricProbes);
-    }
-    if (logProbes != null) {
-      result.addAll(logProbes);
-    }
-    if (spanProbes != null) {
-      result.addAll(spanProbes);
-    }
-    if (spanDecorationProbes != null) {
-      result.addAll(spanDecorationProbes);
-    }
-    return result;
+  public List<ProbeDefinition> getDefinitions() {
+    return new ArrayList<>(probes);
   }
 
   @Generated
@@ -167,10 +148,8 @@ public String toString() {
     return "DebuggerConfiguration{"
         + "service="
         + service
-        + ", metricProbes="
-        + metricProbes
-        + ", logProbes="
-        + logProbes
+        + ", probes="
+        + probes
         + ", allowList="
         + allowList
         + ", denyList="
@@ -183,12 +162,15 @@ public String toString() {
   @Generated
   @Override
   public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
     Configuration that = (Configuration) o;
     return Objects.equals(service, that.service)
-        && Objects.equals(metricProbes, that.metricProbes)
-        && Objects.equals(logProbes, that.logProbes)
+        && Objects.equals(probes, that.probes)
         && Objects.equals(allowList, that.allowList)
         && Objects.equals(denyList, that.denyList)
         && Objects.equals(sampling, that.sampling);
@@ -197,7 +179,7 @@ public boolean equals(Object o) {
   @Generated
   @Override
   public int hashCode() {
-    return Objects.hash(service, metricProbes, logProbes, allowList, denyList, sampling);
+    return Objects.hash(service, probes, allowList, denyList, sampling);
   }
 
   public static Configuration.Builder builder() {
@@ -206,13 +188,13 @@ public static Configuration.Builder builder() {
 
   public static class Builder {
     private String service = null;
-    private List<MetricProbe> metricProbes = null;
-    private List<LogProbe> logProbes = null;
-    private List<SpanProbe> spanProbes = null;
-    private List<TriggerProbe> triggerProbes = null;
-    private List<SpanDecorationProbe> spanDecorationProbes = null;
+
+    private final List<ProbeDefinition> probes = new ArrayList<>();
+
     private FilterList allowList = null;
+
     private FilterList denyList = null;
+
     private LogProbe.Sampling sampling = null;
 
     public Configuration.Builder setService(String service) {
@@ -224,53 +206,12 @@ public Configuration.Builder add(Collection<? extends ProbeDefinition> definitio
       if (definitions == null) {
         return this;
       }
-      for (ProbeDefinition definition : definitions) {
-        if (definition instanceof MetricProbe) add((MetricProbe) definition);
-        if (definition instanceof TriggerProbe) add((TriggerProbe) definition);
-        if (definition instanceof LogProbe) add((LogProbe) definition);
-        if (definition instanceof SpanProbe) add((SpanProbe) definition);
-        if (definition instanceof SpanDecorationProbe) add((SpanDecorationProbe) definition);
-      }
-      return this;
-    }
-
-    public Configuration.Builder add(MetricProbe probe) {
-      if (metricProbes == null) {
-        metricProbes = new ArrayList<>();
-      }
-      metricProbes.add(probe);
-      return this;
-    }
-
-    public Configuration.Builder add(LogProbe probe) {
-      if (logProbes == null) {
-        logProbes = new ArrayList<>();
-      }
-      logProbes.add(probe);
+      probes.addAll(definitions);
       return this;
     }
 
-    public Configuration.Builder add(SpanProbe probe) {
-      if (spanProbes == null) {
-        spanProbes = new ArrayList<>();
-      }
-      spanProbes.add(probe);
-      return this;
-    }
-
-    public Configuration.Builder add(TriggerProbe probe) {
-      if (triggerProbes == null) {
-        triggerProbes = new ArrayList<>();
-      }
-      triggerProbes.add(probe);
-      return this;
-    }
-
-    public Configuration.Builder add(SpanDecorationProbe probe) {
-      if (spanDecorationProbes == null) {
-        spanDecorationProbes = new ArrayList<>();
-      }
-      spanDecorationProbes.add(probe);
+    public Configuration.Builder add(ProbeDefinition probe) {
+      probes.add(probe);
       return this;
     }
 
@@ -282,63 +223,27 @@ public Configuration.Builder add(LogProbe.Sampling newSampling) {
     }
 
     public Configuration.Builder addMetricProbes(Collection<MetricProbe> probes) {
-      if (probes == null) {
-        return this;
-      }
-      for (MetricProbe probe : probes) {
-        add(probe);
-      }
-      return this;
+      return add(probes);
     }
 
     public Configuration.Builder addLogProbes(Collection<LogProbe> probes) {
-      if (probes == null) {
-        return this;
-      }
-      for (LogProbe probe : probes) {
-        add(probe);
-      }
-      return this;
+      return add(probes);
     }
 
     public Builder addExceptionProbes(Collection<ExceptionProbe> probes) {
-      if (probes == null) {
-        return this;
-      }
-      for (ExceptionProbe probe : probes) {
-        add(probe);
-      }
-      return this;
+      return add(probes);
     }
 
     public Configuration.Builder addSpanProbes(Collection<SpanProbe> probes) {
-      if (probes == null) {
-        return this;
-      }
-      for (SpanProbe probe : probes) {
-        add(probe);
-      }
-      return this;
+      return add(probes);
     }
 
     public Configuration.Builder addTriggerProbes(Collection<TriggerProbe> probes) {
-      if (probes == null) {
-        return this;
-      }
-      for (TriggerProbe probe : probes) {
-        add(probe);
-      }
-      return this;
+      return add(probes);
     }
 
     public Configuration.Builder addSpanDecorationProbes(Collection<SpanDecorationProbe> probes) {
-      if (probes == null) {
-        return this;
-      }
-      for (SpanDecorationProbe probe : probes) {
-        add(probe);
-      }
-      return this;
+      return add(probes);
     }
 
     public Configuration.Builder addAllowList(FilterList newAllowList) {
@@ -386,16 +291,7 @@ public Configuration.Builder add(Configuration other) {
     }
 
     public Configuration build() {
-      return new Configuration(
-          service,
-          metricProbes,
-          logProbes,
-          spanProbes,
-          triggerProbes,
-          spanDecorationProbes,
-          allowList,
-          denyList,
-          sampling);
+      return new Configuration(service, probes, allowList, denyList, sampling);
     }
   }
 }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java

@@ -74,9 +74,7 @@ private CodeOriginProbe createProbe(String fingerPrint, boolean entry, Where whe
     CodeOriginProbe probe;
     AgentSpan span = AgentTracer.activeSpan();
 
-    probe =
-        new CodeOriginProbe(
-            new ProbeId(UUID.randomUUID().toString(), 0), entry, where, maxUserFrames);
+    probe = new CodeOriginProbe(new ProbeId(UUID.randomUUID().toString(), 0), entry, where);
     addFingerprint(fingerPrint, probe);
 
     installProbe(probe);