-
Notifications
You must be signed in to change notification settings - Fork 183
xsync: decouple from oss workspace #3209
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
benhillis
wants to merge
2
commits into
microsoft:main
Choose a base branch
from
benhillis:user/benhill/xsync-decouple
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT License. | ||
|
|
||
| //! A [`log::Log`] implementation that translates log-levels to ADO logging | ||
| //! commands when running in CI, and uses ANSI colors otherwise. | ||
| //! | ||
| //! Inlined from `ci_logger` to avoid a cross-workspace path dependency. | ||
|
|
||
| use log::Level; | ||
| use log::LevelFilter; | ||
| use log::Metadata; | ||
| use log::Record; | ||
|
|
||
| struct AdoLogger { | ||
| max_level: LevelFilter, | ||
| in_ci: bool, | ||
| } | ||
|
|
||
| impl AdoLogger { | ||
| fn new(log_level: Option<&str>) -> AdoLogger { | ||
| let max_level = match log_level.map(|s| s.to_lowercase()).as_deref() { | ||
| Some("trace") => LevelFilter::Trace, | ||
| Some("debug") => LevelFilter::Debug, | ||
| Some("info") => LevelFilter::Info, | ||
| Some("warn" | "warning") => LevelFilter::Warn, | ||
| Some("error") => LevelFilter::Error, | ||
| Some("off") => LevelFilter::Off, | ||
| _ => LevelFilter::Info, | ||
| }; | ||
|
|
||
| AdoLogger { | ||
| in_ci: std::env::var("TF_BUILD").is_ok(), | ||
| max_level, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl log::Log for AdoLogger { | ||
| fn enabled(&self, metadata: &Metadata<'_>) -> bool { | ||
| metadata.level() <= self.max_level | ||
| } | ||
|
|
||
| fn log(&self, record: &Record<'_>) { | ||
| if record.level() <= self.max_level { | ||
| let (prefix, postfix) = if self.in_ci { | ||
| let prefix = match record.level() { | ||
| Level::Error => "##vso[task.logissue type=error]", | ||
| Level::Warn => "##vso[task.logissue type=warning]", | ||
| Level::Info => "", | ||
| Level::Debug => "##[debug]", | ||
| Level::Trace => "##[debug](trace)", | ||
| }; | ||
| (prefix, "") | ||
| } else { | ||
| let prefix = match record.level() { | ||
| Level::Error => "\x1B[0;31m", // red | ||
| Level::Warn => "\x1B[0;33m", // yellow | ||
| Level::Info => "", | ||
| Level::Debug => "\x1B[0;36m", // cyan | ||
| Level::Trace => "\x1B[0;35m", // purple | ||
| }; | ||
| (prefix, "\x1B[0m") | ||
| }; | ||
|
|
||
| if record.level() <= Level::Info { | ||
| eprintln!("{}{}{}", prefix, record.args(), postfix) | ||
| } else { | ||
| eprintln!( | ||
| "{}[{}:{}] {}{}", | ||
| prefix, | ||
| record.module_path().unwrap_or("?"), | ||
| record | ||
| .line() | ||
| .map(|s| s.to_string()) | ||
| .unwrap_or_else(|| "?".into()), | ||
| record.args(), | ||
| postfix | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn flush(&self) {} | ||
| } | ||
|
|
||
| /// Initialize the ADO logger | ||
| pub fn init(log_env_var: &str) -> Result<(), log::SetLoggerError> { | ||
| log::set_boxed_logger(Box::new(AdoLogger::new( | ||
| std::env::var(log_env_var).ok().as_deref(), | ||
| ))) | ||
| .map(|()| log::set_max_level(LevelFilter::Trace)) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
XSYNC_LOGused to accept fullenv_loggerfilter syntax viaci_logger(e.g.module=debug,other=warn). This reimplementation only recognizes a few exact strings and silently falls back toInfofor anything else, which can make existing configs appear to “stop working”. Consider either (a) supporting a minimal subset of the previous filter syntax (at leasttarget=level/ comma-separated), or (b) treating unrecognized values as an error (or at least printing a one-time warning to stderr before installing the logger) so misconfiguration is visible.