Remove EventHandler from the RemoteAnalysisCacheClient interface.

So that it can be made part of the SC/LC interface, where only simple types are allowed.

The preexisting `bailOutCallback` parameter is not an issue from an SC/LC interface standpoint, but it seems pointless now that exceptions are getting bubbled up.

PiperOrigin-RevId: 862734134
Change-Id: I1faf23398ade9d24b505b0d291c16c4f7a9fb3b2

Author: tjgq

src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java

@@ -133,6 +133,7 @@
 import com.google.devtools.build.lib.skyframe.serialization.analysis.ClientId.LongVersionClientId;
 import com.google.devtools.build.lib.skyframe.serialization.analysis.FrontierSerializer;
 import com.google.devtools.build.lib.skyframe.serialization.analysis.RemoteAnalysisCacheClient;
+import com.google.devtools.build.lib.skyframe.serialization.analysis.RemoteAnalysisCacheClient.LookupTopLevelTargetsResult;
 import com.google.devtools.build.lib.skyframe.serialization.analysis.RemoteAnalysisCachingDependenciesProvider;
 import com.google.devtools.build.lib.skyframe.serialization.analysis.RemoteAnalysisCachingEventListener;
 import com.google.devtools.build.lib.skyframe.serialization.analysis.RemoteAnalysisCachingOptions;
@@ -1730,16 +1731,30 @@ public void queryMetadataAndMaybeBailout() throws InterruptedException {
       if (skycacheMetadataParams.getTargets().isEmpty()) {
         eventHandler.handle(
             Event.warn(
-                "Skycache: Not querying Skycache metadata because invocation has no" + " targets"));
+                "Skycache: Not querying Skycache metadata because invocation has no targets"));
       } else {
-        getAnalysisCacheClient()
-            .lookupTopLevelTargets(
-                skycacheMetadataParams.getEvaluatingVersion(),
-                skycacheMetadataParams.getConfigurationHash(),
-                skycacheMetadataParams.getUseFakeStampData(),
-                skycacheMetadataParams.getBazelVersion(),
-                eventHandler,
-                () -> bailedOut = true);
+        try {
+          LookupTopLevelTargetsResult result =
+              getAnalysisCacheClient()
+                  .lookupTopLevelTargets(
+                      skycacheMetadataParams.getEvaluatingVersion(),
+                      skycacheMetadataParams.getConfigurationHash(),
+                      skycacheMetadataParams.getUseFakeStampData(),
+                      skycacheMetadataParams.getBazelVersion());
+
+          Event event =
+              switch (result.status()) {
+                case MATCH_STATUS_MATCH -> Event.info("Skycache: " + result.statusMessage());
+                case MATCH_STATUS_FAILURE -> Event.warn("Skycache: " + result.statusMessage());
+                default -> {
+                  bailedOut = true;
+                  yield Event.warn("Skycache: " + result.statusMessage());
+                }
+              };
+          eventHandler.handle(event);
+        } catch (ExecutionException | TimeoutException e) {
+          eventHandler.handle(Event.warn("Skycache: Error with metadata store: " + e.getMessage()));
+        }
       }
     }
 

src/main/java/com/google/devtools/build/lib/skyframe/serialization/analysis/RemoteAnalysisCacheClient.java

@@ -15,16 +15,20 @@
 package com.google.devtools.build.lib.skyframe.serialization.analysis;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.skyframe.serialization.analysis.proto.TopLevelTargetsMatchStatus;
 import com.google.protobuf.ByteString;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 /** Interface to the remote analysis cache. */
 public interface RemoteAnalysisCacheClient {
 
   /** Timeout when accessing the future in order to shutdown the client. */
   int SHUTDOWN_TIMEOUT_IN_SECONDS = 5;
 
+  /** The result of a top-level targets lookup. */
+  record LookupTopLevelTargetsResult(TopLevelTargetsMatchStatus status, String statusMessage) {}
+
   /** Usage statistics. */
   record Stats(
       long bytesSent,
@@ -40,12 +44,10 @@ record Stats(
   Stats getStats();
 
   /** Looks up the targets in the metadata table */
-  void lookupTopLevelTargets(
+  LookupTopLevelTargetsResult lookupTopLevelTargets(
       long evaluatingVersion,
       String configurationHash,
       boolean useFakeStampData,
-      String bazelVersion,
-      EventHandler eventHandler,
-      Runnable bailOutCallback)
-      throws InterruptedException;
+      String bazelVersion)
+      throws ExecutionException, TimeoutException, InterruptedException;
 }