d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

downgrade opentelemetry to avoid the library conflicts

Browse Source
This commit is contained in:
yabuchan
2022-07-04 19:15:45 +09:00
parent 801b44543c
commit 36397f80c2
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
go.mod
View File

@@ -9,7 +9,7 @@ require (
github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 // indirect
github.com/google/go-cmp v0.5.7
github.com/google/go-cmp v0.5.6
github.com/gorilla/mux v1.7.3
github.com/mitchellh/go-homedir v1.1.0
github.com/pkg/errors v0.9.1
@@ -18,9 +18,9 @@ require (
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
go.opencensus.io v0.22.2
go.opentelemetry.io/otel v1.7.0
go.opentelemetry.io/otel/sdk v1.7.0
go.opentelemetry.io/otel/trace v1.7.0
go.opentelemetry.io/otel v1.2.0
go.opentelemetry.io/otel/sdk v1.2.0
go.opentelemetry.io/otel/trace v1.2.0
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
@@ -35,3 +35,11 @@ require (
k8s.io/utils v0.0.0-20200912215256-4140de9c8800
sigs.k8s.io/controller-runtime v0.7.1
)
replace (
// Note: Latest opentelemetry (v1.7.0) requires go-logr/logr v1.2 which conflicts with k8s.io/apimachinery.
// Safe to bump up to opentelemetry (v1.7.0) by removing these lines once k8s.io/apimachinery is updated.
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.2.0
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.2.0
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.2.0
)