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

*: Upgrade to use go.opentelemetry.io/otel@v1.2.0 #13498

Merged
merged 1 commit into from Nov 25, 2021

Conversation

KushalP
Copy link
Contributor

@KushalP KushalP commented Nov 24, 2021

Upgrading from v1.0.1.

Upgrading related dependencies

The following dependencies also had to be upgraded:

  • go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.26.1
    From v0.25.0. This gets rid of a transitive dependency on go.opentelemetry.io/otel@v1.0.1.
  • google.golang.org/genproto@v0.0.0-20211118181313-81c1377c94b1

@serathius
Copy link
Member

/cc @hexfusion @ptabor

@hexfusion
Copy link
Contributor

hexfusion commented Nov 24, 2021

Thanks for the PR does this change in grpc-go regarding unix sockets[1] affect us?

[1] grpc/grpc-go#4817
ref: https://github.com/grpc/grpc-go/releases/tag/v1.42.0

@KushalP
Copy link
Contributor Author

KushalP commented Nov 24, 2021

Thanks for the PR does this change in grpc-go regarding unix sockets[1] affect us?

Looks like there's already code in place to deal with the relative path case: https://github.com/etcd-io/etcd/blob/main/client/v3/internal/endpoint/endpoint.go#L103

@hexfusion
Copy link
Contributor

hexfusion commented Nov 24, 2021

try running scripts/fix.sh to cleanup the deps failing in static [1]

[1] https://github.com/etcd-io/etcd/runs/4313064751?check_suite_focus=true

@KushalP KushalP force-pushed the upgrade-otel-version branch 3 times, most recently from c34369b to bf8b05e Compare November 24, 2021 14:31
@KushalP
Copy link
Contributor Author

KushalP commented Nov 24, 2021

@hexfusion thanks for the tip about scripts/fix.sh ! I had to amend the last commit here. I've made sure all commits here work cleanly with that script. I'll also update the PR title and description as it's slightly larger than what was originally intended here.

@hexfusion
Copy link
Contributor

once tests are green let's squash these commits please, thanks!

@KushalP
Copy link
Contributor Author

KushalP commented Nov 24, 2021

Is it normal for some of these builds to take 30+ minutes to complete?

@hexfusion
Copy link
Contributor

looks like the tests are in a pending state might be some sort of throttling, but it is not expected.

@KushalP KushalP force-pushed the upgrade-otel-version branch 2 times, most recently from 267a1e7 to 968abba Compare November 24, 2021 15:51
@KushalP
Copy link
Contributor Author

KushalP commented Nov 24, 2021

Have squashed this change into a single commit as requested. I've also moved grpc-go back to v1.41.0 so there's less of a concern about this change.

Upgrading from v1.0.1.

Upgrading related dependencies
------------------------------

The following dependencies also had to be upgraded:

- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.26.1
  From v0.25.0. This gets rid of a transitive dependency on go.opentelemetry.io/otel@v1.0.1.
- google.golang.org/genproto@v0.0.0-20211118181313-81c1377c94b1
@KushalP
Copy link
Contributor Author

KushalP commented Nov 24, 2021

Amended the commit message and PR description as they both referenced a newer version that isn't part of the diff here.

@hexfusion
Copy link
Contributor

cc @hasbro17 @dusk125 PTAL

@dusk125
Copy link
Contributor

dusk125 commented Nov 24, 2021

Looks good to me

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 @KushalP

@hexfusion hexfusion merged commit 7572a61 into etcd-io:main Nov 25, 2021
@KushalP KushalP deleted the upgrade-otel-version branch November 25, 2021 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants