[chore] Update uses of configgrpc for v0.111 #35580
Closed
Conversation
This file contains 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
github-actions
bot
added
cmd/githubgen
cmd/opampsupervisor
cmd/otelcontribcol
jade-guiton-dd
requested review from
andrzej-stencel,
crobert-1,
dashpole,
atoulme,
jmacd,
dmitryax,
codeboten,
fatsheep9146,
jpkrohling,
TylerHelmuth,
yurishkuro,
mx-psi,
bogdandrutu,
evan-bradley,
songy23,
tigrannajaryan,
mwear and
jsuereth
as code owners
TylerHelmuth
added
the
Skip Changelog
TylerHelmuth
approved these changes
Oct 3, 2024
dmitryax
approved these changes
Oct 3, 2024
dmitryax
reviewed
Oct 3, 2024
| @@ -50,9 +50,9 @@ extensions: | |||
| - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension v0.110.0 | |||
|
|
|||
| exporters: | |||
| - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.110.0 | |||
| - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.110.1-0.20240927195042-40396d5fc50c | |||
| - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.110.0 | |||
There was a problem hiding this comment.
Can you please update all the core modules so we have a consistent snapshot of the core repo?
|
Superseded by #35598, thanks Jade for the PR, we had to make a quick update for the v0.111.0 release so this was included in that PR |
6 tasks
MovieStoreGuy
pushed a commit
that referenced
this pull request
Oct 22, 2024
**Description:** When working on #35580, it seemed that `make update-otel` was not properly updating the `builder-config.yaml` files. I traced this down to the `updatehelper` script not working as intended. This turned out to be because it uses some features of the `sed` utility which do not exist on macOS, causing no updates to be made. The `\s` (whitespace) regex class is a GNU extension for `sed`; the POSIX-compatible equivalent is `[[:space:]]` ([related SO question](https://stackoverflow.com/questions/18840175/find-and-replace-with-spaces-using-sed-mac-terminal)). Moreover, on macOS, the `-i` (in-place) option requires an argument, even if empty; otherwise the `-e` following it is parsed as that argument, creating an unnecessary backup file ([related SO question](https://stackoverflow.com/questions/4247068/sed-command-with-i-option-failing-on-mac-but-works-on-linux)). **Testing:** I manually tested this change as part of developing the aforementioned PR; the script seems to work on macOS now. It would be good for someone to test this change on Linux to make sure nothing has broken there.
sbylica-splunk
pushed a commit
to sbylica-splunk/opentelemetry-collector-contrib
that referenced
this pull request
Dec 17, 2024
**Description:** When working on open-telemetry#35580, it seemed that `make update-otel` was not properly updating the `builder-config.yaml` files. I traced this down to the `updatehelper` script not working as intended. This turned out to be because it uses some features of the `sed` utility which do not exist on macOS, causing no updates to be made. The `\s` (whitespace) regex class is a GNU extension for `sed`; the POSIX-compatible equivalent is `[[:space:]]` ([related SO question](https://stackoverflow.com/questions/18840175/find-and-replace-with-spaces-using-sed-mac-terminal)). Moreover, on macOS, the `-i` (in-place) option requires an argument, even if empty; otherwise the `-e` following it is parsed as that argument, creating an unnecessary backup file ([related SO question](https://stackoverflow.com/questions/4247068/sed-command-with-i-option-failing-on-mac-but-works-on-linux)). **Testing:** I manually tested this change as part of developing the aforementioned PR; the script seems to work on macOS now. It would be good for someone to test this change on Linux to make sure nothing has broken there.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
In v0.110 of the core libraries, new versions of
ClientConfig.ToClientConnandServerConfig.ToServerfromconfiggrpcwere added to support a new option type, and the old versions were deprecated. Contrib was updated in #35352.In v0.111, the old versions will be removed, and the new versions will be renamed back to the original names, with deprecated aliases remaining for one more version (cf. this PR).
This PR updates the core libraries to a pre-release version past this PR and updates Contrib to match this change (simply rename
ToClientConnWithOptions/ToServerWithOptionstoToClientConn/ToServer).Link to tracking Issue:
Part of #9480 on Core