-
Notifications
You must be signed in to change notification settings - Fork 889
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
Issue #3236 Update attribute requirement levels in hardware metrics semconv #3258
Issue #3236 Update attribute requirement levels in hardware metrics semconv #3258
Conversation
@trask There it is! 😉 |
Just rebased on main and resolved conflicts in |
Rebased again and resolved conflicts again 🙄 |
This PR was marked stale due to lack of activity. It will be closed in 7 days. |
@open-telemetry/technical-committee is this ready to merge? thx |
Yes, please merge, as I don't want to keep solving conflicts in |
This PR was marked stale due to lack of activity. It will be closed in 7 days. |
@bertysentry sorry about the delay. I'm happy to merge if you can merge main one more time. |
@jack-berg Rebase done! Thank you! |
@jack-berg markdown-link-check just failed, but it's not related to this PR. Could you please rerun the checks? Thanks! |
@bertysentry unfortunately the build was temporarily broken when you resolved the merge conflicts. Its since been resolved with #3327 so you'll need to resolve the conflicts once more. Normally, maintainers can resolve trivial merge conflicts right before merging the PR. I think that's not possible in this case because the fork has more restrictive branch permissions. |
Oooooh that's why you can't solve the conflicts! Okay let me check this! |
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.
Just noticed that this reverts a recent change to units done in #3298.
Ugh! @jack-berg I totally missed that change! Thank you for pointing that out! |
@jack-berg Let's merge this, please! (I had to fix CHANGELOG.md once more) BTW, I think we should drop CHANGELOG.md the way it's done currently. Maybe find a way to generate it automatically, based on merged PRs. I don't know, but it's a huge pain in the a** for everybody: each time a change is merged (and therefore CHANGELOG.md is updated), you get a conflict in your hands. |
…ware metrics semconv (open-telemetry#3258) Fixes open-telemetry#3236 ## Changes * Update attributes requirement levels in `specification\metrics\semantic_conventions\hardware-metrics.md` * Minor wording corrections
Fixes #3236
Changes
specification\metrics\semantic_conventions\hardware-metrics.md