From 93cebc9b4825db7b688f4ed52012738844c30f8e Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Wed, 23 Oct 2019 13:36:56 +0200 Subject: Fix performance test issues Issue-ID: DCAEGEN2-1783 Signed-off-by: Remigiusz Janeczek Change-Id: I367d109fc5903cd3fd6dbfeeda77d30d780a8a09 --- .../dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetrics.kt | 2 ++ .../org/onap/dcae/collectors/veshv/main/metrics/MicrometerMetrics.kt | 3 +++ tools/performance/cloud/grafana/dashboards/processing.yaml | 2 +- tools/performance/cloud/stale_outputs_checked | 0 4 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 tools/performance/cloud/stale_outputs_checked diff --git a/sources/hv-collector-kafka-consumer/src/main/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetrics.kt b/sources/hv-collector-kafka-consumer/src/main/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetrics.kt index 906fce23..64dbdf49 100644 --- a/sources/hv-collector-kafka-consumer/src/main/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetrics.kt +++ b/sources/hv-collector-kafka-consumer/src/main/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetrics.kt @@ -42,6 +42,7 @@ internal class MicrometerMetrics constructor( }.memoize() private val travelTime = Timer.builder(name(TRAVEL,TIME)) + .maximumExpectedValue(MAX_BUCKET_DURATION) .publishPercentileHistogram(true) .register(registry) @@ -65,6 +66,7 @@ internal class MicrometerMetrics constructor( private const val TRAVEL = "travel" private const val TIME = "time" private const val PREFIX = "hv-kafka-consumer" + internal val MAX_BUCKET_DURATION = Duration.ofSeconds(300L) private fun name(vararg name: String) = "$PREFIX.${name.joinToString(".")}" } } diff --git a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/metrics/MicrometerMetrics.kt b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/metrics/MicrometerMetrics.kt index c04c2c95..fa52ac2c 100644 --- a/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/metrics/MicrometerMetrics.kt +++ b/sources/hv-collector-main/src/main/kotlin/org/onap/dcae/collectors/veshv/main/metrics/MicrometerMetrics.kt @@ -55,9 +55,11 @@ class MicrometerMetrics internal constructor( private val disconnections = registry.counter(name(DISCONNECTIONS)) private val processingTime = Timer.builder(name(MESSAGES, PROCESSING, TIME)) + .maximumExpectedValue(MAX_BUCKET_DURATION) .publishPercentileHistogram(true) .register(registry) private val totalLatency = Timer.builder(name(MESSAGES, LATENCY)) + .maximumExpectedValue(MAX_BUCKET_DURATION) .publishPercentileHistogram(true) .register(registry) @@ -147,6 +149,7 @@ class MicrometerMetrics internal constructor( internal const val TIME = "time" internal const val LATENCY = "latency" internal const val PAYLOAD = "payload" + internal val MAX_BUCKET_DURATION = Duration.ofSeconds(300L) internal fun name(vararg name: String) = "$PREFIX.${name.joinToString(".")}" } } diff --git a/tools/performance/cloud/grafana/dashboards/processing.yaml b/tools/performance/cloud/grafana/dashboards/processing.yaml index 8e429009..bfa8517c 100644 --- a/tools/performance/cloud/grafana/dashboards/processing.yaml +++ b/tools/performance/cloud/grafana/dashboards/processing.yaml @@ -465,7 +465,7 @@ data: "refId": "B" }, { - "expr": "histogram_quantile(0.90, sum( rate(hvves_messages_latency_seconds_bucket[1h]) )by(le) )", + "expr": "histogram_quantile(0.95, sum( rate(hvves_messages_latency_seconds_bucket[1h]) )by(le) )", "legendFormat": "95th percentile", "refId": "C" }, diff --git a/tools/performance/cloud/stale_outputs_checked b/tools/performance/cloud/stale_outputs_checked deleted file mode 100644 index e69de29b..00000000 -- cgit 1.2.3-korg