-
Notifications
You must be signed in to change notification settings - Fork 117
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
Update to vergen 5, add branch, commit time, and build target to the panic metadata, automatically update app version from crate version #2029
Conversation
("commit timestamp", env!("VERGEN_GIT_COMMIT_TIMESTAMP")), | ||
("target triple", env!("VERGEN_CARGO_TARGET_TRIPLE")), | ||
("branch", env!("VERGEN_GIT_BRANCH")), | ||
("Zcash network", (&config.network.network).into()), |
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.
Thanks I've been waiting for these for a while.
I edited this line, because GitHub reads "partially resolve #ticket" as "resolve #ticket", and auto-closes the ticket. |
Yeah we really do need to move to the latest cc crate version, it's blocking a bunch of changes. |
The zebrad code automatically uses the crate version now.
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.
Looks good, let's merge if CI passes.
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.
Looks like we might need a metrics-exporter-prometheus
update before we can merge this change:
error: failed to select a version for `cc`.
... required by package `libgit2-sys v0.12.18+1.1.0`
... which is depended on by `git2 v0.13.17`
... which is depended on by `vergen v5.1.1`
... which is depended on by `zebrad v1.0.0-alpha.6 (/zebra/zebrad)`
versions that meet the requirements `^1.0.43` are: 1.0.67, 1.0.66, 1.0.65, 1.0.64, 1.0.63, 1.0.62, 1.0.61, 1.0.60, 1.0.59, 1.0.58, 1.0.57, 1.0.56, 1.0.55, 1.0.54, 1.0.53, 1.0.52, 1.0.51, 1.0.50, 1.0.49, 1.0.48, 1.0.47, 1.0.46, 1.0.45, 1.0.44, 1.0.43
all possible versions conflict with previously selected packages.
previously selected package `cc v1.0.41`
... which is depended on by `generator v0.6.23`
... which is depended on by `loom v0.3.6`
... which is depended on by `sharded-slab v0.1.0`
... which is depended on by `metrics v0.13.0-alpha.8 (https://github.com/ZcashFoundation/metrics?rev=971133128e5aebe3ad177acffc6154449736cfa2#97113312)`
... which is depended on by `metrics-exporter-prometheus v0.1.0-alpha.7 (https://github.com/ZcashFoundation/metrics?rev=971133128e5aebe3ad177acffc6154449736cfa2#97113312)`
... which is depended on by `zebrad v1.0.0-alpha.6 (/zebra/zebrad)`
Head branch was pushed to by a user without write access
Here's what I tried: Merge the most recent version of metrics-exporter-prometheus that doesn't use tokio-1.0 with the tokio-0.3 changes in the Foundation's metrics fork: Update Zebra to use that branch: But I get a metrics exporter acceptance test failure - it doesn't provide any output. We had this issue once before when there was a version mismatch in some dependencies, so it should be fixable. But I might not have time to look at it for a few days. |
It was #1349, duplicate metrics dependencies. Seems like my attempt had similar issues. |
We do not need to update |
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.
Looks like merging the latest main branch fixed it all up.
Looks like this is broken inside a |
Motivation
Add more metadata with vergen crate.
Solution
Update
vergen
to version 5.Review
I wanted add
rustc
metadata but this requiressentry
update for the new version ofrustc_version
.Related Issues
Follow Up Work
Update
sentry
crate (require tokio 1 😢 + sentry-tracing update: kellpossible/sentry-tracing#1) and addrustc
metadata.