From 136e3e19a1821a694d799e7c8d670407720c9e66 Mon Sep 17 00:00:00 2001
From: Julien Fontaine <julien.fontaine@bell.ca>
Date: Tue, 26 Jan 2021 14:47:32 -0500
Subject: Improve logging for CDS Kafka workers

Modified CDS Kafka consumersand producers logs to provide more details about the topic of the consumer record being consumed or published.
Refactored the publish callback to make it more readable.
Refactored audit service log error messages.

Issue-ID: CCSDK-3154
Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca>
Change-Id: I7b42930e926bc15ce175974a78d3bfe2f219b0a8
---
 .../api/BlueprintProcessingKafkaConsumer.kt        | 10 ++++++++-
 .../selfservice/api/KafkaPublishAuditService.kt    | 24 ++++++++--------------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'ms/blueprintsprocessor/modules/inbounds')

diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumer.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumer.kt
index 440490a0a..0ab38c6bd 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumer.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/BlueprintProcessingKafkaConsumer.kt
@@ -1,5 +1,6 @@
 /*
  *  Copyright © 2019 IBM.
+ *  Modifications Copyright © 2021 Bell Canada.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -104,8 +105,15 @@ open class BlueprintProcessingKafkaConsumer(
                             ph.register()
                             val key = message.key() ?: UUID.randomUUID().toString()
                             val value = String(message.value(), Charset.defaultCharset())
-                            log.trace("Consumed Message : key($key) value($value)")
                             val executionServiceInput = value.jsonAsType<ExecutionServiceInput>()
+                            log.info(
+                                "Consumed Message : topic(${message.topic()}) " +
+                                    "partition(${message.partition()}) " +
+                                    "leaderEpoch(${message.leaderEpoch().get()}) " +
+                                    "offset(${message.offset()}) " +
+                                    "key(${message.key()}) " +
+                                    "CBA(${executionServiceInput.actionIdentifiers.blueprintName}/${executionServiceInput.actionIdentifiers.blueprintVersion}/${executionServiceInput.actionIdentifiers.actionName})"
+                            )
                             val executionServiceOutput = executionServiceHandler.doProcess(executionServiceInput)
                             blueprintMessageProducerService.sendMessage(key, executionServiceOutput)
                         } catch (e: Exception) {
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
index 5e7f63cb5..8be43cc94 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/KafkaPublishAuditService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Bell Canada
+ * Copyright © 2021 Bell Canada
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,11 +88,8 @@ class KafkaPublishAuditService(
         try {
             this.inputInstance = this.getInputInstance(INPUT_SELECTOR)
             this.inputInstance!!.sendMessage(key, secureExecutionServiceInput)
-        } catch (e: Exception) {
-            var errMsg =
-                if (e.message != null) "ERROR : ${e.message}"
-                else "ERROR : Failed to send execution request to Kafka."
-            log.error(errMsg)
+        } catch (ex: Exception) {
+            log.error("Failed to publish execution request to Kafka.", ex)
         }
     }
 
@@ -109,11 +106,8 @@ class KafkaPublishAuditService(
         try {
             this.outputInstance = this.getOutputInstance(OUTPUT_SELECTOR)
             this.outputInstance!!.sendMessage(key, executionServiceOutput)
-        } catch (e: Exception) {
-            var errMsg =
-                if (e.message != null) "ERROR : $e"
-                else "ERROR : Failed to send execution request to Kafka."
-            log.error(errMsg)
+        } catch (ex: Exception) {
+            log.error("Failed to publish execution response to Kafka.", ex)
         }
     }
 
@@ -206,12 +200,12 @@ class KafkaPublishAuditService(
                     }
                 }
             }
-        } catch (e: Exception) {
-            val errMsg = "ERROR : Couldn't hide sensitive data in the execution request."
-            log.error(errMsg, e)
+        } catch (ex: Exception) {
+            val errMsg = "Couldn't hide sensitive data in the execution request."
+            log.error(errMsg, ex)
             clonedExecutionServiceInput.payload.replace(
                 "$workflowName-request",
-                "$errMsg $e".asJsonPrimitive()
+                "$errMsg $ex".asJsonPrimitive()
             )
         }
         return clonedExecutionServiceInput
-- 
cgit 1.2.3-korg