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.

Sign up for GitHub

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

Jump to bottom

[3.5] etcdserver: bump OpenTelemetry to 1.0.1 and gRPC to 1.41.0 #14312

Merged
merged 5 commits into from
Aug 8, 2022
Merged

[3.5] etcdserver: bump OpenTelemetry to 1.0.1 and gRPC to 1.41.0 #14312

merged 5 commits into from
Aug 8, 2022

Conversation

ahrtr
Copy link
Member

@ahrtr ahrtr commented Aug 4, 2022 •
edited
Loading

Fix #14311 by cherry picking #13361 to 3.5.

Signed-off-by: Benjamin Wang [email protected]

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

@ahrtr ahrtr marked this pull request as draft August 4, 2022 22:08
@ahrtr ahrtr force-pushed the 3.5_bump_otl branch 7 times, most recently from 28b114c to 18a87dd Compare August 4, 2022 23:57
@ahrtr ahrtr changed the title etcdserver: bump OpenTelemetry to 1.0.1 [3.5] etcdserver: bump OpenTelemetry to 1.0.1 Aug 5, 2022
@ahrtr 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
@ahrtr ahrtr marked this pull request as ready for review August 5, 2022 04:46
@ahrtr
Copy link
Member Author

ahrtr commented Aug 5, 2022

cc @spzala @ptabor @serathius Please take a look, thx.

cc @nikhita @dims

@ahrtr ahrtr mentioned this pull request Aug 5, 2022
Merged
ahrtr added 4 commits August 7, 2022 07:16
@ahrtr
etcdserver: bump OpenTelemetry to 1.0.1
2d7e490 
Signed-off-by: Benjamin Wang <[email protected]>
@ahrtr
move setupTracing into a separate file config_tracing.go
5a86ae2 
Signed-off-by: Benjamin Wang <[email protected]>
@ahrtr
update all related dependencies
2751c61 
Upgrade grpc to 1.41.0;
Run ./script/fix.sh to fix all related issue.

Signed-off-by: Benjamin Wang <[email protected]>
@ahrtr
Fix the failure in TestEndpointSwitchResolvesViolation
8c5f110 
Refer to etcd-io@a0bdfc4

Signed-off-by: Benjamin Wang <[email protected]>
@ahrtr
Copy link
Member Author

ahrtr commented Aug 6, 2022

cc @dashpole

Just rebased the PR to merge @damemi 's PR #14318

spzala
spzala approved these changes Aug 8, 2022
View reviewed changes
Copy link
Member

@spzala spzala left a 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.

@ahrtr
Copy link
Member Author

ahrtr commented Aug 8, 2022

lgtm Thanks, @ahrtr !! Please squash commits before merging.

Thanks @spzala . I intentionally created a separate commit for each different kind of change for better review and future archaeology (debug).

@ahrtr
Copy link
Member Author

ahrtr commented Aug 8, 2022

Thanks @dashpole for the review as well.

@ahrtr ahrtr merged commit 9e95685 into etcd-io:release-3.5 Aug 8, 2022
@spzala
Copy link
Member

spzala commented Aug 8, 2022

lgtm Thanks, @ahrtr !! Please squash commits before merging.

Thanks @spzala . I intentionally created a separate commit for each different kind of change for better review and future archaeology (debug).

Ok, cool. Thanks @ahrtr !!

@ahrtr ahrtr mentioned this pull request Aug 11, 2022
Closed
@zmt zmt mentioned this pull request Aug 12, 2022
Closed
16 tasks
zmt added a commit to zmt/m3 that referenced this pull request Aug 13, 2022
@zmt
Use etcd release-3.5 branch with otel fix.
bc95d97 
See etcd-io/etcd#14312 for details.
zmt added a commit to zmt/m3 that referenced this pull request Aug 13, 2022
@zmt
Use etcd release-3.5 branch with otel fix.
83f1e05 
See etcd-io/etcd#14312 for details.

Signed-off-by: Zack Train <[email protected]>
zmt added a commit to zmt/m3 that referenced this pull request Aug 13, 2022
@zmt
Use etcd release-3.5 branch with otel fix.
2541514 
See etcd-io/etcd#14312 for details.

Signed-off-by: Zack Train <[email protected]>
zmt added a commit to zmt/m3 that referenced this pull request Aug 13, 2022
@zmt
Downgrade etcd to release-3.5 branch with otel fix.
ea9e8f4 
See etcd-io/etcd#14312 for details.

Signed-off-by: Zack Train <[email protected]>
zmt added a commit to zmt/m3 that referenced this pull request Aug 13, 2022
@zmt
Downgrade etcd to release-3.5 branch with otel fix.
bdf07e6 
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 <[email protected]>
zmt added a commit to zmt/m3 that referenced this pull request Aug 13, 2022
@zmt
Downgrade etcd to release-3.5 branch with otel fix.
63f1eda 
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 <[email protected]>
zmt added a commit to zmt/m3 that referenced this pull request Aug 13, 2022
@zmt
Downgrade etcd to release-3.5 branch with otel fix.
6b1facc 
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 <[email protected]>
@zmt zmt mentioned this pull request Aug 15, 2022
Merged
andrewmains12 pushed a commit to m3db/m3 that referenced this pull request Aug 16, 2022
@zmt
[etcd] Downgrade to release-3.5 branch with otel fix. (#4139)
64acc90 
* 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 <[email protected]>

* Fix etcd/integration tests to use V3.

Signed-off-by: Zack Train <[email protected]>

* Missed edit for ClusterV3.

Signed-off-by: Zack Train <[email protected]>

Signed-off-by: Zack Train <[email protected]>
@ahrtr ahrtr mentioned this pull request Sep 8, 2022
Closed
@kaiyou kaiyou mentioned this pull request Sep 18, 2022
Closed
@chaochn47 chaochn47 mentioned this pull request Oct 13, 2023
Closed
24 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spzala spzala spzala approved these changes

@dashpole dashpole dashpole approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ahrtr @spzala @dashpole