server: update OpenTelemetry to 1.0.1 #13361

vooon · 2021-09-21T08:51:11Z

Update API of the OpenTelemetry library and updates gRPC to 1.40.0.

Fixes #13141

server/embed/config_tracing.go

server/go.mod

hexfusion · 2021-09-22T00:17:44Z

cc @lilic

lilic

Thank you! lgtm

lilic · 2021-09-27T09:05:09Z

cc @dashpole kube should probably bump as well, if you haven't already.

ptabor · 2021-10-01T16:46:14Z

FAIL: inconsistent versions for depencency: github.com/spf13/cobra
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/pkg/v3
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/etcdctl/v3
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/etcdutl/v3
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/server/v3
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/tests/v3
FAIL: inconsistent versions for depencency: go.uber.org/zap
  - github.com/spf13/[email protected] from: go.etcd.io/etcd/v3
  - go.uber.org/[email protected] from: go.etcd.io/etcd/client/pkg/v3
FAIL: inconsistent versions for depencency: google.golang.org/genproto
  - go.uber.org/[email protected] from: go.etcd.io/etcd/client/v3
  - go.uber.org/[email protected] from: go.etcd.io/etcd/pkg/v3
  - go.uber.org/[email protected] from: go.etcd.io/etcd/etcdctl/v3
  - go.uber.org/[email protected] from: go.etcd.io/etcd/etcdutl/v3
  - go.uber.org/[email protected] from: go.etcd.io/etcd/server/v3
  - go.uber.org/[email protected] from: go.etcd.io/etcd/tests/v3
  - go.uber.org/[email protected] from: go.etcd.io/etcd/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/api/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/server/v3
FAIL: inconsistent versions for depencency: google.golang.org/grpc
  - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/[email protected] from: go.etcd.io/etcd/server/v3
FAIL: inconsistent dependencies
  - google.golang.org/[email protected] from: go.etcd.io/etcd/api/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/client/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/pkg/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/etcdctl/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/server/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/tests/v3
  - google.golang.org/[email protected] from: go.etcd.io/etcd/v3
FAIL: 'dep' failed at Fri Oct  1 16:44:34 UTC 2021

vooon · 2021-10-02T10:19:33Z

@ptabor could you please tell me how to fix that?

ptabor · 2021-10-02T12:34:45Z

Please call:

  ./scripts/update_dep.sh github.com/spf13/cobra v1.2.1
  ...
   ./scripts/update_dep.sh google.golang.org/grpc v1.40.0

to make sure all etcd modules point on the same version of a dependency.

vooon · 2021-10-03T19:08:54Z

@ptabor done. But probably we could update to OTEL 1.0.1 and gRPC 1.41.0 already.

ptabor · 2021-10-05T10:07:29Z

I think that something zap? grpc? is introducing a cyclic dependency on etcd,
that causes the tests to fail:

% (cd pkg && 'go' 'build' './...')
stderr: go: github.com/spf13/[email protected] requires
stderr: github.com/spf13/[email protected] requires
stderr: github.com/bketelsen/[email protected] requires
stderr: go.etcd.io/etcd/client/[email protected] requires
stderr: go.etcd.io/etcd/api/[email protected] (replaced by ./FORBIDDEN_DEPENDENCY): reading FORBIDDEN_DEPENDENCY/go.mod: open /home/runner/work/etcd/etcd/pkg/FORBIDDEN_DEPENDENCY/go.mod: no such file or directory
FAIL: (code:1):

Update API of the OpenTelemetry library and updates gRPC to 1.41.0. Fixes etcd-io#13141 Signed-off-by: Vladimir Ermakov <[email protected]>

vooon · 2021-10-13T10:55:14Z

@ptabor done several rebases to reduce deps changes. I hope this time it'll work.

To fix dependencies. Signed-off-by: Vladimir Ermakov <[email protected]>

vooon · 2021-10-13T11:10:40Z

@ptabor forgot to add update_dep for grpc, fixed.

vooon · 2021-10-13T15:22:52Z

@ptabor i do not know why grpcproxy failed. Maybe it needs some changes for gRPC 1.41.0?

vooon · 2021-10-20T10:10:54Z

Hmm, i can't reproduce that problem.

etcd$ PASSES=grpcproxy ./test.sh
Running with --race
Starting at: Ср 20 окт 2021 12:45:22 MSK

