-
Notifications
You must be signed in to change notification settings - Fork 4
Feat/lean client logging overhaul #98
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
Open
bomanaps
wants to merge
4
commits into
grandinetech:devnet-4
Choose a base branch
from
bomanaps:feat/lean-client-logging-overhaul
base: devnet-4
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.
Open
Changes from all commits
Commits
Show all changes
4 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,16 @@ | ||
| use std::process::Command; | ||
|
|
||
| fn main() { | ||
| let hash = Command::new("git") | ||
| .args(["rev-parse", "--short=8", "HEAD"]) | ||
| .output() | ||
| .ok() | ||
| .filter(|o| o.status.success()) | ||
| .map(|o| String::from_utf8_lossy(&o.stdout).trim().to_string()) | ||
| .filter(|s| !s.is_empty()) | ||
| .unwrap_or_else(|| "unknown".to_string()); | ||
|
|
||
| println!("cargo:rustc-env=GRANDINE_GIT_COMMIT_HASH={hash}"); | ||
| println!("cargo:rerun-if-changed=../.git/HEAD"); | ||
| println!("cargo:rerun-if-changed=../.git/refs/heads"); | ||
| } |
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.
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.
it is better to use the
grandinetech/dedicated_executorfork, instead of your own one - just add it as a submodule to git repo, and it should work perfectlyThere 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.
I had to remove prometheus_metrics dep for standalone use
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.
I understand, but you can just add it as a submodule, then add it to workspace & have it working the same as main grandine repo does this:
https://github.com/grandinetech/grandine/blob/eeb33a92284751b71a0f44f410308235657c55f3/Cargo.toml#L318
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.
Going to submodule grandinetech/dedicated_executor and switch to dedicated_executor = {path = "dedicated_executor" } as you suggested one thing prometheus_metrics only lives inside the grandine monorepo, so easiest is to pull it via git = "grandinetech/grandine" matching how features and http_api_utils are already done here good with that