Make http timeouts configurable

Author: blootsvoets

src/main/java/org/radarbase/output/config/AzureConfig.kt

@@ -1,11 +1,13 @@
 package org.radarbase.output.config
 
 import com.azure.core.credential.BasicAuthenticationCredential
+import com.azure.core.util.HttpClientOptions
 import com.azure.storage.blob.BlobServiceClient
 import com.azure.storage.blob.BlobServiceClientBuilder
 import com.azure.storage.common.StorageSharedKeyCredential
 import org.radarbase.output.config.RestructureConfig.Companion.copyEnv
 import org.slf4j.LoggerFactory
+import java.time.Duration
 
 data class AzureConfig(
     /** URL to reach object store at. */
@@ -24,7 +26,15 @@ data class AzureConfig(
     val accountKey: String?,
     /** Azure SAS token for a configured service. */
     val sasToken: String?,
-) {
+    /** HTTP connect timeout. */
+    val connectTimeout: Long? = null,
+    /** HTTP response timeout. */
+    val responseTimeout: Long? = null,
+    /** HTTP write timeout. */
+    val writeTimeout: Long? = null,
+    /** HTTP read timeout. */
+    val readTimeout: Long? = null,
+    ) {
     fun createAzureClient(): BlobServiceClient = BlobServiceClientBuilder().apply {
         endpoint(endpoint)
         when {
@@ -35,6 +45,12 @@ data class AzureConfig(
             !sasToken.isNullOrEmpty() -> sasToken(sasToken)
             else -> logger.warn("No Azure credentials supplied. Assuming a public blob storage.")
         }
+        clientOptions(HttpClientOptions().apply {
+            connectTimeout = this@AzureConfig.connectTimeout.toDurationOrNull()
+            responseTimeout = this@AzureConfig.responseTimeout.toDurationOrNull()
+            writeTimeout = this@AzureConfig.writeTimeout.toDurationOrNull()
+            readTimeout = this@AzureConfig.readTimeout.toDurationOrNull()
+        })
     }.buildClient()
 
     fun withEnv(prefix: String): AzureConfig = this
@@ -46,5 +62,8 @@ data class AzureConfig(
 
     companion object {
         private val logger = LoggerFactory.getLogger(AzureConfig::class.java)
+        private fun Long?.toDurationOrNull(): Duration? = this
+            ?.takeIf { it > 0 }
+            ?.let { Duration.ofSeconds(it) }
     }
 }

src/main/java/org/radarbase/output/config/S3Config.kt

@@ -2,7 +2,9 @@ package org.radarbase.output.config
 
 import io.minio.MinioClient
 import io.minio.credentials.IamAwsProvider
+import io.minio.http.HttpUtils
 import org.radarbase.output.config.RestructureConfig.Companion.copyEnv
+import java.util.concurrent.TimeUnit
 
 data class S3Config(
     /** URL to reach object store at. */
@@ -15,6 +17,12 @@ data class S3Config(
     val bucket: String,
     /** If no endOffset is in the filename, read it from object tags. */
     val endOffsetFromTags: Boolean = false,
+    /** HTTP connect timeout. */
+    val connectTimeout: Long? = null,
+    /** HTTP write timeout. */
+    val writeTimeout: Long? = null,
+    /** HTTP read timeout. */
+    val readTimeout: Long? = null,
 ) {
     fun createS3Client(): MinioClient = MinioClient.Builder().apply {
         endpoint(endpoint)
@@ -23,11 +31,24 @@ data class S3Config(
         } else {
             credentials(accessToken, secretKey)
         }
+        httpClient(HttpUtils.newDefaultHttpClient(
+            connectTimeout.toMillisOrDefault(),
+            writeTimeout.toMillisOrDefault(),
+            readTimeout.toMillisOrDefault(),
+        ))
     }.build()
 
     fun withEnv(prefix: String): S3Config = this
         .copyEnv("${prefix}S3_ACCESS_TOKEN") { copy(accessToken = it) }
         .copyEnv("${prefix}S3_SECRET_KEY") { copy(secretKey = it) }
         .copyEnv("${prefix}S3_BUCKET") { copy(bucket = it) }
         .copyEnv("${prefix}S3_ENDPOINT") { copy(endpoint = it) }
+
+    companion object {
+        private val DEFAULT_CONNECTION_TIMEOUT: Long = TimeUnit.MINUTES.toMillis(1)
+        private fun Long?.toMillisOrDefault(): Long = this
+            ?.takeIf { it > 0 }
+            ?.let { TimeUnit.SECONDS.toMillis(it) }
+            ?: DEFAULT_CONNECTION_TIMEOUT
+    }
 }