Temporary workaround to pull in fix https://github.com/open-telemetry/opentelemetry-collector/pull/10560 #5105
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atoulme
reviewed
Jul 16, 2024
| @@ -64,7 +64,7 @@ jobs: | |||
| make install-tools | |||
| make for-all CMD="make tidy" | |||
| if ! git diff --exit-code; then | |||
| echo "One or more Go files are not tidied. Run 'make for-all CMD="make tidy"' and push the changes." | |||
| echo "One or more Go files are not tidied. Run 'make for-all CMD=\"make tidy\"' and push the changes." | |||
atoulme
reviewed
Jul 16, 2024
| @@ -643,3 +643,12 @@ replace ( | |||
|
|
|||
| // Required for github.com/hashicorp/[email protected] | |||
| replace github.com/pires/go-proxyproto v1.0.0 => github.com/peteski22/go-proxyproto v1.0.0 | |||
|
|
|||
| // TODO: Remove with v0.105.0 release, temporary workaround to pull in fix https://github.com/open-telemetry/opentelemetry-collector/pull/10560 | |||
There was a problem hiding this comment.
don't do replaces just update the version in. the dependencies.
|
Probably not needed anymore since #5110 should include the fix. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description: