Add configuration short ID to analysis error

This makes it possible to debug config-dependent errors.

Closes #26690.

PiperOrigin-RevId: 792275177
Change-Id: I026d6aae8a3dbc1da20a155f4b873d0349b76a8d

Author: fmeum

src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java

@@ -1017,7 +1017,11 @@ private AspectValue createAspect(
     events.replayOn(env.getListener());
     if (events.hasErrors()) {
       analysisEnvironment.disable(associatedTarget);
-      String msg = "Analysis of target '" + associatedTarget.getLabel() + "' failed";
+      String msg =
+          "Analysis of target '%s' (config: %s) failed"
+              .formatted(
+                  associatedTarget.getLabel(),
+                  configuration != null ? configuration.getOptions().shortId() : "none");
       throw new AspectFunctionException(
           new AspectCreationException(msg, key.getLabel(), configuration));
     }

src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java

@@ -31,6 +31,7 @@
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.ConfiguredTargetValue;
 import com.google.devtools.build.lib.analysis.DependencyKind;
+import com.google.devtools.build.lib.analysis.DependencyResolutionHelpers;
 import com.google.devtools.build.lib.analysis.ExecGroupCollection;
 import com.google.devtools.build.lib.analysis.ExecGroupCollection.InvalidExecGroupException;
 import com.google.devtools.build.lib.analysis.FilesToRunProvider;
@@ -491,7 +492,10 @@ private static ConfiguredTargetValue createConfiguredTarget(
       throw new ConfiguredValueCreationException(
           ctgValue.getTarget(),
           null,
-          "Analysis of target '" + target.getLabel() + "' failed",
+          "Analysis of target '%s' (config: %s) failed"
+              .formatted(
+                  target.getLabel(),
+                  configuration != null ? configuration.getOptions().shortId() : "none"),
           rootCauses,
           null);
     }

src/test/java/com/google/devtools/build/lib/buildtool/OutputArtifactConflictTest.java

@@ -557,7 +557,8 @@ def _aspect_impl(target, ctx):
       events.assertContainsError("/bin/x/y/whatever' (belonging to //x/y:y)");
       events.assertContainsError("/bin/x/y' (belonging to //x:y)");
       events.assertContainsError("is a prefix of the other");
-      events.assertContainsError("Analysis of target '//x:fail_analysis' failed");
+      events.assertContainsError("Analysis of target '//x:fail_analysis' (config: ");
+      events.assertContainsError(") failed");
 
       assertThat(eventListener.analysisFailures).containsAtLeast("//x:y", "//x:fail_analysis");
     } else if (minimizeMemory) {