Skip to content

Commit

Permalink
deps: move from github.com/pkg/errors to 'errors' and 'fmt'
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu MOREL <[email protected]>
  • Loading branch information
mmorel-35 committed Jun 17, 2022
1 parent c6f7b9d commit 7284229
Show file tree
Hide file tree
Showing 41 changed files with 4,908 additions and 244 deletions.
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ linters-settings:
packages-with-error-message:
# See https://github.com/open-telemetry/opentelemetry-collector/issues/5200 for rationale
- sync/atomic: "Use go.uber.org/atomic instead of sync/atomic"
- github.com/pkg/errors: "Use 'errors' or 'fmt' instead of github.com/pkg/errors"

linters:
enable:
Expand Down
10 changes: 4 additions & 6 deletions receiver/apachereceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ go 1.17
require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.53.0
github.com/stretchr/testify v1.7.2
github.com/testcontainers/testcontainers-go v0.13.0
go.opentelemetry.io/collector v0.53.1-0.20220615184617-4cefca87d2c6
go.opentelemetry.io/collector/pdata v0.53.1-0.20220615184617-4cefca87d2c6
go.uber.org/zap v1.21.0
)

Expand All @@ -29,6 +31,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.6 // indirect
Expand All @@ -50,6 +53,7 @@ require (
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.6.2 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
go.opencensus.io v0.23.0 // indirect
Expand All @@ -69,10 +73,4 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

require (
github.com/rogpeppe/go-internal v1.6.2 // indirect
github.com/testcontainers/testcontainers-go v0.13.0
go.opentelemetry.io/collector/pdata v0.53.1-0.20220615184617-4cefca87d2c6
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest
135 changes: 133 additions & 2 deletions receiver/apachereceiver/go.sum

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions receiver/awsxrayreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ require (
github.com/google/uuid v1.3.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.53.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.53.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.53.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.53.0
github.com/stretchr/testify v1.7.2
go.opentelemetry.io/collector v0.53.1-0.20220615184617-4cefca87d2c6
go.opentelemetry.io/collector/pdata v0.53.1-0.20220615184617-4cefca87d2c6
go.opentelemetry.io/collector/semconv v0.53.1-0.20220615184617-4cefca87d2c6
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
Expand All @@ -34,6 +36,7 @@ require (
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/metric v0.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.7.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
Expand All @@ -45,12 +48,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.53.0
go.opentelemetry.io/collector/pdata v0.53.1-0.20220615184617-4cefca87d2c6
go.opentelemetry.io/otel/sdk v1.7.0 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => ./../../internal/aws/proxy

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => ./../../internal/aws/xray
Expand Down
407 changes: 407 additions & 0 deletions receiver/awsxrayreceiver/go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions receiver/bigipreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipr
go 1.17

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.53.0
github.com/stretchr/testify v1.7.2
go.opentelemetry.io/collector v0.53.1-0.20220615184617-4cefca87d2c6
go.opentelemetry.io/collector/pdata v0.53.1-0.20220615184617-4cefca87d2c6
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
)

require github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.53.0

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
Expand All @@ -20,6 +19,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.6 // indirect
github.com/knadh/koanf v1.4.1 // indirect
Expand Down
387 changes: 385 additions & 2 deletions receiver/bigipreceiver/go.sum

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions receiver/couchdbreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchd

go 1.17

require (
go.opentelemetry.io/collector v0.53.1-0.20220615184617-4cefca87d2c6
go.uber.org/multierr v1.8.0
)

require github.com/stretchr/testify v1.7.2

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.53.0
github.com/stretchr/testify v1.7.2
go.opentelemetry.io/collector v0.53.1-0.20220615184617-4cefca87d2c6
go.opentelemetry.io/collector/pdata v0.53.1-0.20220615184617-4cefca87d2c6
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
)

Expand All @@ -24,6 +20,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.6 // indirect
github.com/knadh/koanf v1.4.1 // indirect
Expand Down
Loading

0 comments on commit 7284229

Please sign in to comment.