From 2e334500fba9893f1f2d2ab3b9528c638d993a03 Mon Sep 17 00:00:00 2001 From: kjaniak Date: Mon, 7 Oct 2019 11:46:48 +0200 Subject: Add graphs for performance monitoring Performance tests need graphs representing: total, message queue on HV-VES, offset per kafka topic partition, incoming data rate. Added deletion of producers at test end. Gauges for offsets turned to Range vector (distinguishable based on tag). Since Producer is to fast it was reconfigured to send messages with 1 ms interval. Change-Id: I09fc1edbcd824294d0bb89acc2ea2306a6df00ca Issue-ID: DCAEGEN2-1807 Signed-off-by: kjaniak --- .../org/onap/dcae/collectors/veshv/tests/utils/metrics.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'sources/hv-collector-test-utils') diff --git a/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/metrics.kt b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/metrics.kt index 1aefdb34..52f9ae87 100644 --- a/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/metrics.kt +++ b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/metrics.kt @@ -32,6 +32,9 @@ import org.assertj.core.api.Assertions fun PrometheusMeterRegistry.verifyGauge(name: String, verifier: (Gauge) -> T) = verifyMeter(findMeter(name), RequiredSearch::gauge, verifier) +fun PrometheusMeterRegistry.verifyGauge(name: String, tagKey: String = "partition", tagValue: String, verifier: (Gauge) -> T) = + verifyMeter(findMeter(name, tagKey, tagValue), RequiredSearch::gauge, verifier) + fun PrometheusMeterRegistry.verifyTimer(name: String, verifier: (Timer) -> T) = verifyMeter(findMeter(name), RequiredSearch::timer, verifier) @@ -43,13 +46,16 @@ fun PrometheusMeterRegistry.verifyCounter(name: String, tags: Tags, verifier private fun PrometheusMeterRegistry.findMeter(meterName: String) = RequiredSearch.`in`(this).name(meterName) +private fun PrometheusMeterRegistry.findMeter(meterName: String, tagKey: String, tagValue: String) = + RequiredSearch.`in`(this).tag(tagKey, tagValue).name(meterName) + private fun verifyCounter(search: RequiredSearch, verifier: (Counter) -> T) = verifyMeter(search, RequiredSearch::counter, verifier) private inline fun verifyMeter(search: RequiredSearch, - map: (RequiredSearch) -> M, - verifier: (M) -> T) = + map: (RequiredSearch) -> M, + verifier: (M) -> T) = Try { map(search) }.fold( { ex -> Assertions.assertThat(ex).doesNotThrowAnyException() }, verifier - ) \ No newline at end of file + ) -- cgit 1.2.3-korg