Set keywords on appropriate lifecycle events.

The docs for the PublishLifecycleEventRequest say that the notification_keywords field should be set if the build event is InvocationAttemptStarted or BuildEnqueued. However, Bazel did not conform to this spec. Closes bazelbuild#14857. PiperOrigin-RevId: 442902471
fweikert · Apr 19, 2022 · 0a2a43f · 0a2a43f
1 parent 7222cab
commit 0a2a43f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java b/...main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java
@@ -161,6 +161,14 @@ public PublishLifecycleEventRequest.Builder lifecycleEvent(@Nullable String proj
     if (projectId != null) {
       builder.setProjectId(projectId);
     }
+    switch (lifecycleEvent.getEventCase()) {
+      case BUILD_ENQUEUED:
+      case INVOCATION_ATTEMPT_STARTED:
+        builder.addAllNotificationKeywords(getKeywords());
+        break;
+      default:
+        break;
+    }
     return builder;
   }
 

diff --git a/.../java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java b/.../java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java
@@ -70,6 +70,7 @@ public void testBuildEnqueued() {
             PublishLifecycleEventRequest.newBuilder()
                 .setServiceLevel(ServiceLevel.INTERACTIVE)
                 .setProjectId(PROJECT_ID)
+                .addAllNotificationKeywords(EXPECTED_KEYWORDS)
                 .setBuildEvent(
                     OrderedBuildEvent.newBuilder()
                         .setStreamId(
@@ -92,6 +93,7 @@ public void testInvocationAttemptStarted() {
             PublishLifecycleEventRequest.newBuilder()
                 .setServiceLevel(ServiceLevel.INTERACTIVE)
                 .setProjectId(PROJECT_ID)
+                .addAllNotificationKeywords(EXPECTED_KEYWORDS)
                 .setBuildEvent(
                     OrderedBuildEvent.newBuilder()
                         .setStreamId(