From c803661cc9cbed8d39e4cae0f99d24ebbbd064ba Mon Sep 17 00:00:00 2001
From: Alexander Ryabokon <mr.alexander.ryabokon@gmail.com>
Date: Wed, 3 Apr 2024 18:14:34 +0300
Subject: [PATCH] Update logging (#6)

---
 server/dev/application-dev.yml                             | 2 +-
 .../releasemanagementservice/controller/BuildController.kt | 4 ++--
 .../legacy/LegacyRelengBuildService.kt                     | 7 ++++---
 .../releasemanagementservice/legacy/LegacyRelengConfig.kt  | 6 ++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/server/dev/application-dev.yml b/server/dev/application-dev.yml
index 3ec5d4a..ff22ec8 100644
--- a/server/dev/application-dev.yml
+++ b/server/dev/application-dev.yml
@@ -9,4 +9,4 @@ management:
 
 logging:
   level:
-    org.octopusden.octopus.releasemanagementservice.controller: trace
+    org.octopusden.octopus.releasemanagementservice.*: trace
diff --git a/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/controller/BuildController.kt b/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/controller/BuildController.kt
index 383e73b..9f4da87 100644
--- a/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/controller/BuildController.kt
+++ b/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/controller/BuildController.kt
@@ -18,13 +18,13 @@ class BuildController(private val buildService: BuildService) {
 
     @GetMapping("component/{component}", produces = [MediaType.APPLICATION_JSON_VALUE])
     fun getComponentBuilds(@PathVariable("component") component: String, filter: BuildFilterDTO): Collection<ShortBuildDTO> {
-        log.info("Get all Builds of '{}'", component)
+        log.info("Get builds of '{}', filter: '{}'", component, filter)
         return buildService.getBuilds(component, filter)
     }
 
     @GetMapping("component/{component}/version/{version}", produces = [MediaType.APPLICATION_JSON_VALUE])
     fun getBuild(@PathVariable("component") component: String, @PathVariable("version") version: String): BuildDTO {
-        log.info("Get Build '{}:{}'", component, version)
+        log.info("Get build '{}:{}'", component, version)
         return buildService.getBuild(component, version)
     }
 
diff --git a/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengBuildService.kt b/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengBuildService.kt
index 5b4d4d1..dfeb3c6 100644
--- a/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengBuildService.kt
+++ b/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengBuildService.kt
@@ -16,15 +16,16 @@ class LegacyRelengBuildService(private val client: LegacyRelengClient) : BuildSe
     ReleaseManagementServiceException>(404 to { e: LegacyRelengClientException -> NotFoundException(e.message!!) })
 
     override fun getBuilds(component: String, filter: BuildFilterDTO): Collection<ShortBuildDTO> {
-        return execute { client.getBuilds(component, filter) }
+        return execute("getBuilds($component, $filter)") { client.getBuilds(component, filter) }
     }
 
     override fun getBuild(component: String, version: String): BuildDTO {
-        return execute { client.getBuild(component, version) }
+        return execute("getBuild($component, $version)") { client.getBuild(component, version) }
     }
 
-    private fun <T : Any> execute(func: () -> T): T {
+    private fun <T : Any> execute(operationName: String, func: () -> T): T {
         return try {
+            log.trace("Execute: '{}'", operationName)
             func()
         } catch (e: LegacyRelengClientException) {
             log.error(e.message)
diff --git a/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengConfig.kt b/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengConfig.kt
index 6d7f36e..0f651a6 100644
--- a/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengConfig.kt
+++ b/server/src/main/kotlin/org/octopusden/octopus/releasemanagementservice/legacy/LegacyRelengConfig.kt
@@ -11,6 +11,7 @@ import feign.slf4j.Slf4jLogger
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import java.util.concurrent.TimeUnit
+import org.slf4j.LoggerFactory
 
 
 @Configuration
@@ -26,4 +27,9 @@ class LegacyRelengConfig(private val relengProperties: LegacyRelengProperties, p
         .logger(Slf4jLogger(LegacyRelengClient::class.java))
         .logLevel(Logger.Level.BASIC)
         .target(LegacyRelengClient::class.java, relengProperties.url)
+        .also { log.info("LegacRelengClient initiated, url: '{}'", relengProperties.url) }
+
+    companion object {
+        private val log = LoggerFactory.getLogger(LegacyRelengConfig::class.java)
+    }
 }