diff options
author | lpino <lpino@google.com> | 2018-03-13 06:03:29 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-13 06:07:12 -0700 |
commit | 19444d514ca1b7b9841f6a5eb986caef10e1f682 (patch) | |
tree | edf20adc199f4a5163274a60d0bea5d37a92d348 /src/main/java/com/google/devtools/build/lib/buildeventservice | |
parent | b3cf83cd20f30d77e6768de651a3e652f86d6f78 (diff) |
PiperOrigin-RevId: 188862123
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildeventservice')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildeventservice/BuildEventServiceModule.java | 12 |
1 files changed, 8 insertions, 4 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() |