diff options
Diffstat (limited to 'sources/hv-collector-kafka-consumer')
2 files changed, 7 insertions, 8 deletions
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 da6a4676..906fce23 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 @@ -36,7 +36,7 @@ internal class MicrometerMetrics constructor( ) : Metrics { private val currentOffsetByTopicPartition = { topicPartition: String -> - registry.gauge(name(OFFSET, PARTITION, topicPartition.toLowerCase()), + registry.gauge(name(OFFSET, PARTITION), listOf(Tag.of(PARTITION, topicPartition)), AtomicLong(0)) }.memoize<String, AtomicLong>() diff --git a/sources/hv-collector-kafka-consumer/src/test/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetricsTest.kt b/sources/hv-collector-kafka-consumer/src/test/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetricsTest.kt index cfe67df2..fec7e54e 100644 --- a/sources/hv-collector-kafka-consumer/src/test/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetricsTest.kt +++ b/sources/hv-collector-kafka-consumer/src/test/kotlin/org/onap/dcae/collectors/veshv/kafkaconsumer/metrics/MicrometerMetricsTest.kt @@ -69,33 +69,32 @@ object MicrometerMetricsTest : Spek({ } describe("Gauges") { - val gaugeName1 = "$PREFIX.offset.partition.sample_topic-0" - val gaugeName2 = "$PREFIX.offset.partition.sample_topic-1" + val gaugeName = "$PREFIX.offset.partition" val offset1 = 966L val offset2 = 967L val topicPartition1 = TopicPartition("sample_topic", 0) val topicPartition2 = TopicPartition("sample_topic", 1) on("notifyOffsetChanged") { - it("should update $gaugeName1") { + it("should update $gaugeName") { cut.notifyOffsetChanged(offset1, topicPartition1) - registry.verifyGauge(gaugeName1) { + registry.verifyGauge(name = gaugeName, tagValue = topicPartition1.toString()) { assertThat(it.value()).isCloseTo(offset1.toDouble(), doublePrecision) } } } on("two partition update") { - it("should update $gaugeName1") { + it("should update $gaugeName") { cut.notifyOffsetChanged(offset1, topicPartition1) cut.notifyOffsetChanged(offset2, topicPartition2) - registry.verifyGauge(gaugeName1) { + registry.verifyGauge(name = gaugeName, tagValue = topicPartition1.toString()) { assertThat(it.value()).isCloseTo(offset1.toDouble(), doublePrecision) } - registry.verifyGauge(gaugeName2) { + registry.verifyGauge(name = gaugeName, tagValue = topicPartition2.toString()) { assertThat(it.value()).isCloseTo(offset2.toDouble(), doublePrecision) } } |