diff options
2 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java index c8b4be81ba..bc806be07c 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java @@ -79,6 +79,7 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions BuildEventStreamer streamer = tryCreateStreamer( + commandEnvironment.getRuntime().getStartupOptionsProvider(), commandEnvironment.getOptions(), commandEnvironment.getReporter(), commandEnvironment.getBlazeModuleEnvironment(), @@ -131,6 +132,7 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions @Nullable @VisibleForTesting BuildEventStreamer tryCreateStreamer( + OptionsProvider startupOptionsProvider, OptionsProvider optionsProvider, EventHandler commandLineReporter, ModuleEnvironment moduleEnvironment, @@ -164,7 +166,8 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions moduleEnvironment, clock, pathConverter, - commandLineReporter); + commandLineReporter, + startupOptionsProvider); } catch (Exception e) { if (besOptions.besBestEffort) { commandLineReporter.handle(Event.warn(format(UPLOAD_FAILED_MESSAGE, e.getMessage()))); @@ -206,7 +209,8 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions ModuleEnvironment moduleEnvironment, Clock clock, PathConverter pathConverter, - EventHandler commandLineReporter) throws IOException { + EventHandler commandLineReporter, + OptionsProvider startupOptionsProvider) throws IOException { if (isNullOrEmpty(besOptions.besBackend)) { logger.fine("BuildEventServiceTransport is disabled."); return null; @@ -234,7 +238,7 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions pathConverter, commandLineReporter, besOptions.projectId, - keywords(besOptions)); + keywords(besOptions, startupOptionsProvider)); logger.fine("BuildEventServiceTransport was created successfully"); return besTransport; } @@ -254,7 +258,7 @@ public abstract class BuildEventServiceModule<T extends BuildEventServiceOptions protected abstract Set<String> whitelistedCommands(); - protected Set<String> keywords(T besOptions) { + protected Set<String> keywords(T besOptions, @Nullable OptionsProvider startupOptionsProvider) { return besOptions .besKeywords .stream() diff --git a/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java b/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java index 4a297272cc..e365f8c98d 100644 --- a/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java +++ b/src/test/java/com/google/devtools/build/lib/buildeventservice/BazelBuildEventServiceModuleTest.java @@ -138,6 +138,7 @@ public class BazelBuildEventServiceModuleTest { private BuildEventStreamer createBuildEventStreamerForCommand( BazelBuildEventServiceModule module, String commandName) { return module.tryCreateStreamer( + /* startupOptionsProvider= */ null, optionsProvider, commandLineReporter, moduleEnvironment, @@ -221,7 +222,7 @@ public class BazelBuildEventServiceModuleTest { public void testKeywords() throws Exception { besOptions.besKeywords = ImmutableList.of("keyword0", "keyword1", "keyword0"); BazelBuildEventServiceModule module = new BazelBuildEventServiceModule(); - assertThat(module.keywords(besOptions)) + assertThat(module.keywords(besOptions, null)) .containsExactly("user_keyword=keyword0", "user_keyword=keyword1"); } |