Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating core in preparation of release #7283

Merged
merged 8 commits into from
Jan 21, 2022
Merged

updating core in preparation of release #7283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d36f965
updating core in preparation of release
Jan 19, 2022
37fc8ba
update calls to ToClient
Jan 19, 2022
bd7aa93
more calls to ToClient
Jan 19, 2022
a0af08c
fix File().Retrieve
Jan 20, 2022
7430016
fix integration tests
Jan 20, 2022
2a38f3b
fix more calls to ToClient
Jan 20, 2022
b3dd438
move file: prefix
Jan 20, 2022
4142f97
updating core once more
Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 5 additions & 3 deletions cmd/configschema/go.mod
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is cleaner if file: is added inside loadMetadata instead of when you call it, otherwise the filePath argument name is misleading.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, updated 👍

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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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