Skip to content

Commit

Permalink
updating core in preparation of release (#7283)
Browse files Browse the repository at this point in the history
update calls in:
exporter/dynatrace
exporter/signalfx
exporter/zipkin
extension/httpforwarder
receiver/awscontainerinsight
receiver/cloudfoundry
exporter/jaegerthrifthttp
exporter/sumologic
extension/ecstaskobserver
processor/resourcedetectionprocessor
receiver/awsecscontainermetrics
exporter/humio
exporter/influxdb
exporter/prometheusremotewrite
  • Loading branch information
Alex Boten authored Jan 21, 2022
1 parent 5ea0161 commit 21273c6
Show file tree
Hide file tree
Showing 353 changed files with 2,329 additions and 1,750 deletions.
8 changes: 5 additions & 3 deletions cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.42.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.42.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.42.0
go.opentelemetry.io/collector/model v0.42.0
go.opentelemetry.io/collector v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.opentelemetry.io/collector/model v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.uber.org/multierr v1.7.0
golang.org/x/mod v0.5.1
)
Expand Down Expand Up @@ -200,7 +200,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mongodb-forks/digest v1.0.3 // indirect
github.com/mostynb/go-grpc-compression v1.1.15 // indirect
github.com/mostynb/go-grpc-compression v1.1.16 // indirect
github.com/mrunalp/fileutils v0.5.0 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/newrelic/newrelic-telemetry-sdk-go v0.8.1 // indirect
Expand Down Expand Up @@ -663,6 +663,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxr

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver => ../../receiver/cloudfoundryreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver => ../../receiver/collectdreceiver

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ../../receiver/dockerstatsreceiver
Expand Down
11 changes: 6 additions & 5 deletions cmd/configschema/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cmd/mdatagen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/go-playground/universal-translator v0.18.0
github.com/go-playground/validator/v10 v10.10.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.42.0
go.opentelemetry.io/collector/model v0.42.0
go.opentelemetry.io/collector v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.opentelemetry.io/collector/model v0.42.1-0.20220121210129-2c5eb7ca1ad5
)

require (
Expand Down
11 changes: 6 additions & 5 deletions cmd/mdatagen/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/mdatagen/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ type templateContext struct {
}

func loadMetadata(filePath string) (metadata, error) {
cp, err := configmapprovider.NewFile(filePath).Retrieve(context.Background(), nil)
cp, err := configmapprovider.NewFile().Retrieve(context.Background(), "file:"+filePath, nil)
if err != nil {
return metadata{}, err
}
Expand Down
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.42.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.42.0
go.opentelemetry.io/collector/model v0.42.0
go.opentelemetry.io/collector v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.opentelemetry.io/collector/model v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.uber.org/zap v1.20.0
)

Expand Down
15 changes: 8 additions & 7 deletions exporter/alibabacloudlogserviceexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions exporter/awscloudwatchlogsexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.42.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.42.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.42.0
go.opentelemetry.io/collector/model v0.42.0
go.opentelemetry.io/collector v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.opentelemetry.io/collector/model v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.uber.org/zap v1.20.0
)

Expand All @@ -24,7 +24,6 @@ require (
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.6.1 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/stretchr/objx v0.1.1 // indirect
go.opencensus.io v0.23.0 // indirect
Expand Down
15 changes: 8 additions & 7 deletions exporter/awscloudwatchlogsexporter/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.42.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.42.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.42.0
go.opentelemetry.io/collector/model v0.42.0
go.opentelemetry.io/collector v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.opentelemetry.io/collector/model v0.42.1-0.20220121210129-2c5eb7ca1ad5
go.uber.org/zap v1.20.0
google.golang.org/protobuf v1.27.1
)
Expand Down
Loading

0 comments on commit 21273c6

Please sign in to comment.