'grpcproxy' started at Ср 20 окт 2021 12:45:22 MSK
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration')
ok  	go.etcd.io/etcd/tests/v3/integration	222.059s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/client')
ok  	go.etcd.io/etcd/tests/v3/integration/client	0.200s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/client/examples')
ok  	go.etcd.io/etcd/tests/v3/integration/client/examples	0.176s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3	108.630s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3/concurrency')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3/concurrency	3.276s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3/connectivity')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3/connectivity	33.161s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3/examples')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3/examples	1.699s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3/experimental/recipes')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3/experimental/recipes	4.519s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3/lease')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3/lease	120.534s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3/naming')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3/naming	0.781s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/clientv3/snapshot')
ok  	go.etcd.io/etcd/tests/v3/integration/clientv3/snapshot	1.492s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/embed')
ok  	go.etcd.io/etcd/tests/v3/integration/embed	0.018s [no tests to run]
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/proxy/grpcproxy')
ok  	go.etcd.io/etcd/tests/v3/integration/proxy/grpcproxy	1.998s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/snapshot')
ok  	go.etcd.io/etcd/tests/v3/integration/snapshot	13.242s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/integration/v2store')
ok  	go.etcd.io/etcd/tests/v3/integration/v2store	1.087s
% (cd tests && 'env' 'go' 'test' '-timeout=30m' '-tags' 'cluster_proxy' '--race' 'go.etcd.io/etcd/tests/v3/e2e')
ok  	go.etcd.io/etcd/tests/v3/e2e	342.574s
'grpcproxy' completed at Ср 20 окт 2021 12:59:53 MSK
SUCCESS

albertvaka · 2021-11-23T19:22:53Z

Are there any plans for a new release that includes this change? @ptabor
Context: We need this change so OpenTelemetry can be updated on Kubernetes as well.

serathius · 2021-11-24T09:26:24Z

This should be included in v3.6 which is planned for Dec 15, however with current progress on tasks in milestone I expect that we will slip.

serathius reviewed Sep 21, 2021

View reviewed changes

server/embed/config_tracing.go Outdated Show resolved Hide resolved

serathius reviewed Sep 21, 2021

View reviewed changes

server/go.mod Outdated Show resolved Hide resolved

vooon force-pushed the otel-1.0.0 branch from f8aba24 to 93e4d87 Compare September 21, 2021 13:20

lilic approved these changes Sep 27, 2021

View reviewed changes

ptabor approved these changes Oct 1, 2021

View reviewed changes

ptabor changed the title ~~server: update OpenTelemetry to 1.0.0~~ server: update OpenTelemetry to 1.0.1 Oct 4, 2021

server: update OpenTelemetry to 1.0.1

4f4b12d

Update API of the OpenTelemetry library and updates gRPC to 1.41.0. Fixes etcd-io#13141 Signed-off-by: Vladimir Ermakov <[email protected]>

vooon force-pushed the otel-1.0.0 branch from cb0f99d to c450818 Compare October 13, 2021 10:52

run fix.sh

49a8aa7

To fix dependencies. Signed-off-by: Vladimir Ermakov <[email protected]>

vooon force-pushed the otel-1.0.0 branch from c450818 to 49a8aa7 Compare October 13, 2021 11:08

ptabor approved these changes Oct 20, 2021

View reviewed changes

ptabor merged commit 8aa6ae9 into etcd-io:main Oct 20, 2021

vooon deleted the otel-1.0.0 branch October 20, 2021 14:42

mx-psi mentioned this pull request Nov 18, 2021

Use of outdated OpenTelemetry Go package kubernetes/kubernetes#106536

Closed

serathius added this to the etcd-v3.6 milestone Nov 24, 2021

serathius mentioned this pull request Dec 15, 2021

Plans for v3.6.0 release #13538

Open

ahrtr mentioned this pull request Aug 5, 2022

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

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

server: update OpenTelemetry to 1.0.1 #13361

server: update OpenTelemetry to 1.0.1 #13361

vooon commented Sep 21, 2021

hexfusion commented Sep 22, 2021

lilic left a comment

lilic commented Sep 27, 2021

ptabor commented Oct 1, 2021

vooon commented Oct 2, 2021

ptabor commented Oct 2, 2021

vooon commented Oct 3, 2021

ptabor commented Oct 5, 2021

vooon commented Oct 13, 2021

vooon commented Oct 13, 2021

vooon commented Oct 13, 2021

vooon commented Oct 20, 2021

albertvaka commented Nov 23, 2021

serathius commented Nov 24, 2021

server: update OpenTelemetry to 1.0.1 #13361

server: update OpenTelemetry to 1.0.1 #13361

Conversation

vooon commented Sep 21, 2021

hexfusion commented Sep 22, 2021

lilic left a comment

Choose a reason for hiding this comment

lilic commented Sep 27, 2021

ptabor commented Oct 1, 2021

vooon commented Oct 2, 2021

ptabor commented Oct 2, 2021

vooon commented Oct 3, 2021

ptabor commented Oct 5, 2021

vooon commented Oct 13, 2021

vooon commented Oct 13, 2021

vooon commented Oct 13, 2021

vooon commented Oct 20, 2021

albertvaka commented Nov 23, 2021

serathius commented Nov 24, 2021