Merge pull request #7662 from espoon-voltti/varda-rate-limit-change

Decrease varda api rate limit and log rate wait

Author: reynders

service/src/main/kotlin/fi/espoo/evaka/EvakaEnv.kt

@@ -249,6 +249,7 @@ data class VardaEnv(
     val startDate: LocalDate?,
     val endDate: LocalDate?,
     val localDevPort: Int?,
+    val ratePerSec: Double?,
 ) {
     companion object {
         fun fromEnvironment(env: Environment) =
@@ -261,6 +262,9 @@ data class VardaEnv(
 
                 // Port that's forwarded to Varda for local development
                 localDevPort = env.lookup("evaka.integration.varda.local_dev_port"),
+
+                // Varda has a rate limit of 2 requests per second
+                ratePerSec = env.lookup("evaka.integration.varda.rate_per_sec"),
             )
     }
 }

service/src/main/kotlin/fi/espoo/evaka/varda/VardaClient.kt

@@ -231,9 +231,11 @@ class VardaClient(
     private val jsonMapper: JsonMapper,
     vardaBaseUrl: URI,
     private val basicAuth: String,
+    ratePerSec: Double,
 ) : VardaReadClient, VardaWriteClient, VardaUnitClient {
     private var token: String? = null
     private val baseUrl = vardaBaseUrl.ensureTrailingSlash()
+    val rateLimiter: RateLimiter = RateLimiter.create(ratePerSec)
 
     override fun getOrCreateHenkilo(
         body: VardaReadClient.GetOrCreateHenkiloRequest
@@ -325,12 +327,14 @@ class VardaClient(
 
     override fun <T : VardaEntity> delete(data: T) = request<Unit>("DELETE", data.url)
 
-    val rateLimiter: RateLimiter = RateLimiter.create(2.0)
-
     private inline fun <reified R> request(method: String, url: URI, body: Any? = null): R {
-        logger.info { "requesting $method $url" + if (body == null) "" else " with body $body" }
+        val rate = rateLimiter.acquire()
+
+        logger.info {
+            "VardaClient requesting $method $url" +
+                if (body == null) "" else " with body $body and rated wait of $rate"
+        }
 
-        rateLimiter.acquire()
         val req =
             Request.Builder()
                 .method(
@@ -406,7 +410,9 @@ class VardaClient(
                 .header("Accept", "application/json")
                 .build()
 
-        rateLimiter.acquire()
+        val rate = rateLimiter.acquire()
+
+        logger.info { "VardaClient requesting get user/apikey/ with rated wait of $rate" }
 
         val newToken =
             httpClient.newCall(req).execute().use { response ->
@@ -416,6 +422,7 @@ class VardaClient(
                 val body = response.body?.string() ?: error("Varda API token response body is null")
                 jsonMapper.readTree(body).get("token").asText()
             }
+        logger.info { "Successfully fetched new Varda API token with rate wait of $rate" }
         token = newToken
         return newToken
     }

service/src/main/kotlin/fi/espoo/evaka/varda/VardaUpdateService.kt

@@ -98,7 +98,13 @@ class VardaUpdateService(
             .build()
 
     private val vardaClient =
-        VardaClient(httpClient, jsonMapper, vardaEnv.url, vardaEnv.basicAuth.value)
+        VardaClient(
+            httpClient,
+            jsonMapper,
+            vardaEnv.url,
+            vardaEnv.basicAuth.value,
+            vardaEnv.ratePerSec ?: 1.0,
+        )
 
     private val vardaEnabledRange =
         DateRange(vardaEnv.startDate ?: VARDA_START_DATE, vardaEnv.endDate)

service/src/main/resources/application-local.yaml

@@ -41,6 +41,7 @@ evaka:
       basic_auth: ""
       source_system: 31
       url: http://localhost:8888/mock-integration/varda/api
+      rate_per_sec: 1
     vtj:
       # these are used if you run pis-service in "vtj-dev" profile (against Test VTJ).
       # get-deployment-local.sh should fill the trustStore location, but you need to fill vtj user/pass with details from AWS Parameter Store