From 8b8c37c296e55644063e0332fd455437168e78da Mon Sep 17 00:00:00 2001 From: Piotr Jaszczyk Date: Fri, 7 Dec 2018 14:41:39 +0100 Subject: Add log diagnostic context As it's not trivial to use MDC directly from logging framework in reactive application, we need to do some work manually. The approach proposed is an explicit MDC handling, which means that context is kept as an object created after establishing client connection. Next, new instance of HvVesCollector (and its dependencies) is created. Every object is propagated with ClientContext so it can use it when calling logger methods. In the future ClientContext might be used to support other use-cases, ie. per-topic access control. As a by-product I had to refactor our Logger wrapper, too. It already had too many functions and after adding MDC number would be doubled. Change-Id: I9c5d3f5e1d1be1db66d28d292eb0e1c38d8d0ffe Issue-ID: DCAEGEN2-671 Signed-off-by: Piotr Jaszczyk --- .../kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sources/hv-collector-test-utils/src') diff --git a/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt index d017b31b..6ca28a56 100644 --- a/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt +++ b/sources/hv-collector-test-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/tests/utils/assertions.kt @@ -31,7 +31,7 @@ import java.time.Duration private val logger = Logger("org.onap.dcae.collectors.veshv.tests.utils") object Assertions : org.assertj.core.api.Assertions() { - fun assertThat(actual: Either) = EitherAssert(actual) + fun assertThat(actual: Either) = EitherAssert(actual) } @@ -42,7 +42,7 @@ fun waitUntilSucceeds(retries: Int, sleepTime: Duration, action: () -> Unit) { while (tryNum <= retries) { tryNum++ try { - logger.debug("Try number $tryNum") + logger.debug { "Try number $tryNum" } action() break } catch (ex: Throwable) { -- cgit 1.2.3-korg