Provide more reporting options to SkyFunctions

With more specific information to be reported by Skyfunctions, e.g.,
to inform the build-event protocol on missing files, the EventHandler
interface is no longer enough. Therefore, provide an enriched context
for reporting events.

--
Change-Id: I2d06166fe4d5b9054e24ad8c752fafc039e3f9f8
Reviewed-on: https://cr.bazel.build/8794
PiperOrigin-RevId: 148463437
MOS_MIGRATED_REVID=148463437

1 files changed, 13 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
index 87925af0ff..589822b805 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
@@ -39,7 +39,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import com.google.devtools.build.lib.events.EventHandler;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
@@ -192,7 +192,7 @@ public class GenQuery implements RuleConfiguredTargetFactory {
    * DO NOT USE! We should get rid of this method: errors reported directly to this object don't set
    * the error flag in {@link ConfiguredTarget}.
    */
-  private EventHandler getEventHandler(RuleContext ruleContext) {
+  private ExtendedEventHandler getEventHandler(RuleContext ruleContext) {
     return ruleContext.getAnalysisEnvironment().getEventHandler();
   }
 
@@ -396,7 +396,7 @@ public class GenQuery implements RuleConfiguredTargetFactory {
 
     @Override
     public Map<String, ResolvedTargets<Target>> preloadTargetPatterns(
-        EventHandler eventHandler, Collection<String> patterns, boolean keepGoing)
+        ExtendedEventHandler eventHandler, Collection<String> patterns, boolean keepGoing)
         throws TargetParsingException, InterruptedException {
       Preconditions.checkArgument(!keepGoing);
       boolean ok = true;
@@ -481,16 +481,18 @@ public class GenQuery implements RuleConfiguredTargetFactory {
     }
 
     @Override
-    public ResolvedTargets<Target> parseTargetPatternList(EventHandler eventHandler,
-                                                          List<String> targetPatterns,
-                                                          FilteringPolicy policy, boolean keepGoing)
+    public ResolvedTargets<Target> parseTargetPatternList(
+        ExtendedEventHandler eventHandler,
+        List<String> targetPatterns,
+        FilteringPolicy policy,
+        boolean keepGoing)
         throws TargetParsingException {
       throw new UnsupportedOperationException();
     }
 
     @Override
-    public ResolvedTargets<Target> parseTargetPattern(EventHandler eventHandler, String pattern,
-                                                      boolean keepGoing)
+    public ResolvedTargets<Target> parseTargetPattern(
+        ExtendedEventHandler eventHandler, String pattern, boolean keepGoing)
         throws TargetParsingException {
       throw new UnsupportedOperationException();
     }
@@ -521,7 +523,7 @@ public class GenQuery implements RuleConfiguredTargetFactory {
     }
 
     @Override
-    public Package getPackage(EventHandler eventHandler, PackageIdentifier packageId)
+    public Package getPackage(ExtendedEventHandler eventHandler, PackageIdentifier packageId)
         throws NoSuchPackageException {
       Package pkg = pkgMap.get(packageId);
       if (pkg != null) {
@@ -532,7 +534,7 @@ public class GenQuery implements RuleConfiguredTargetFactory {
     }
 
     @Override
-    public Target getTarget(EventHandler eventHandler, Label label)
+    public Target getTarget(ExtendedEventHandler eventHandler, Label label)
         throws NoSuchPackageException, NoSuchTargetException {
       // Try to perform only one map lookup in the common case.
       Target target = labelToTarget.get(label);
@@ -545,7 +547,7 @@ public class GenQuery implements RuleConfiguredTargetFactory {
     }
 
     @Override
-    public boolean isPackage(EventHandler eventHandler, PackageIdentifier packageName) {
+    public boolean isPackage(ExtendedEventHandler eventHandler, PackageIdentifier packageName) {
       throw new UnsupportedOperationException();
     }
   }