Http Log Level

Signed-off-by: akostiucenko <[email protected]>

Author: arndey

modules/admin-client/src/main/kotlin/jp/co/soramitsu/iroha2/AdminIroha2AsyncClient.kt

@@ -1,5 +1,6 @@
 package jp.co.soramitsu.iroha2
 
+import io.ktor.client.plugins.logging.LogLevel
 import jp.co.soramitsu.iroha2.model.IrohaUrls
 import kotlinx.coroutines.future.future
 
@@ -9,9 +10,9 @@ import kotlinx.coroutines.future.future
 @Suppress("unused")
 class AdminIroha2AsyncClient @JvmOverloads constructor(
     urls: List<IrohaUrls>,
-    log: Boolean = false,
+    httpLogLevel: LogLevel = LogLevel.NONE,
     credentials: String? = null,
-) : AdminIroha2Client(urls, log, credentials) {
+) : AdminIroha2Client(urls, httpLogLevel, credentials) {
 
     /**
      * Send health check request

modules/admin-client/src/main/kotlin/jp/co/soramitsu/iroha2/AdminIroha2Client.kt

@@ -1,6 +1,7 @@
 package jp.co.soramitsu.iroha2
 
 import io.ktor.client.call.body
+import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.request.get
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.HttpResponse
@@ -18,33 +19,33 @@ import java.net.URL
 @Suppress("unused")
 open class AdminIroha2Client(
     urls: List<IrohaUrls>,
-    log: Boolean = false,
+    httpLogLevel: LogLevel = LogLevel.NONE,
     credentials: String? = null,
     private val balancingHealthCheck: Boolean = true,
-) : Iroha2Client(urls, log, credentials) {
+) : Iroha2Client(urls, httpLogLevel, credentials) {
 
     constructor(
         url: IrohaUrls,
-        log: Boolean = false,
+        httpLogLevel: LogLevel = LogLevel.NONE,
         credentials: String? = null,
         balancingHealthCheck: Boolean = true,
-    ) : this(mutableListOf(url), log, credentials, balancingHealthCheck)
+    ) : this(mutableListOf(url), httpLogLevel, credentials, balancingHealthCheck)
 
     constructor(
         apiUrl: URL,
         peerUrl: URL,
-        log: Boolean = false,
+        httpLogLevel: LogLevel = LogLevel.NONE,
         credentials: String? = null,
         balancingHealthCheck: Boolean = true,
-    ) : this(IrohaUrls(apiUrl, peerUrl), log, credentials, balancingHealthCheck)
+    ) : this(IrohaUrls(apiUrl, peerUrl), httpLogLevel, credentials, balancingHealthCheck)
 
     constructor(
         apiUrl: String,
         peerUrl: String,
-        log: Boolean = false,
+        httpLogLevel: LogLevel = LogLevel.NONE,
         credentials: String? = null,
         balancingHealthCheck: Boolean = true,
-    ) : this(URL(apiUrl), URL(peerUrl), log, credentials, balancingHealthCheck)
+    ) : this(URL(apiUrl), URL(peerUrl), httpLogLevel, credentials, balancingHealthCheck)
 
     /**
      * Send metrics request

modules/client/src/main/kotlin/jp/co/soramitsu/iroha2/client/Iroha2AsyncClient.kt

@@ -1,5 +1,6 @@
 package jp.co.soramitsu.iroha2.client
 
+import io.ktor.client.plugins.logging.LogLevel
 import jp.co.soramitsu.iroha2.generated.SignedTransaction
 import jp.co.soramitsu.iroha2.model.IrohaUrls
 import jp.co.soramitsu.iroha2.query.QueryAndExtractor
@@ -14,11 +15,11 @@ import java.util.concurrent.CompletableFuture
 @Suppress("unused")
 class Iroha2AsyncClient @JvmOverloads constructor(
     urls: List<IrohaUrls>,
-    log: Boolean = false,
+    httpLogLevel: LogLevel = LogLevel.NONE,
     credentials: String? = null,
     eventReadTimeoutInMills: Long = 250,
     eventReadMaxAttempts: Int = 10,
-) : Iroha2Client(urls, log, credentials, eventReadTimeoutInMills, eventReadMaxAttempts) {
+) : Iroha2Client(urls, httpLogLevel, credentials, eventReadTimeoutInMills, eventReadMaxAttempts) {
 
     /**
      * Send a request to Iroha2 and extract payload.

modules/client/src/main/kotlin/jp/co/soramitsu/iroha2/client/Iroha2Client.kt

@@ -17,6 +17,7 @@ import io.ktor.client.plugins.auth.Auth
 import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
 import io.ktor.client.plugins.auth.providers.basic
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.plugins.websocket.WebSockets
 import io.ktor.client.plugins.websocket.webSocket
@@ -81,7 +82,7 @@ import kotlin.coroutines.CoroutineContext
 @Suppress("unused")
 open class Iroha2Client(
     open val urls: List<IrohaUrls>,
-    open val log: Boolean = false,
+    open val httpLogLevel: LogLevel = LogLevel.NONE,
     open val credentials: String? = null,
     open val eventReadTimeoutInMills: Long = 250,
     open val eventReadMaxAttempts: Int = 10,
@@ -90,22 +91,22 @@ open class Iroha2Client(
 
     constructor(
         url: IrohaUrls,
-        log: Boolean = false,
+        httpLogLevel: LogLevel = LogLevel.NONE,
         credentials: String? = null,
         eventReadTimeoutInMills: Long = 250,
         eventReadMaxAttempts: Int = 10,
-    ) : this(mutableListOf(url), log, credentials, eventReadTimeoutInMills, eventReadMaxAttempts)
+    ) : this(mutableListOf(url), httpLogLevel, credentials, eventReadTimeoutInMills, eventReadMaxAttempts)
 
     constructor(
         apiUrl: URL,
         peerUrl: URL,
-        log: Boolean = false,
+        httpLogLevel: LogLevel = LogLevel.NONE,
         credentials: String? = null,
         eventReadTimeoutInMills: Long = 250,
         eventReadMaxAttempts: Int = 10,
     ) : this(
         IrohaUrls(apiUrl, peerUrl),
-        log,
+        httpLogLevel,
         credentials,
         eventReadTimeoutInMills,
         eventReadMaxAttempts,
@@ -114,14 +115,14 @@ open class Iroha2Client(
     constructor(
         apiUrl: String,
         peerUrl: String,
-        log: Boolean = true,
+        httpLogLevel: LogLevel = LogLevel.NONE,
         credentials: String? = null,
         eventReadTimeoutInMills: Long = 250,
         eventReadMaxAttempts: Int = 10,
     ) : this(
         URL(apiUrl),
         URL(peerUrl),
-        log,
+        httpLogLevel,
         credentials,
         eventReadTimeoutInMills,
         eventReadMaxAttempts,
@@ -145,8 +146,8 @@ open class Iroha2Client(
     open val client by lazy {
         HttpClient(CIO) {
             expectSuccess = true
-            if (log) {
-                install(Logging)
+            install(Logging) {
+                level = httpLogLevel
             }
             install(WebSockets)
             install(ContentNegotiation) {

modules/client/src/test/kotlin/jp/co/soramitsu/iroha2/ExampleTest.kt

@@ -26,7 +26,7 @@ class ExampleTest {
             this.genesis = DefaultGenesis()
         }.also { it.start() }
 
-        val client = Iroha2Client(container.getApiUrl(), container.getP2pUrl(), true)
+        val client = Iroha2Client(container.getApiUrl(), container.getP2pUrl())
 
         val domainId = "new_domain_name".asDomainId()
         client.sendTransaction {

modules/client/src/test/kotlin/jp/co/soramitsu/iroha2/GenesisTest.kt

@@ -35,7 +35,7 @@ class GenesisTest : IrohaTest<Iroha2Client>() {
             this.genesisPath = path
         }.also { it.start() }
 
-        val client = Iroha2Client(container.getApiUrl(), container.getP2pUrl(), true)
+        val client = Iroha2Client(container.getApiUrl(), container.getP2pUrl())
         client.checkAliceAndBobExists()
     }
 

modules/test-tools/src/main/kotlin/jp/co/soramitsu/iroha2/testengine/IrohaRunnerExtension.kt

@@ -111,31 +111,27 @@ class IrohaRunnerExtension : InvocationInterceptor, BeforeEachCallback {
         setPropertyValue(properties, testInstance) {
             Iroha2Client(
                 containers.map { IrohaUrls(it.getApiUrl(), it.getP2pUrl()) }.toMutableList(),
-                true,
             ).also { utilizedResources.add(it) }
         }
 
         // inject `AdminIroha2Client` if it is declared in test class
         setPropertyValue(properties, testInstance) {
             AdminIroha2Client(
                 containers.map { IrohaUrls(it.getApiUrl(), it.getP2pUrl()) }.toMutableList(),
-                true,
             ).also { utilizedResources.add(it) }
         }
 
         // inject `Iroha2AsyncClient` if it is declared in test class
         setPropertyValue(properties, testInstance) {
             Iroha2AsyncClient(
                 containers.map { IrohaUrls(it.getApiUrl(), it.getP2pUrl()) }.toMutableList(),
-                true,
             ).also { utilizedResources.add(it) }
         }
 
         // inject `AdminIroha2AsyncClient` if it is declared in test class
         setPropertyValue(properties, testInstance) {
             AdminIroha2AsyncClient(
                 containers.map { IrohaUrls(it.getApiUrl(), it.getP2pUrl()) }.toMutableList(),
-                true,
             ).also { utilizedResources.add(it) }
         }