From 13307c7caed18f84e5440dfd52f4bc2b469c2248 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 8 Mar 2021 12:57:45 -0800 Subject: [PATCH] Ubgrade all packages to use backoff/v4 (#2616) Signed-off-by: Bogdan Drutu --- exporter/elasticsearchexporter/exporter.go | 2 +- exporter/elasticsearchexporter/go.mod | 2 +- exporter/uptraceexporter/go.sum | 1 - internal/common/go.mod | 2 +- internal/common/go.sum | 4 ++-- internal/common/testing/container/container.go | 2 +- receiver/redisreceiver/go.sum | 1 + 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/exporter/elasticsearchexporter/exporter.go b/exporter/elasticsearchexporter/exporter.go index f93c3aaea620..dad0ba65465e 100644 --- a/exporter/elasticsearchexporter/exporter.go +++ b/exporter/elasticsearchexporter/exporter.go @@ -25,7 +25,7 @@ import ( "net/http" "time" - "github.com/cenkalti/backoff" + "github.com/cenkalti/backoff/v4" elasticsearch7 "github.com/elastic/go-elasticsearch/v7" esutil7 "github.com/elastic/go-elasticsearch/v7/esutil" "go.opentelemetry.io/collector/consumer/pdata" diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 2029596601c6..4461091be5ef 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasti go 1.14 require ( - github.com/cenkalti/backoff v2.2.1+incompatible + github.com/cenkalti/backoff/v4 v4.1.0 github.com/elastic/go-elasticsearch/v7 v7.11.0 github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector v0.21.1-0.20210308033310-65c4c4a1b383 diff --git a/exporter/uptraceexporter/go.sum b/exporter/uptraceexporter/go.sum index 0576acd59935..c05b57facf15 100644 --- a/exporter/uptraceexporter/go.sum +++ b/exporter/uptraceexporter/go.sum @@ -649,7 +649,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.12 h1:famVnQVu7QwryBN4jNseQdUKES71ZAOnB6UQQJPZvqk= github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= diff --git a/internal/common/go.mod b/internal/common/go.mod index aca15470ea56..3556c6b3f307 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/Microsoft/go-winio v0.4.14 // indirect - github.com/cenkalti/backoff v2.2.1+incompatible + github.com/cenkalti/backoff/v4 v4.1.0 github.com/containerd/containerd v1.3.6 // indirect github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/docker v20.10.4+incompatible diff --git a/internal/common/go.sum b/internal/common/go.sum index 8bd1460192ea..3b4e889f08e3 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -4,8 +4,8 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff/v4 v4.1.0 h1:c8LkOFQTzuO0WBM/ae5HdGQuZPfPxp7lqBRwQRm4fSc= +github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/internal/common/testing/container/container.go b/internal/common/testing/container/container.go index 738e2bb33bc4..b38560911b56 100644 --- a/internal/common/testing/container/container.go +++ b/internal/common/testing/container/container.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/cenkalti/backoff" + "github.com/cenkalti/backoff/v4" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index c044141213f8..0ec15785942d 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -129,6 +129,7 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= +github.com/cenkalti/backoff/v4 v4.1.0 h1:c8LkOFQTzuO0WBM/ae5HdGQuZPfPxp7lqBRwQRm4fSc= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=