diff options
| author | Leandro Alves <ldalves@gmail.com> | 2022-09-15 09:37:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-15 09:37:14 +0200 |
| commit | 91e38e287c379da711f9921ec8ca92ed5e6c8a91 (patch) | |
| tree | f7a58f43ed55e2fe6d634d6d0672a2de1bac635c | |
| parent | 8794e211760b38f73b8e65ee63379ead84bf175a (diff) | |
| parent | e384cfc0ab08fae8cc26f85943418ca9f5b1c161 (diff) | |
Merge pull request #24061 from vespa-engine/olaa/only-include-last
Omit max and average in PrometheusHelper
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java | 3 | ||||
| -rw-r--r-- | container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java index 43aaba555ab..adb5f389d54 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java @@ -52,6 +52,8 @@ public class PrometheusHelper { var value = sanitizeDouble(gaugeMetric.getLast()); outputStream.write(getMetricLines(sanitizedMetricName, dimensions, value, timestamp)); + /* + For now - only push "last" value - to limit metric volume sanitizedMetricName = getSanitizedMetricName(metricName, "average"); value = sanitizeDouble(gaugeMetric.getAverage()); outputStream.write(getMetricLines(sanitizedMetricName, dimensions, value, timestamp)); @@ -59,6 +61,7 @@ public class PrometheusHelper { sanitizedMetricName = getSanitizedMetricName(metricName, "max"); value = sanitizeDouble(gaugeMetric.getMax()); outputStream.write(getMetricLines(sanitizedMetricName, dimensions, value, timestamp)); + */ } private static byte[] getMetricLines(String metricName, String dimensions, Number value, long timestamp) { diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java index 0072b32ad7d..75344f10c07 100644 --- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java +++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricsPacketsHandlerTest.java @@ -172,12 +172,6 @@ public class MetricsPacketsHandlerTest extends StateHandlerTestBase { # HELP gauge_metric_last\s # TYPE gauge_metric_last untyped gauge_metric_last{dim1="value1",vespa_service="state-handler-test-base",} 0.2 0 - # HELP gauge_metric_average\s - # TYPE gauge_metric_average untyped - gauge_metric_average{dim1="value1",vespa_service="state-handler-test-base",} 0.2 0 - # HELP gauge_metric_max\s - # TYPE gauge_metric_max untyped - gauge_metric_max{dim1="value1",vespa_service="state-handler-test-base",} 0.2 0 # HELP counter_metric_count\s # TYPE counter_metric_count untyped counter_metric_count{dim1="value1",vespa_service="state-handler-test-base",} 5 0 |