Update the PR merge criteria to allow situational judgement #4227
Conversation
This file contains 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
cijothomas
approved these changes
Sep 25, 2024
arminru
approved these changes
Sep 26, 2024
| * The [spec | ||
| maintainers](https://github.com/open-telemetry/community/blob/main/community-members.md#specifications-and-proto) | ||
| might make situational judgement and put additional requirements (e.g. need | ||
| more approvals, wait for the next release train, etc.). | ||
|
|
There was a problem hiding this comment.
Follow-up: Once open-telemetry/oteps#266 is approved and implemented, I think this list should explicitly mention the 4 approvals required for new OTEPs (and less for editorial fixes on merged OTEPs, if necessary) rather than this being a situational judgement call.
carlosalberto
approved these changes
Sep 26, 2024
|
cc @jsuereth |
pellared
approved these changes
Sep 26, 2024
MrAlias
approved these changes
Sep 26, 2024
dashpole
approved these changes
Sep 26, 2024
yurishkuro
approved these changes
Sep 26, 2024
carlosalberto
pushed a commit
to carlosalberto/opentelemetry-specification
that referenced
this pull request
Oct 31, 2024
…emetry#4227) There was a discussion among TC members about whether we should require 4 approvals for OTEPs. Given we want to merge OTEPs into the specification repo, I think it'll be good to improve the spec PR merge criteria. Here is the thinking behind this change: 1. Having 2 approvals seem good to me, I haven't seen cases where people try to abuse it. 2. Increasing the number from 2 to 4 will slow down PRs for trivial/editorial changes. Many of the editorial PRs were contributed by first-time contributor to the OpenTelemetry project. I actually think we might want to speed this up rather than slowing it down. 3. Since the project started, I think the spec maintainers (TC members) have been careful about significant changes, so we make sure people have enough time to review, discuss and share their opinions. ## Changes Clarify that spec maintainers might put additional requirements before merging the PR. For non-trivial changes, follow the [change proposal process](https://github.com/open-telemetry/opentelemetry-specification/blob/main/CONTRIBUTING.md#proposing-a-change). * [ ] Related issues # * [ ] Related [OTEP(s)](https://github.com/open-telemetry/oteps) # * [ ] Links to the prototypes (when adding or changing features) * [ ] [`CHANGELOG.md`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/CHANGELOG.md) file updated for non-trivial changes * [ ] [`spec-compliance-matrix.md`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md) updated if necessary
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 discussion among TC members about whether we should require 4 approvals for OTEPs.
Given we want to merge OTEPs into the specification repo, I think it'll be good to improve the spec PR merge criteria. Here is the thinking behind this change:
Changes
Clarify that spec maintainers might put additional requirements before merging the PR.
For non-trivial changes, follow the change proposal process.
CHANGELOG.mdfile updated for non-trivial changesspec-compliance-matrix.mdupdated if necessary