fix: don't send span when windows is not full

grafana · Dec 4, 2024 · 7f10ba8 · 7f10ba8
1 parent 51531f2
commit 7f10ba8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/custom/src/main/java/com/grafana/extensions/sampler/DynamicSampler.java b/custom/src/main/java/com/grafana/extensions/sampler/DynamicSampler.java
@@ -77,22 +77,25 @@ boolean shouldSample(ReadableSpan span) {
     String spanName = span.getName();
     logger.log(
         Level.INFO,
-        "spanName {0} - windowSize {1}: {2}",
-        new Object[] {span.getName(), windowSize, span.getAttributes()});
+        "spanName {0} - windowSize {1}: {2} - {3}",
+        new Object[] {
+          span.getName(), windowSize, span.getAttributes(), span.toSpanData().getStatus()
+        });
     long duration = span.getLatencyNanos();
     MovingAverage currMovingAvg =
         movingAvgs.computeIfAbsent(spanName, ma -> new MovingAverage(windowSize));
     currMovingAvg.add(duration);
-    if (currMovingAvg.getCount() >= windowSize) {
-      double avg = currMovingAvg.calcAverage();
-      logger.log(
-          Level.INFO,
-          "avg {0} * threshold {1} = {2}, duration {3}",
-          new Object[] {avg, threshold, avg * threshold, duration});
-      // discard
-      if (duration < avg * threshold) {
-        return false;
-      }
+    if (currMovingAvg.getCount() < windowSize) {
+      return false;
+    }
+    double avg = currMovingAvg.calcAverage();
+    logger.log(
+        Level.INFO,
+        "avg {0} * threshold {1} = {2}, duration {3}",
+        new Object[] {avg, threshold, avg * threshold, duration});
+    // discard
+    if (duration < avg * threshold) {
+      return false;
     }
     logger.log(
         Level.INFO,

diff --git a/custom/src/test/java/com/grafana/extensions/servertiming/ServerTimingHeaderReaderTest.java b/custom/src/test/java/com/grafana/extensions/servertiming/ServerTimingHeaderReaderTest.java
@@ -50,7 +50,6 @@ void notSampled() {
           String serverTiming = ServerTimingHeaderCustomizer.toHeaderValue(Context.current());
           serverTimingHeaderReader.consume(
               new StringHttpCommonAttributesGetter(serverTiming), "request", "response");
-          System.out.println(serverTiming);
           assertThat(DynamicSampler.getInstance().getSampledTraces()).doesNotContain(traceId);
         });
   }