Skip to content
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

Merged
merged 2 commits into from
Mar 25, 2023
Merged

Issue #3236 Update attribute requirement levels in hardware metrics semconv #3258

merged 2 commits into from
Mar 25, 2023

Conversation

bertysentry
Copy link
Contributor

Fixes #3236

Changes

  • Update attributes requirement levels in specification\metrics\semantic_conventions\hardware-metrics.md
  • Minor wording corrections

@bertysentry
Copy link
Contributor Author

@trask There it is! 😉

@arminru arminru added spec:resource Related to the specification/resource directory spec:metrics Related to the specification/metrics directory area:semantic-conventions Related to semantic conventions and removed spec:resource Related to the specification/resource directory labels Feb 28, 2023
@bertysentry
Copy link
Contributor Author

Just rebased on main and resolved conflicts in CHANGELOG.md

@bertysentry
Copy link
Contributor Author

Rebased again and resolved conflicts again 🙄

@github-actions
Copy link

github-actions bot commented Mar 9, 2023

This PR was marked stale due to lack of activity. It will be closed in 7 days.

@github-actions github-actions bot added the Stale label Mar 9, 2023
@trask trask removed the Stale label Mar 9, 2023
@trask
Copy link
Member

trask commented Mar 9, 2023

@open-telemetry/technical-committee is this ready to merge? thx

@bertysentry
Copy link
Contributor Author

Yes, please merge, as I don't want to keep solving conflicts in CHANGELOG.md... 🙄 Thank you!

@github-actions
Copy link

This PR was marked stale due to lack of activity. It will be closed in 7 days.

@github-actions github-actions bot added the Stale label Mar 17, 2023
@jack-berg jack-berg removed the Stale label Mar 17, 2023
@jack-berg
Copy link
Member

@bertysentry sorry about the delay. I'm happy to merge if you can merge main one more time.

@bertysentry
Copy link
Contributor Author

@jack-berg Rebase done! Thank you!

@bertysentry
Copy link
Contributor Author

@jack-berg markdown-link-check just failed, but it's not related to this PR. Could you please rerun the checks? Thanks!

@jack-berg
Copy link
Member

@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.

@bertysentry
Copy link
Contributor Author

Oooooh that's why you can't solve the conflicts! Okay let me check this!

Copy link
Member

@jack-berg jack-berg left a 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.

@bertysentry
Copy link
Contributor Author

Ugh! @jack-berg I totally missed that change! Thank you for pointing that out!

@bertysentry
Copy link
Contributor Author

@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.

@jack-berg jack-berg merged commit 68151ed into open-telemetry:main Mar 25, 2023
@bertysentry bertysentry deleted the issue/3236-optional-in-hardware-semconv branch March 26, 2023 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:semantic-conventions Related to semantic conventions spec:metrics Related to the specification/metrics directory
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Review existing "optional" attributes in hardware metrics
4 participants