From 9056d18d8e1289a995a0b574a9c20faf5d57e131 Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Fri, 13 Sep 2024 11:05:35 -0600
Subject: [PATCH] Improve cache logging

---
 sources/src/caching/cache-utils.ts                 | 8 ++++++--
 sources/src/caching/gradle-home-extry-extractor.ts | 2 --
 sources/src/caching/gradle-user-home-cache.ts      | 8 --------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sources/src/caching/cache-utils.ts b/sources/src/caching/cache-utils.ts
index 6e06910..3d5e3b3 100644
--- a/sources/src/caching/cache-utils.ts
+++ b/sources/src/caching/cache-utils.ts
@@ -45,7 +45,9 @@ export async function restoreCache(
             : {segmentTimeoutInMs: SEGMENT_DOWNLOAD_TIMEOUT_DEFAULT}
         const restoredEntry = await cache.restoreCache(cachePath, cacheKey, cacheRestoreKeys, cacheRestoreOptions)
         if (restoredEntry !== undefined) {
-            listener.markRestored(restoredEntry.key, restoredEntry.size, Date.now() - startTime)
+            const restoreTime = Date.now() - startTime
+            listener.markRestored(restoredEntry.key, restoredEntry.size, restoreTime)
+            core.info(`Restored cache entry with key ${cacheKey} to ${cachePath.join()} in ${restoreTime}ms`)
         }
         return restoredEntry
     } catch (error) {
@@ -59,7 +61,9 @@ export async function saveCache(cachePath: string[], cacheKey: string, listener:
     try {
         const startTime = Date.now()
         const savedEntry = await cache.saveCache(cachePath, cacheKey)
-        listener.markSaved(savedEntry.key, savedEntry.size, Date.now() - startTime)
+        const saveTime = Date.now() - startTime
+        listener.markSaved(savedEntry.key, savedEntry.size, saveTime)
+        core.info(`Saved cache entry with key ${cacheKey} from ${cachePath.join()} in ${saveTime}ms`)
     } catch (error) {
         if (error instanceof cache.ReserveCacheError) {
             listener.markAlreadyExists(cacheKey)
diff --git a/sources/src/caching/gradle-home-extry-extractor.ts b/sources/src/caching/gradle-home-extry-extractor.ts
index 715da1f..6e0c674 100644
--- a/sources/src/caching/gradle-home-extry-extractor.ts
+++ b/sources/src/caching/gradle-home-extry-extractor.ts
@@ -134,7 +134,6 @@ abstract class AbstractEntryExtractor {
     ): Promise<ExtractedCacheEntry> {
         const restoredEntry = await restoreCache([pattern], cacheKey, [], listener)
         if (restoredEntry) {
-            core.info(`Restored ${artifactType} with key ${cacheKey} to ${pattern} in ${listener.restoredTime}ms`)
             return new ExtractedCacheEntry(artifactType, pattern, cacheKey)
         } else {
             core.info(`Did not restore ${artifactType} with key ${cacheKey} to ${pattern}`)
@@ -233,7 +232,6 @@ abstract class AbstractEntryExtractor {
             entryListener.markNotSaved('contents unchanged')
         } else {
             await saveCache([pattern], cacheKey, entryListener)
-            core.info(`Saved ${artifactType} with key ${cacheKey} from ${pattern} in ${entryListener.savedTime}ms`)
         }
 
         for (const file of matchingFiles) {
diff --git a/sources/src/caching/gradle-user-home-cache.ts b/sources/src/caching/gradle-user-home-cache.ts
index 3a47c2e..55fc650 100644
--- a/sources/src/caching/gradle-user-home-cache.ts
+++ b/sources/src/caching/gradle-user-home-cache.ts
@@ -69,10 +69,6 @@ export class GradleUserHomeCache {
 
         core.saveState(RESTORED_CACHE_KEY_KEY, cacheResult.key)
 
-        core.info(
-            `Restored ${this.cacheDescription} with key ${cacheResult.key} to ${cachePath.join()} in ${entryListener.restoredTime}ms`
-        )
-
         try {
             await this.afterRestore(listener)
         } catch (error) {
@@ -125,10 +121,6 @@ export class GradleUserHomeCache {
 
         const cachePath = this.getCachePath()
         await saveCache(cachePath, cacheKey, gradleHomeEntryListener)
-        core.info(
-            `Saved ${this.cacheDescription} with key ${cacheKey} from ${cachePath.join()} in ${gradleHomeEntryListener.savedTime}ms`
-        )
-
         return
     }