Upgrade core, fix usage of deprecated component Configs (#16507)

Signed-off-by: Bogdan Drutu <[email protected]> Signed-off-by: Bogdan Drutu <[email protected]>
codeboten · Nov 29, 2022 · 8e64267 · 8e64267
1 parent 81b38ec
commit 8e64267
Show file tree

Hide file tree

Showing 809 changed files with 3,977 additions and 3,988 deletions.
diff --git a/.github/workflows/scripts/check-collector-module-version.sh b/.github/workflows/scripts/check-collector-module-version.sh
@@ -73,12 +73,13 @@ check_collector_versions_correct() {
 # only and does not return string which contains this string as a substring.
 COLLECTOR_MODULE="go.opentelemetry.io/collector "
 
-COLLECTOR_MODEL_PDATA="go.opentelemetry.io/collector/pdata"
-COLLECTOR_MODEL_SEMCONV="go.opentelemetry.io/collector/semconv"
 MAIN_MOD_FILE="./go.mod"
 COLLECTOR_MOD_VERSION=$(get_collector_version "$COLLECTOR_MODULE" "$MAIN_MOD_FILE")
 
 # Check the collector module version in each of the module files
 check_collector_versions_correct "$COLLECTOR_MODULE" "$COLLECTOR_MOD_VERSION"
-check_collector_versions_correct "$COLLECTOR_MODEL_PDATA" "$COLLECTOR_MOD_VERSION"
-check_collector_versions_correct "$COLLECTOR_MODEL_SEMCONV" "$COLLECTOR_MOD_VERSION"
+check_collector_versions_correct "go.opentelemetry.io/collector/component" "$COLLECTOR_MOD_VERSION"
+check_collector_versions_correct "go.opentelemetry.io/collector/consumer" "$COLLECTOR_MOD_VERSION"
+check_collector_versions_correct "go.opentelemetry.io/collector/featuregate" "$COLLECTOR_MOD_VERSION"
+check_collector_versions_correct "go.opentelemetry.io/collector/pdata" "$COLLECTOR_MOD_VERSION"
+check_collector_versions_correct "go.opentelemetry.io/collector/semconv" "$COLLECTOR_MOD_VERSION"
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -8,9 +8,9 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib v0.66.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.66.0
  github.com/stretchr/testify v1.8.1
- go.opentelemetry.io/collector v0.66.0
- go.opentelemetry.io/collector/component v0.66.0
- go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0
+ go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90
+ go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90
+ go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90
  golang.org/x/mod v0.6.0
  golang.org/x/text v0.4.0
 )
@@ -582,17 +582,17 @@ require (
  go.mongodb.org/atlas v0.19.0 // indirect
  go.mongodb.org/mongo-driver v1.10.3 // indirect
  go.opencensus.io v0.24.0 // indirect
- go.opentelemetry.io/collector/consumer v0.66.0 // indirect
- go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0 // indirect
- go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 // indirect
- go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 // indirect
- go.opentelemetry.io/collector/extension/ballastextension v0.66.0 // indirect
- go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 // indirect
- go.opentelemetry.io/collector/featuregate v0.66.0 // indirect
- go.opentelemetry.io/collector/pdata v0.66.0 // indirect
- go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect
- go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0 // indirect
- go.opentelemetry.io/collector/semconv v0.66.0 // indirect
+ go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
+ go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // 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

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod
@@ -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.66.0
- go.opentelemetry.io/collector/pdata v0.66.0
+ go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90
+ go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90
 )
 
 require (
@@ -26,7 +26,7 @@ require (
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/pelletier/go-toml v1.9.4 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- go.opentelemetry.io/collector/featuregate v0.66.0 // indirect
+ go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
  go.uber.org/atomic v1.10.0 // indirect
  go.uber.org/multierr v1.8.0 // indirect
  golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect

diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum
diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod
@@ -7,7 +7,7 @@ require (
  github.com/aws/aws-sdk-go-v2/config v1.18.0
  github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0
  github.com/stretchr/testify v1.8.1
- go.opentelemetry.io/collector v0.66.0
+ go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90
  gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -31,7 +31,7 @@ require (
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- go.opentelemetry.io/collector/featuregate v0.66.0 // indirect
+ go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect
  go.uber.org/atomic v1.10.0 // indirect
  go.uber.org/multierr v1.8.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum
diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go
@@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) {
 
  tests := []struct {
  id component.ID
- expected component.ExporterConfig
+ expected component.Config
  }{
 
  {
@@ -64,7 +64,7 @@ func TestLoadConfig(t *testing.T) {
 
  sub, err := cm.Sub(tt.id.String())
  require.NoError(t, err)
- require.NoError(t, component.UnmarshalExporterConfig(sub, cfg))
+ require.NoError(t, component.UnmarshalConfig(sub, cfg))
 
  assert.NoError(t, component.ValidateConfig(cfg))
  assert.Equal(t, tt.expected, cfg)

diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go
@@ -39,7 +39,7 @@ func NewFactory() component.ExporterFactory {
 }
 
 // CreateDefaultConfig creates the default configuration for exporter.
-func createDefaultConfig() component.ExporterConfig {
+func createDefaultConfig() component.Config {
  return &Config{
  ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)),
  }
@@ -48,23 +48,23 @@ func createDefaultConfig() component.ExporterConfig {
 func createTracesExporter(
  _ context.Context,
  set component.ExporterCreateSettings,
- cfg component.ExporterConfig,
+ cfg component.Config,
 ) (component.TracesExporter, error) {
  return newTracesExporter(set, cfg)
 }
 
 func createMetricsExporter(
  _ context.Context,
  set component.ExporterCreateSettings,
- cfg component.ExporterConfig,
+ cfg component.Config,
 ) (exp component.MetricsExporter, err error) {
  return newMetricsExporter(set, cfg)
 }
 
 func createLogsExporter(
  _ context.Context,
  set component.ExporterCreateSettings,
- cfg component.ExporterConfig,
+ cfg component.Config,
 ) (exp component.LogsExporter, err error) {
  return newLogsExporter(set, cfg)
 }