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

[8.x](backport #5720) Update all inconsistent OTel dependencies to v0.110.0 #5737

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2024

There were some dependencies that dependabot missed updating due to failures in dependabot runs (example: https://github.com/elastic/elastic-agent/actions/runs/11153122424/job/31000038669). This is causing all future runs to fail as well. This PR attempts to fix the current branch so that future dependabot PRs are correctly updated.


This is an automatic backport of pull request #5720 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner October 8, 2024 08:38
@mergify mergify bot requested review from andrzej-stencel and swiatekm and removed request for a team October 8, 2024 08:38
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 8, 2024
Copy link
Contributor Author

mergify bot commented Oct 8, 2024

Cherry-pick of bfef4fa has failed:

On branch mergify/bp/8.x/pr-5720
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit bfef4fa0a1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@lahsivjar
Copy link
Contributor

lahsivjar commented Oct 8, 2024

I noticed that the mergify bot added the backport label back after I removed it - this should not be required for the 8.x branch since it is still on v0.109 of the collector.

This is not correct, all PRs have to go to 8.x branch.

@lahsivjar lahsivjar closed this Oct 8, 2024
@lahsivjar lahsivjar reopened this Oct 8, 2024
Copy link
Contributor Author

mergify bot commented Oct 8, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-5720 upstream/mergify/bp/8.x/pr-5720
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-5720

@swiatekm swiatekm force-pushed the mergify/bp/8.x/pr-5720 branch 2 times, most recently from ad707eb to 28cd733 Compare October 9, 2024 11:17
Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>
(cherry picked from commit bfef4fa)

Fix conflicts
@swiatekm swiatekm force-pushed the mergify/bp/8.x/pr-5720 branch from 28cd733 to 6c02d54 Compare October 9, 2024 11:31
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@swiatekm swiatekm merged commit 582a260 into 8.x Oct 9, 2024
14 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.x/pr-5720 branch October 9, 2024 14:08
swiatekm added a commit that referenced this pull request Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants