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

Upgrade core, fix usage of deprecated config types and funcs #16168

Merged
merged 1 commit into from
Nov 8, 2022
Merged

Upgrade core, fix usage of deprecated config types and funcs #16168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions cmd/configschema/configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"fmt"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config"
)

const (
Expand All @@ -34,7 +33,7 @@ type CfgInfo struct {
// the name of the component group, e.g. "receiver"
Group string
// the component type, e.g. "otlpreceiver.Config"
Type config.Type
Type component.Type
// an instance of the component's configuration struct
CfgInstance interface{}
}
Expand Down Expand Up @@ -78,7 +77,7 @@ func GetAllCfgInfos(components component.Factories) []CfgInfo {
// config for the component specified by the passed-in componentType and
// componentName.
func GetCfgInfo(components component.Factories, componentType, componentName string) (CfgInfo, error) {
t := config.Type(componentName)
t := component.Type(componentName)
switch componentType {
case receiver:
f := components.Receivers[t]
Expand Down
30 changes: 15 additions & 15 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.63.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.63.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8
go.opentelemetry.io/collector/receiver/otlpreceiver v0.63.1
go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426
go.opentelemetry.io/collector/receiver/otlpreceiver v0.63.2-0.20221108014805-0b08d5316426
golang.org/x/mod v0.6.0
golang.org/x/text v0.4.0
)
Expand Down Expand Up @@ -322,10 +322,10 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.63.0 // indirect
Expand Down Expand Up @@ -415,7 +415,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.63.0 // indirect
Expand Down Expand Up @@ -448,7 +448,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-00010101000000-000000000000 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.63.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.63.0 // indirect
Expand Down Expand Up @@ -517,7 +517,7 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/prometheus/client_golang v1.13.1-0.20221013115219-dcea97eee2b3 // indirect
github.com/prometheus/client_golang v1.13.1 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
Expand Down Expand Up @@ -589,16 +589,16 @@ require (
go.etcd.io/etcd/client/v3 v3.5.4 // indirect
go.mongodb.org/atlas v0.18.0 // indirect
go.mongodb.org/mongo-driver v1.10.3 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221104003159-6b27644724d8 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221104003159-6b27644724d8 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221104003159-6b27644724d8 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/exporter/loggingexporter v0.63.2-0.20221108014805-0b08d5316426 // indirect
go.opentelemetry.io/collector/exporter/otlpexporter v0.63.2-0.20221108014805-0b08d5316426 // indirect
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.63.2-0.20221108014805-0b08d5316426 // indirect
go.opentelemetry.io/collector/extension/ballastextension v0.0.0-20221103164255-2ed41215f324 // indirect
go.opentelemetry.io/collector/extension/zpagesextension v0.0.0-20221102221454-bfc45c16c979 // indirect
go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221104003159-6b27644724d8 // indirect
go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426 // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.0.0-20221108014805-0b08d5316426 // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.0.0-20221103164255-2ed41215f324 // indirect
go.opentelemetry.io/collector/semconv v0.63.2-0.20221104003159-6b27644724d8 // indirect
go.opentelemetry.io/collector/semconv v0.63.2-0.20221108014805-0b08d5316426 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect
go.opentelemetry.io/contrib/zpages v0.36.4 // indirect
Expand Down Expand Up @@ -1032,4 +1032,4 @@ exclude github.com/docker/distribution v2.8.0+incompatible
// at the time of this inclusion, v0.38.0 was the latest version available (also tagged as v2.38.0)
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.38.0

replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221101161158-df8deb48186b
replace go.opentelemetry.io/collector/receiver/otlpreceiver => go.opentelemetry.io/collector/receiver/otlpreceiver v0.0.0-20221108014805-0b08d5316426
39 changes: 20 additions & 19 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.11.1
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8
go.opentelemetry.io/collector/pdata v0.63.2-0.20221104003159-6b27644724d8
go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426
go.opentelemetry.io/collector/pdata v0.63.2-0.20221108014805-0b08d5316426
)

require (
Expand Down
8 changes: 4 additions & 4 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 confmap/provider/s3provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/aws/aws-sdk-go-v2/config v1.17.10
github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.63.2-0.20221104003159-6b27644724d8
go.opentelemetry.io/collector v0.63.2-0.20221108014805-0b08d5316426
gopkg.in/yaml.v2 v2.4.0
)

Expand Down
4 changes: 2 additions & 2 deletions confmap/provider/s3provider/go.sum
View file
Open in desktop

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

Loading