Open Telemetry Feature - #5044
DCO
There are 2 commits incorrectly signed off. This means that the author(s) of these commits failed to include a Signed-off-by line in their commit message.
To avoid having PRs blocked in the future, always include Signed-off-by: Author Name <authoremail@example.com> in every commit message. You can also do this automatically by using the -s flag (i.e., git commit -s).
Here is how to fix the problem so that this code can be merged.
Preferred method: Commit author adds a DCO remediation commit
A DCO Remediation Commit contains special text in the commit message that applies a missing Signed-off-by line in a subsequent commit. The primary benefit of this method is that the project’s history does not change, and there is no risk of breaking someone else’s work.
These authors can unblock this PR by adding a new commit to this branch with the following text in their commit message:
Andrew Jandacek <andrew.jandacek@broadcom.com>
DCO Remediation Commit for Andrew Jandacek <andrew.jandacek@broadcom.com>
I, Andrew Jandacek <andrew.jandacek@broadcom.com>, hereby add my Signed-off-by to this commit: 89c6c2d6613f3d9c3887c5f49a0173a71131d10f
Signed-off-by: Andrew Jandacek <andrew.jandacek@broadcom.com>
Nafi Xhafa <nafi.xhafa@broadcom.com>
DCO Remediation Commit for Nafi Xhafa <nafi.xhafa@broadcom.com>
I, Nafi Xhafa <nafi.xhafa@broadcom.com>, hereby add my Signed-off-by to this commit: db2202c1286ab0d3585958898e71f017228ef68f
Signed-off-by: Nafi Xhafa <nafi.xhafa@broadcom.com>
Please note: You should avoid adding empty commits (i.e., git commit -s --allow-empty), because these will be discarded if someone rebases the branch / repo.
Alternate method: An employer adds a DCO Remediation Commit
If the contents of this commit were contributed on behalf of a third party (generally, the author’s employer), an authorized individual may add a Third-Party DCO Remediation Commit. This may be necessary if the original author is unavailable to add their own DCO Remediation Commit to this branch.
If you are about to add a Third-Party DCO Remediation Commit under DCO section (b) or (c), be sure you are authorized by your employer to take this action. Generally speaking, maintainers and other project contributors cannot sign off on behalf of project contributors, unless there is some relationship which permits this action. It is your responsibility to verify this.
This PR can be unblocked by an authorized third party adding one or more new commits to this branch with the following text in the commit message. Replace YOUR_COMPANY with your company name, YOUR_NAME with the name of the authorized representative, and YOUR_EMAIL with the representative’s email address.
For the sake of clarity, please use a separate commit per author:
On behalf of Andrew Jandacek <andrew.jandacek@broadcom.com>
Third-Party DCO Remediation Commit for Andrew Jandacek <andrew.jandacek@broadcom.com>
On behalf of Andrew Jandacek <andrew.jandacek@broadcom.com>, I, YOUR_NAME <YOUR_EMAIL>, hereby add my Signed-off-by to this commit: 89c6c2d6613f3d9c3887c5f49a0173a71131d10f
Signed-off-by: YOUR_NAME <YOUR_EMAIL>
On behalf of Nafi Xhafa <nafi.xhafa@broadcom.com>
Third-Party DCO Remediation Commit for Nafi Xhafa <nafi.xhafa@broadcom.com>
On behalf of Nafi Xhafa <nafi.xhafa@broadcom.com>, I, YOUR_NAME <YOUR_EMAIL>, hereby add my Signed-off-by to this commit: db2202c1286ab0d3585958898e71f017228ef68f
Signed-off-by: YOUR_NAME <YOUR_EMAIL>
Least preferred method: Rebase the branch
If you have a local git environment and meet the criteria below, one option is to rebase the branch and add your Signed-off-by lines in the new commits. Please note that if others have already begun work based upon the commits in this branch, this solution will rewrite history and may cause serious issues for collaborators (described in the git documentation under "The Perils of Rebasing").
You should only do this if:
- You are the only author of the commits in this branch
- You are absolutely certain nobody else is doing any work based upon this branch
- There are no empty commits in the branch (for example, a DCO Remediation Commit which was added using
--allow-empty)
To add your Signed-off-by line to every commit in this branch:
- Ensure you have a local copy of your branch by checking out the pull request locally via command line.
- In your local branch, run:
git rebase HEAD~199 --signoff - Force push your changes to overwrite the branch:
git push --force-with-lease origin janan07/otel-feature-branch
Summary
Commit sha: 89c6c2d, Author: Andrew Jandacek, Committer: Andrew Jandacek; The sign-off is missing.
Commit sha: db2202c, Author: Nafi Xhafa, Committer: Nafi Xhafa; The sign-off is missing.