-
Notifications
You must be signed in to change notification settings - Fork 9.8k
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
[3.5] etcdserver: bump OpenTelemetry to 1.0.1 and gRPC to 1.41.0 #14312
Merged
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
ahrtr
force-pushed
the
3.5_bump_otl
branch
7 times, most recently
from
August 4, 2022 23:57
28b114c
to
18a87dd
Compare
ahrtr
changed the title
etcdserver: bump OpenTelemetry to 1.0.1
[3.5] etcdserver: bump OpenTelemetry to 1.0.1
Aug 5, 2022
ahrtr
changed the title
[3.5] etcdserver: bump OpenTelemetry to 1.0.1
[3.5] etcdserver: bump OpenTelemetry to 1.0.1 and gRPC to 1.41.0
Aug 5, 2022
cc @spzala @ptabor @serathius Please take a look, thx. |
Signed-off-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Benjamin Wang <wachao@vmware.com>
Upgrade grpc to 1.41.0; Run ./script/fix.sh to fix all related issue. Signed-off-by: Benjamin Wang <wachao@vmware.com>
Refer to etcd-io@a0bdfc4 Signed-off-by: Benjamin Wang <wachao@vmware.com>
Refer to etcd-io#14318 Signed-off-by: Benjamin Wang <wachao@vmware.com>
spzala
approved these changes
Aug 8, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Thanks, @ahrtr !! Please squash commits before merging.
dashpole
approved these changes
Aug 8, 2022
Thanks @dashpole for the review as well. |
zmt
added a commit
to zmt/m3
that referenced
this pull request
Aug 13, 2022
See etcd-io/etcd#14312 for details.
zmt
added a commit
to zmt/m3
that referenced
this pull request
Aug 13, 2022
See etcd-io/etcd#14312 for details. Signed-off-by: Zack Train <ztrain@uber.com>
zmt
added a commit
to zmt/m3
that referenced
this pull request
Aug 13, 2022
See etcd-io/etcd#14312 for details. Signed-off-by: Zack Train <ztrain@uber.com>
zmt
added a commit
to zmt/m3
that referenced
this pull request
Aug 13, 2022
See etcd-io/etcd#14312 for details. Signed-off-by: Zack Train <ztrain@uber.com>
zmt
added a commit
to zmt/m3
that referenced
this pull request
Aug 13, 2022
See etcd-io/etcd#14312 for details of the needed PR. Incidentally remove the go.etcd.io/etcd/client/v2 replace directive since M3 is already on go 1.17 and release-3.5 branch indirectly pulls in v2.305.4 which does exhibit the problem with sigs.k8s.io/json: ``` % go mod why sigs.k8s.io/json (main module does not need package sigs.k8s.io/json) ``` Signed-off-by: Zack Train <ztrain@uber.com>
zmt
added a commit
to zmt/m3
that referenced
this pull request
Aug 13, 2022
See etcd-io/etcd#14312 for details of the needed PR. Incidentally remove the go.etcd.io/etcd/client/v2 replace directive since M3 is already on go 1.17 and release-3.5 branch indirectly pulls in v2.305.4 which does exhibit the problem with sigs.k8s.io/json: ``` % go mod why sigs.k8s.io/json (main module does not need package sigs.k8s.io/json) ``` Signed-off-by: Zack Train <ztrain@uber.com>
zmt
added a commit
to zmt/m3
that referenced
this pull request
Aug 13, 2022
See etcd-io/etcd#14312 for details of the needed PR. Rewrite integration package imports from the 3.6.0.alpha.0 path to the 3.5.5 path. Incidentally remove the go.etcd.io/etcd/client/v2 replace directive since M3 is already on go 1.17 and release-3.5 branch indirectly pulls in v2.305.4 which does exhibit the problem with sigs.k8s.io/json: ``` % go mod why sigs.k8s.io/json (main module does not need package sigs.k8s.io/json) ``` Signed-off-by: Zack Train <ztrain@uber.com>
andrewmains12
pushed a commit
to m3db/m3
that referenced
this pull request
Aug 16, 2022
* Downgrade etcd to release-3.5 branch with otel fix. See etcd-io/etcd#14312 for details of the needed PR. Rewrite integration package imports from the 3.6.0.alpha.0 path to the 3.5.5 path. Incidentally remove the go.etcd.io/etcd/client/v2 replace directive since M3 is already on go 1.17 and release-3.5 branch indirectly pulls in v2.305.4 which does exhibit the problem with sigs.k8s.io/json: ``` % go mod why sigs.k8s.io/json (main module does not need package sigs.k8s.io/json) ``` Signed-off-by: Zack Train <ztrain@uber.com> * Fix etcd/integration tests to use V3. Signed-off-by: Zack Train <ztrain@uber.com> * Missed edit for ClusterV3. Signed-off-by: Zack Train <ztrain@uber.com> Signed-off-by: Zack Train <ztrain@uber.com>
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.
Fix #14311 by cherry picking #13361 to 3.5.
Signed-off-by: Benjamin Wang wachao@vmware.com
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.