Create internal package, delete call count logging

Author: gabrielfeo

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/Api.kt

@@ -4,18 +4,22 @@ package com.gabrielfeo.gradle.enterprise.api
 
 import com.gabrielfeo.gradle.enterprise.api.auth.HttpBearerAuth
 import com.gabrielfeo.gradle.enterprise.api.infrastructure.Serializer
+import com.gabrielfeo.gradle.enterprise.api.internal.*
+import com.gabrielfeo.gradle.enterprise.api.internal.caching.CacheEnforcingInterceptor
+import com.gabrielfeo.gradle.enterprise.api.internal.caching.CacheHitLoggingInterceptor
+import com.gabrielfeo.gradle.enterprise.api.internal.caching.cache
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import retrofit2.create
-import kotlin.time.Duration.Companion.seconds
 
 var baseUrl: () -> String = { requireBaseUrl() }
 var accessToken: () -> String = { requireToken() }
 
 var maxConcurrentRequests = 30
 var maxCacheSize = 500_000_000L
+var debugLoggingEnabled = System.getenv("GRADLE_ENTERPRISE_API_DEBUG_LOGGING").toBoolean()
 
 val cacheablePaths: MutableList<Regex> = mutableListOf(
     """.*/api/builds/[\d\w]+/(?:gradle|maven)-attributes""".toRegex(),
@@ -31,7 +35,6 @@ val okHttpClient: OkHttpClient by lazy {
         .apply {
             dispatcher.maxRequests = maxConcurrentRequests
             dispatcher.maxRequestsPerHost = maxConcurrentRequests
-            startRequestCountLogging(this, period = 2.seconds)
         }
 }
 

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/DebugLogging.kt

@@ -1,4 +1,4 @@
-package com.gabrielfeo.gradle.enterprise.api
+package com.gabrielfeo.gradle.enterprise.api.internal
 
 private const val DEFAULT_KEY_NAME = "gradle-enterprise-api-token"
 private const val DEFAULT_VAR_NAME = "GRADLE_ENTERPRISE_API_TOKEN"

…/gradle/enterprise/api/Authentication.kt …nterprise/api/internal/Authentication.ktsrc/main/kotlin/com/gabrielfeo/gradle/enterprise/api/Authentication.kt renamed to src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/Authentication.kt src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/Authentication.kt renamed to src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/Authentication.kt

@@ -1,4 +1,4 @@
-package com.gabrielfeo.gradle.enterprise.api
+package com.gabrielfeo.gradle.enterprise.api.internal
 
 private const val DEFAULT_VAR_NAME = "GRADLE_ENTERPRISE_URL"
 

…rielfeo/gradle/enterprise/api/BaseUrl.kt …radle/enterprise/api/internal/BaseUrl.ktsrc/main/kotlin/com/gabrielfeo/gradle/enterprise/api/BaseUrl.kt renamed to src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/BaseUrl.kt src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/BaseUrl.kt renamed to src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/BaseUrl.kt

@@ -0,0 +1,16 @@
+package com.gabrielfeo.gradle.enterprise.api.internal.caching
+
+import com.gabrielfeo.gradle.enterprise.api.baseUrl
+import com.gabrielfeo.gradle.enterprise.api.maxCacheSize
+import okhttp3.Cache
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import java.io.File
+
+internal val cache: Cache = run {
+    val host = baseUrl().toHttpUrl().host
+    val tempDir = System.getProperty("java.io.tmpdir")
+    Cache(
+        directory = File(tempDir, "gradle-enterprise-api-cache-$host"),
+        maxSize = maxCacheSize,
+    )
+}

src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/caching/Cache.kt

@@ -1,19 +1,10 @@
-package com.gabrielfeo.gradle.enterprise.api
+package com.gabrielfeo.gradle.enterprise.api.internal.caching
 
-import okhttp3.*
-import okhttp3.HttpUrl.Companion.toHttpUrl
-import java.io.File
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
 import kotlin.time.Duration.Companion.days
 
-internal val cache: Cache = run {
-    val host = baseUrl().toHttpUrl().host
-    val tempDir = System.getProperty("java.io.tmpdir")
-    Cache(
-        directory = File(tempDir, "gradle-enterprise-api-cache-$host"),
-        maxSize = maxCacheSize,
-    )
-}
-
 internal class CacheEnforcingInterceptor(
     private val cacheablePaths: List<Regex>,
 ) : Interceptor {
@@ -36,4 +27,4 @@ internal class CacheEnforcingInterceptor(
 
     private fun isCacheable(request: Request) =
         cacheablePaths.any { it.matches(request.url.toString()) }
-}
+}

…rielfeo/gradle/enterprise/api/Caching.kt …nal/caching/CacheEnforcingInterceptor.ktsrc/main/kotlin/com/gabrielfeo/gradle/enterprise/api/Caching.kt renamed to src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/caching/CacheEnforcingInterceptor.kt src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/Caching.kt renamed to src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/caching/CacheEnforcingInterceptor.kt

@@ -0,0 +1,24 @@
+package com.gabrielfeo.gradle.enterprise.api.internal.caching
+
+import com.gabrielfeo.gradle.enterprise.api.debugLoggingEnabled
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.util.logging.Level
+import java.util.logging.Logger
+
+internal class CacheHitLoggingInterceptor(
+    private val logger: Logger = Logger.getGlobal(),
+) : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        if (!debugLoggingEnabled) {
+            return chain.proceed(chain.request())
+        }
+        val url = chain.request().url
+        val response = chain.proceed(chain.request())
+        val wasHit = with(response) { cacheResponse != null && networkResponse == null }
+        val hitOrMiss = if (wasHit) "hit" else "miss"
+        logger.log(Level.INFO, "Cache $hitOrMiss: $url")
+        return response
+    }
+}