Skip to content

Commit

Permalink
[HWKMETRICS-698] Manage percentiles in SumNumericBucketPointCollector (…
Browse files Browse the repository at this point in the history 
…#844)

+ integration tests
  • Loading branch information
@jotak @burmanm
jotak authored and burmanm committed Jul 24, 2017
1 parent cb7481f commit 1bb8126
Show file tree
Hide file tree
Showing 2 changed files with 152 additions and 5 deletions.
27 changes: 23 additions & 4 deletions ...rvice/src/main/java/org/hawkular/metrics/core/service/SumNumericBucketPointCollector.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 Red Hat, Inc. and/or its affiliates
* Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -16,8 +16,13 @@
*/
package org.hawkular.metrics.core.service;

import java.util.HashMap;
import java.util.Map;
import java.util.stream.Collectors;

import org.apache.commons.math3.stat.descriptive.summary.Sum;
import org.hawkular.metrics.model.NumericBucketPoint;
import org.hawkular.metrics.model.Percentile;

/**
* Accumulates numeric data points to produce a {@link NumericBucketPoint}.
Expand All @@ -32,6 +37,7 @@ final class SumNumericBucketPointCollector {
private Sum max = new Sum();
private Sum sum = new Sum();
private Sum samples = new Sum();
private Map<String, Sum> percentiles = new HashMap<>();
private Long start;
private Long end;

Expand All @@ -46,6 +52,12 @@ void increment(NumericBucketPoint bucketPoint) {
max.increment(bucketPoint.getMax());
sum.increment(bucketPoint.getSum());
samples.increment(1);
if (bucketPoint.getPercentiles() != null) {
for (Percentile p : bucketPoint.getPercentiles()) {
percentiles.computeIfAbsent(p.getOriginalQuantile(), k -> new Sum())
.increment(p.getValue());
}
}
}

start = bucketPoint.getStart();
Expand All @@ -58,13 +70,20 @@ NumericBucketPoint toBucketPoint() {
localSamples = (int) samples.getN();
}

return new NumericBucketPoint.Builder(start, end)
NumericBucketPoint.Builder builder = new NumericBucketPoint.Builder(start, end)
.setMin(min.getResult())
.setAvg(average.getResult())
.setMedian(median.getResult())
.setMax(max.getResult())
.setSum(sum.getResult())
.setSamples(localSamples)
.build();
.setSamples(localSamples);

if (!percentiles.isEmpty()) {
builder.setPercentiles(percentiles.entrySet().stream()
.map(e -> new Percentile(e.getKey(), e.getValue().getResult()))
.collect(Collectors.toList()));
}

return builder.build();
}
}
130 changes: 129 additions & 1 deletion ...ation-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/GaugesITest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,135 @@ Actual: ${response.data}
bucketPoint << [empty: true]
break
}
expectedData.push(bucketPoint);
expectedData.push(bucketPoint)
}

assertNumericBucketsEquals(expectedData, response.data ?: [])
}

@Test
void fetchStatsWithPercentiles() {
String gauge = "G1"

def response = hawkularMetrics.post(
path: "gauges/$gauge/raw",
headers: [(tenantHeaderName): tenantId],
body: [
[timestamp: 60_000 * 1.0, value: 321.8],
[timestamp: 60_000 * 7.0, value: 468.0],
[timestamp: 60_000 * 7.2, value: 472.0],
[timestamp: 60_000 * 7.5, value: 968.0],
[timestamp: 60_000 * 7.6, value: 474.0],
]
)
assertEquals(200, response.status)

response = hawkularMetrics.get(
path: "gauges/$gauge/stats",
headers: [(tenantHeaderName): tenantId],
query: [start: 60_000, end: 60_000 * 8, buckets: 7, percentiles: '50,99']
)
assertEquals(200, response.status)
assertContentEncoding(response)

def expectedData = []
(1..7).each { i ->
Map bucketPoint = [start: 60_000 * i, end: 60_000 * (i + 1)]
double val
switch (i) {
case 1:
val = 321.8
bucketPoint << [min: val, avg: val, median: val, max: val, sum: val,
percentiles: [
[value: val, originalQuantile: 50, quantile: 50.0],
[value: val, originalQuantile: 99, quantile: 99.0]
],
empty: false, samples: 1]
break
case 7:
bucketPoint << [min: 468.0, avg:595.5, median:472.0, max:968.0, sum:2382.0,
percentiles: [
[value: 472.0, originalQuantile: 50, quantile: 50.0],
[value: 474.0, originalQuantile: 99, quantile: 99.0]
],
empty: false, samples: 4]
break
default:
bucketPoint << [empty: true]
break
}
expectedData.push(bucketPoint)
}

assertNumericBucketsEquals(expectedData, response.data ?: [])
}

@Test
void fetchStackedStatsWithPercentiles() {
String g1 = "G1"
String g2 = "G2"

def response = hawkularMetrics.post(
path: "gauges/$g1/raw",
headers: [(tenantHeaderName): tenantId],
body: [
[timestamp: 60_000 * 1.0, value: 321.8],
[timestamp: 60_000 * 7.0, value: 468.0],
[timestamp: 60_000 * 7.2, value: 472.0],
[timestamp: 60_000 * 7.5, value: 968.0],
[timestamp: 60_000 * 7.6, value: 474.0],
]
)
assertEquals(200, response.status)

response = hawkularMetrics.post(
path: "gauges/$g2/raw",
headers: [(tenantHeaderName): tenantId],
body: [
[timestamp: 60_000 * 1.0, value: 100.0],
[timestamp: 60_000 * 7.0, value: 368.0],
[timestamp: 60_000 * 7.2, value: 372.0],
[timestamp: 60_000 * 7.5, value: 868.0],
[timestamp: 60_000 * 7.6, value: 374.0],
]
)
assertEquals(200, response.status)

response = hawkularMetrics.post(
path: "gauges/stats/query",
headers: [(tenantHeaderName): tenantId, "Content-Type": "application/json"],
body: [metrics: [g1, g2], start: 60_000, end: 60_000 * 8, buckets: 7, stacked: true, percentiles: '50,99']
)
assertEquals(200, response.status)
assertContentEncoding(response)

def expectedData = []
(1..7).each { i ->
Map bucketPoint = [start: 60_000 * i, end: 60_000 * (i + 1), min:0.0, avg:0.0, median:0.0, max:0.0, sum:0.0]
double val
switch (i) {
case 1:
val = 421.8
bucketPoint << [min: val, avg: val, median: val, max: val, sum: val,
percentiles: [
[value: val, originalQuantile: 50, quantile: 50.0],
[value: val, originalQuantile: 99, quantile: 99.0]
],
empty: false, samples: 2]
break
case 7:
bucketPoint << [min: 836.0, avg:1091.0, median:844.0, max:1836.0, sum:4364.0,
percentiles: [
[value: 844.0, originalQuantile: 50, quantile: 50.0],
[value: 848.0, originalQuantile: 99, quantile: 99.0]
],
empty: false, samples: 2] // should be 8??
break
default:
bucketPoint << [empty: true]
break
}
expectedData.push(bucketPoint)
}

assertNumericBucketsEquals(expectedData, response.data ?: [])
Expand Down

0 comments on commit 1bb8126

Please sign in to comment.