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.14](backport #4638) Use otel version 0.97.0 #4714

Merged
merged 2 commits into from
May 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 8, 2024

Otel versions >0.97.0 have a bug where they expose metrics on :8888 even for validate subcommands causing our tests to fail.

related to this issue here: open-telemetry/opentelemetry-collector#10031
cause by pull open-telemetry/opentelemetry-collector#9257

Closes: #4617


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

* Use version 0.97.0

---------

Co-authored-by: Shaunak Kashyap <[email protected]>
(cherry picked from commit a3900f0)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
#	internal/pkg/otel/run.go
@mergify mergify bot requested a review from a team as a code owner May 8, 2024 17:03
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 8, 2024
@mergify mergify bot requested review from andrzej-stencel and pchila and removed request for a team May 8, 2024 17:03
Copy link
Contributor Author

mergify bot commented May 8, 2024

Cherry-pick of a3900f0 has failed:

On branch mergify/bp/8.14/pr-4638
Your branch is up to date with 'origin/8.14'.

You are currently cherry-picking commit a3900f0324.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@ycombinator ycombinator merged commit d003d2a into 8.14 May 8, 2024
9 checks passed
@ycombinator ycombinator deleted the mergify/bp/8.14/pr-4638 branch May 8, 2024 18:40
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