Set keywords on appropriate lifecycle events.

benjaminp · copybara-github · commit 0a2a43f9aab1 · 2022-04-19T13:54:43.000-07:00
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 #14857. PiperOrigin-RevId: 442902471
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtil.java b/src/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/src/test/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceProtoUtilTest.java b/src/test/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(

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,14 @@ public PublishLifecycleEventRequest.Builder lifecycleEvent(@Nullable String proj`
`161`	`161`	`if (projectId != null) {`
`162`	`162`	`builder.setProjectId(projectId);`
`163`	`163`	`}`
	`164`	`+ switch (lifecycleEvent.getEventCase()) {`
	`165`	`+ case BUILD_ENQUEUED:`
	`166`	`+ case INVOCATION_ATTEMPT_STARTED:`
	`167`	`+ builder.addAllNotificationKeywords(getKeywords());`
	`168`	`+ break;`
	`169`	`+ default:`
	`170`	`+ break;`
	`171`	`+ }`
`164`	`172`	`return builder;`
`165`	`173`	`}`
`166`	`174`