REQUEST: Repository maintenance on opentelemetry-ebpf-instrumentation

[mariomac]

Affected Repository

https://github.com/open-telemetry/opentelemetry-ebpf-instrumentation

Requested changes

Give @open-telemetry/ebpf-instrumentation-maintainers permissions to force-push into main, also to modify and delete other branches. If that wasn't possible, at least the following bullets:

• Force-push the beyla-import branch to main. (beyla-import already cherry-picks all the updates of main).

We can't do a PR to merge into main, as beyla-import does not have any common history from main, since it is an imported history: this way we will have a starting point to start the required refactorings from the Beyla donation while keeping the history of contributions.

• After force-pushing beyla-import to main, remove then the beyla-import and first-import branch.

• Currently I can push changes to any new branch in the repository, and the branch is created, but then I can't update the branch nor delete it. Maybe I should either be able to update/delete other branches than main, or not being able to create them, to avoid polluting the repository with read-only branches.

Purpose

We are importing the Beyla code into this repository, before starting to refactor it to remove Beyla-specific code/naming, as well as complying with OTEL code conventions.

Expected Duration

Repository Maintainers

• @open-telemetry/ebpf-instrumentation-maintainers

[trask]

Force-push the beyla-import branch to main

If we haven't already, I believe we'll need to either:

• Verify all commit authors have signed the CLA, or
• Get CNCF and Grafana Legal teams to sign some stuff (doable but will inevitably take longer as anything going through CNCF Legal does)

@mtwo can you confirm / work with the Beyla team on this aspect?

[trask]

Currently I can push changes to any new branch in the repository, and the branch is created, but then I can't update the branch nor delete it. Maybe I should either be able to update/delete other branches than main, or not being able to create them, to avoid polluting the repository with read-only branches.

I'm not sure the best solution here, so I opened #2696 to discuss. In the meantime, I can delete any branches for you, just ping me on Slack or here.

[mariomac]

Thanks for the input @trask . Then I think it's better to just copy the whole Beyla sources as a single-commit PR, as there are tenths of contributors that have no relation to the Beyla team and might be difficult to reach out. We will loose the history and contributions, but I think it's not a big problem as it will be still available in the original beyla repository.

Once we do the new pR without major issues I think I can close this task and remove the created branches, as the other requests are going to be discussed/addressed in #2696

[mtwo]

@mariomac I'm filing a ticket with the CNCF about how to proceed, but this should be pretty smooth given that the existing repo has a CLA

[mariomac]

Hi @mtwo ! Thanks! Anyway I think it's not needed anymore as we decided, for simplicity, to not keeping the history and merge the whole Beyla repository in a single commit: open-telemetry/opentelemetry-ebpf-instrumentation#15

@trask , since we already merged everything, you can safely remove the beyla-import and first-import branches (lowest urgency/priority for that task).

Thank you both for the quick response and action!

[mtwo]

@trask @mariomac the CNCF just got back to me and they agree: we can just copy the code over at any time!