REQUEST: Repository maintenance on opentelemetry-collector-releases

[ArthurSens]

Affected Repository

https://github.com/open-telemetry/opentelemetry-collector-releases

Requested changes

Enable the Require merge queue setting on the branch protection rules for the main branch with "squash" merge method

Purpose

The Github documentation linked above puts it succinctly:

The merge queue provides the same benefits as the Require branches to be up to date before merging branch protection, but does not require a pull request author to update their pull request branch and wait for status checks to finish before trying to merge.

To be 100% transparent here our final goal is to enable the same configuration in https://github.com/open-telemetry/opentelemetry-collector-contrib, but we'd like to test the possible side effects of the new configuration in a smaller repository before doing so.

In the contrib repository, our goal is to improve contributor experience by accelerating merges. It's too much manual work to keep all PRs based on latest main, so the merge queue will help us here.

Expected Duration

Permanently

Repository Maintainers

• @open-telemetry/collector-contrib-maintainers
• @open-telemetry/collector-maintainers

[mx-psi]

I support this

[mx-psi]

Both https://github.com/open-telemetry/opentelemetry.io and https://github.com/open-telemetry/opentelemetry-js use a merge queue. I think having the same configuration as those would be reasonable here.

[trask]

configured, let me know if it's working out:

[mx-psi]

Thanks @trask! I tried merging open-telemetry/opentelemetry-collector-releases/pull/751 but it seems like there is something related to the branch protection rules that needs to be set up in a different way:

I don't think I am able to fix this on my own, maybe you can compare the branch protection rules that exist in the opentelemetry(.)io/opentelemetry-js repositories?

[mx-psi]

My guess is that github-merge-queue[bot] needs to be authorized to push to the main branch/to the temporary merge queue branch.

[mx-psi]

Looks like it worked now! I am closing this, but since we will be setting this up in other repositories, would you mind documenting what was done here to solve the branch protection error?

[trask]

Looks like it was the branch protection rule on **/** that was preventing the merge queue from getting created, I unchecked this:

I'm going to try narrowing these permissions down (see #2459), can you give me one more PR that I can send to the merge queue afterwards?

[mx-psi]

Okay, you can try with open-telemetry/opentelemetry-collector-releases#736, just removed from the queue. I'll reopen until we get this right :)

Another interesting bit (this may be on us): we have the merge queue now, but it seems like only the "Build" workflow is running 🤔

https://github.com/open-telemetry/opentelemetry-collector-releases/actions/runs/12034936523/job/33552687997

Despite having multiple merge_group items after open-telemetry/opentelemetry-collector-releases/pull/755.

[ArthurSens]

Looks like it was the branch protection rule on **/** that was preventing the merge queue from getting created, I unchecked this:

Yeah, they mention this requirement here.

[trask]

ok, the configuration in #2459 looks like it's working

Another interesting bit (this may be on us): we have the merge queue now, but it seems like only the "Build" workflow is running 🤔

you may need to add merge_group to the workflows, e.g.

on:
  pull_request:
  merge_group:

[mx-psi]

ok, the configuration in #2459 looks like it's working

Another interesting bit (this may be on us): we have the merge queue now, but it seems like only the "Build" workflow is running 🤔

you may need to add merge_group to the workflows, e.g.

on:
  pull_request:
  merge_group:

This was done in open-telemetry/opentelemetry-collector-releases/pull/755, I think what matters here is that the merge queue only waits/shows the jobs marked as required. I feel like that is an independent problem, we can make a separate request for adding further required checks in the future if needed.

[ArthurSens]

All good to close this one? :)