Skip to content

Commit a811018

Browse files
Aneurysm9Aneurysm9
authored
Update collector-core (#8250)
* Update collector-core * Fix deprecated function use in skywalking receiver Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com>
1 parent 566c739 commit a811018

File tree

311 files changed

+1349
-1316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+1349
-1316
lines changed

‎cmd/configschema/go.mod

+7-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/open-telemetry/opentelemetry-collector-contrib v0.45.1
99
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1
1010
github.com/stretchr/testify v1.7.0
11-
go.opentelemetry.io/collector v0.45.1-0.20220225200547-7bdb684e27bf
12-
go.opentelemetry.io/collector/model v0.45.1-0.20220225200547-7bdb684e27bf
11+
go.opentelemetry.io/collector v0.45.1-0.20220302165729-02d0fe568b21
12+
go.opentelemetry.io/collector/model v0.45.1-0.20220302165729-02d0fe568b21
1313
go.uber.org/multierr v1.8.0
1414
golang.org/x/mod v0.5.1
1515
)
@@ -81,7 +81,7 @@ require (
8181
github.com/dennwc/varint v1.0.0 // indirect
8282
github.com/dgraph-io/ristretto v0.1.0 // indirect
8383
github.com/digitalocean/godo v1.73.0 // indirect
84-
github.com/docker/distribution v2.8.0+incompatible // indirect
84+
github.com/docker/distribution v2.8.0-beta.1+incompatible // indirect
8585
github.com/docker/docker v20.10.12+incompatible // indirect
8686
github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect
8787
github.com/docker/go-units v0.4.0 // indirect
@@ -181,7 +181,7 @@ require (
181181
github.com/logzio/jaeger-logzio v1.0.4 // indirect
182182
github.com/logzio/logzio-go v1.0.3 // indirect
183183
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
184-
github.com/magiconair/properties v1.8.5 // indirect
184+
github.com/magiconair/properties v1.8.6 // indirect
185185
github.com/mailru/easyjson v0.7.7 // indirect
186186
github.com/mattn/go-colorable v0.1.12 // indirect
187187
github.com/mattn/go-isatty v0.0.14 // indirect
@@ -771,3 +771,6 @@ replace github.com/googleapis/gnostic v0.5.6 => github.com/googleapis/gnostic v0
771771

772772
// see https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/4433
773773
exclude github.com/StackExchange/wmi v1.2.0
774+
775+
// see https://github.com/distribution/distribution/issues/3590
776+
exclude github.com/docker/distribution v2.8.0+incompatible

‎cmd/configschema/go.sum

+8-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/mdatagen/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/go-playground/universal-translator v0.18.0
88
github.com/go-playground/validator/v10 v10.10.0
99
github.com/stretchr/testify v1.7.0
10-
go.opentelemetry.io/collector v0.45.1-0.20220225200547-7bdb684e27bf
11-
go.opentelemetry.io/collector/model v0.45.1-0.20220225200547-7bdb684e27bf
10+
go.opentelemetry.io/collector v0.45.1-0.20220302165729-02d0fe568b21
11+
go.opentelemetry.io/collector/model v0.45.1-0.20220302165729-02d0fe568b21
1212
)
1313

1414
require (
@@ -17,7 +17,7 @@ require (
1717
github.com/gogo/protobuf v1.3.2 // indirect
1818
github.com/knadh/koanf v1.4.0 // indirect
1919
github.com/leodido/go-urn v1.2.1 // indirect
20-
github.com/magiconair/properties v1.8.5 // indirect
20+
github.com/magiconair/properties v1.8.6 // indirect
2121
github.com/mitchellh/copystructure v1.2.0 // indirect
2222
github.com/mitchellh/mapstructure v1.4.3 // indirect
2323
github.com/mitchellh/reflectwalk v1.0.2 // indirect

‎cmd/mdatagen/go.sum

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/alibabacloudlogserviceexporter/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/gogo/protobuf v1.3.2
88
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1
99
github.com/stretchr/testify v1.7.0
10-
go.opentelemetry.io/collector v0.45.1-0.20220225200547-7bdb684e27bf
11-
go.opentelemetry.io/collector/model v0.45.1-0.20220225200547-7bdb684e27bf
10+
go.opentelemetry.io/collector v0.45.1-0.20220302165729-02d0fe568b21
11+
go.opentelemetry.io/collector/model v0.45.1-0.20220302165729-02d0fe568b21
1212
go.uber.org/zap v1.21.0
1313
)
1414

@@ -20,7 +20,7 @@ require (
2020
github.com/go-logfmt/logfmt v0.5.0 // indirect
2121
github.com/golang/protobuf v1.5.2 // indirect
2222
github.com/knadh/koanf v1.4.0 // indirect
23-
github.com/magiconair/properties v1.8.5 // indirect
23+
github.com/magiconair/properties v1.8.6 // indirect
2424
github.com/mitchellh/copystructure v1.2.0 // indirect
2525
github.com/mitchellh/mapstructure v1.4.3 // indirect
2626
github.com/mitchellh/reflectwalk v1.0.2 // indirect

‎exporter/alibabacloudlogserviceexporter/go.sum

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/awscloudwatchlogsexporter/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.45.1
99
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.45.1
1010
github.com/stretchr/testify v1.7.0
11-
go.opentelemetry.io/collector v0.45.1-0.20220225200547-7bdb684e27bf
12-
go.opentelemetry.io/collector/model v0.45.1-0.20220225200547-7bdb684e27bf
11+
go.opentelemetry.io/collector v0.45.1-0.20220302165729-02d0fe568b21
12+
go.opentelemetry.io/collector/model v0.45.1-0.20220302165729-02d0fe568b21
1313
go.uber.org/zap v1.21.0
1414
)
1515

@@ -19,7 +19,7 @@ require (
1919
github.com/gogo/protobuf v1.3.2 // indirect
2020
github.com/jmespath/go-jmespath v0.4.0 // indirect
2121
github.com/knadh/koanf v1.4.0 // indirect
22-
github.com/magiconair/properties v1.8.5 // indirect
22+
github.com/magiconair/properties v1.8.6 // indirect
2323
github.com/mitchellh/copystructure v1.2.0 // indirect
2424
github.com/mitchellh/mapstructure v1.4.3 // indirect
2525
github.com/mitchellh/reflectwalk v1.0.2 // indirect

‎exporter/awscloudwatchlogsexporter/go.sum

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/awsemfexporter/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require (
1313
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1
1414
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1
1515
github.com/stretchr/testify v1.7.0
16-
go.opentelemetry.io/collector v0.45.1-0.20220225200547-7bdb684e27bf
17-
go.opentelemetry.io/collector/model v0.45.1-0.20220225200547-7bdb684e27bf
16+
go.opentelemetry.io/collector v0.45.1-0.20220302165729-02d0fe568b21
17+
go.opentelemetry.io/collector/model v0.45.1-0.20220302165729-02d0fe568b21
1818
go.uber.org/zap v1.21.0
1919
google.golang.org/protobuf v1.27.1
2020
)
@@ -27,7 +27,7 @@ require (
2727
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
2828
github.com/jmespath/go-jmespath v0.4.0 // indirect
2929
github.com/knadh/koanf v1.4.0 // indirect
30-
github.com/magiconair/properties v1.8.5 // indirect
30+
github.com/magiconair/properties v1.8.6 // indirect
3131
github.com/mitchellh/copystructure v1.2.0 // indirect
3232
github.com/mitchellh/mapstructure v1.4.3 // indirect
3333
github.com/mitchellh/reflectwalk v1.0.2 // indirect

0 commit comments

Comments
 (0)