From d245ac0492fb5a7d44f47caf03ced0b5191cb806 Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 10 Jan 2023 08:30:52 -0800 Subject: [PATCH] Internal change. PiperOrigin-RevId: 501001992 Change-Id: Ibbd99fe45cf845e49bc2cbd0449c0838046b7ebf --- .../lib/analysis/TargetCompleteEvent.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java index 90639f96494f1f..c39c2e288a98f5 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java @@ -123,7 +123,8 @@ public Artifact getExecutable() { private final CompletionContext completionContext; private final ImmutableMap outputs; private final NestedSet baselineCoverageArtifacts; - private final Label aliasLabel; + // The label as appeared in the BUILD file. + private final Label originalLabel; private final boolean isTest; private final boolean announceTargetSummary; @Nullable private final Long testTimeoutSeconds; @@ -146,10 +147,10 @@ private TargetCompleteEvent( this.executableTargetData = new ExecutableTargetData(targetAndData); ImmutableList.Builder postedAfterBuilder = ImmutableList.builder(); this.label = targetAndData.getConfiguredTarget().getLabel(); - this.aliasLabel = targetAndData.getConfiguredTarget().getOriginalLabel(); + this.originalLabel = targetAndData.getConfiguredTarget().getOriginalLabel(); this.configuredTargetKey = ConfiguredTargetKey.fromConfiguredTarget(targetAndData.getConfiguredTarget()); - postedAfterBuilder.add(BuildEventIdUtil.targetConfigured(aliasLabel)); + postedAfterBuilder.add(BuildEventIdUtil.targetConfigured(originalLabel)); DetailedExitCode mostImportantDetailedExitCode = null; for (Cause cause : getRootCauses().toList()) { mostImportantDetailedExitCode = @@ -227,6 +228,15 @@ public Label getLabel() { return label; } + /** + * Returns the original label of the target. + * + *

See {@link ConfiguredTarget#getOriginalLabel()}. + */ + public Label getOriginalLabel() { + return originalLabel; + } + public ConfiguredTargetKey getConfiguredTargetKey() { return configuredTargetKey; } @@ -260,7 +270,7 @@ public Iterable getLegacyFilteredImportantArtifacts() { @Override public BuildEventId getEventId() { - return BuildEventIdUtil.targetCompleted(aliasLabel, configEventId); + return BuildEventIdUtil.targetCompleted(originalLabel, configEventId); } @Override @@ -281,7 +291,7 @@ public ImmutableList getChildrenEvents() { childrenBuilder.add(BuildEventIdUtil.testSummary(label, configEventId)); } if (announceTargetSummary) { - childrenBuilder.add(BuildEventIdUtil.targetSummary(aliasLabel, configEventId)); + childrenBuilder.add(BuildEventIdUtil.targetSummary(originalLabel, configEventId)); } return childrenBuilder.build(); }