upgrade and change DDSketch storage

richardstartin · richardstartin · commit 640bba6ba511 · 2020-11-30T10:46:59.000Z
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy
@@ -137,7 +137,7 @@ class SerializingMetricWriterTest extends DDSpecification {
       if (Platform.isJavaVersionAtLeast(8)) {
         int length = unpacker.unpackBinaryHeader()
         assert length > 0
-        unpacker.skipValue(length)
+        unpacker.readPayload(length)
       } else {
         unpacker.skipValue()
       }
diff --git a/utils/histograms/histograms.gradle b/utils/histograms/histograms.gradle
@@ -16,7 +16,7 @@ dependencies {
 
   // currently required to serialize DDSketch
   compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.14.0'
-  compile group: 'com.datadoghq', name: 'sketches-java', version: '0.4.1'
+  compile group: 'com.datadoghq', name: 'sketches-java', version: '0.5.0'
 
   testCompile project(':utils:test-utils')
 }
diff --git a/utils/histograms/src/main/java/datadog/trace/core/histogram/DDSketchHistogram.java b/utils/histograms/src/main/java/datadog/trace/core/histogram/DDSketchHistogram.java
@@ -1,20 +1,27 @@
 package datadog.trace.core.histogram;
 
 import com.datadoghq.sketch.ddsketch.DDSketch;
+import com.datadoghq.sketch.ddsketch.mapping.CubicallyInterpolatedMapping;
+import com.datadoghq.sketch.ddsketch.store.PaginatedStore;
 
 public class DDSketchHistogram implements Histogram, HistogramFactory {
 
   private final DDSketch sketch;
 
   public DDSketchHistogram() {
-    this.sketch = DDSketch.balancedCollapsingLowest(0.01, 1024);
+    this.sketch = new DDSketch(new CubicallyInterpolatedMapping(0.1), PaginatedStore::new);
   }
 
   @Override
   public void accept(long value) {
     sketch.accept(value);
   }
 
+  @Override
+  public void clear() {
+    this.sketch.clear();
+  }
+
   @Override
   public byte[] serialize() {
     return sketch.toProto().toByteArray();
diff --git a/utils/histograms/src/main/java/datadog/trace/core/histogram/Histogram.java b/utils/histograms/src/main/java/datadog/trace/core/histogram/Histogram.java
@@ -4,5 +4,7 @@ public interface Histogram {
 
   void accept(long value);
 
+  void clear();
+
   byte[] serialize();
 }
diff --git a/utils/histograms/src/main/java/datadog/trace/core/histogram/StubHistogram.java b/utils/histograms/src/main/java/datadog/trace/core/histogram/StubHistogram.java
@@ -6,6 +6,9 @@ public class StubHistogram implements Histogram, HistogramFactory {
   @Override
   public void accept(long value) {}
 
+  @Override
+  public void clear() {}
+
   @Override
   public byte[] serialize() {
     return EMPTY;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ class SerializingMetricWriterTest extends DDSpecification {`
`137`	`137`	`if (Platform.isJavaVersionAtLeast(8)) {`
`138`	`138`	`int length = unpacker.unpackBinaryHeader()`
`139`	`139`	`assert length > 0`
`140`		`- unpacker.skipValue(length)`
	`140`	`+ unpacker.readPayload(length)`
`141`	`141`	`} else {`
`142`	`142`	`unpacker.skipValue()`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ dependencies {`
`16`	`16`
`17`	`17`	`// currently required to serialize DDSketch`
`18`	`18`	`compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.14.0'`
`19`		`- compile group: 'com.datadoghq', name: 'sketches-java', version: '0.4.1'`
	`19`	`+ compile group: 'com.datadoghq', name: 'sketches-java', version: '0.5.0'`
`20`	`20`
`21`	`21`	`testCompile project(':utils:test-utils')`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,7 @@ public interface Histogram {`
`4`	`4`
`5`	`5`	`void accept(long value);`
`6`	`6`
	`7`	`+ void clear();`
	`8`	`+`
`7`	`9`	`byte[] serialize();`
`8`	`10`	`}`