Update core to latest, fix breaking change rename configmodels to con…

…fig (open-telemetry#2899) Signed-off-by: Bogdan Drutu <[email protected]>
sakulali · Mar 29, 2021 · aa9e543 · aa9e543
1 parent 08dab63
commit aa9e543
Show file tree

Hide file tree

Showing 401 changed files with 1,343 additions and 1,462 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/config.go b/exporter/alibabacloudlogserviceexporter/config.go
@@ -14,11 +14,11 @@
 
 package alibabacloudlogserviceexporter
 
-import "go.opentelemetry.io/collector/config/configmodels"
+import "go.opentelemetry.io/collector/config"
 
 // Config defines configuration for AlibabaCloud Log Service exporter.
 type Config struct {
- configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+ config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
  // LogService's Endpoint, https://www.alibabacloud.com/help/doc-detail/29008.htm
  // for AlibabaCloud Kubernetes(or ECS), set {region-id}-intranet.log.aliyuncs.com, eg cn-hangzhou-intranet.log.aliyuncs.com;
  // others set {region-id}.log.aliyuncs.com, eg cn-hangzhou.log.aliyuncs.com

diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go
@@ -23,7 +23,7 @@ import (
  "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/component/componenttest"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/config/configtest"
  "go.uber.org/zap"
 )
@@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) {
  assert.Nil(t, err)
 
  factory := NewFactory()
- factories.Exporters[configmodels.Type(typeStr)] = factory
+ factories.Exporters[config.Type(typeStr)] = factory
  cfg, err := configtest.LoadConfigFile(t, path.Join(".", "testdata", "config.yaml"), factories)
 
  require.NoError(t, err)
@@ -50,8 +50,8 @@ func TestLoadConfig(t *testing.T) {
 
  e1 := cfg.Exporters[expectedName]
  expectedCfg := Config{
- ExporterSettings: configmodels.ExporterSettings{
- TypeVal: configmodels.Type(typeStr),
+ ExporterSettings: config.ExporterSettings{
+ TypeVal: config.Type(typeStr),
  NameVal: expectedName,
  },
  Endpoint: "cn-hangzhou.log.aliyuncs.com",

diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go
@@ -18,7 +18,7 @@ import (
  "context"
 
  "go.opentelemetry.io/collector/component"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
 )
 
@@ -38,10 +38,10 @@ func NewFactory() component.ExporterFactory {
 }
 
 // CreateDefaultConfig creates the default configuration for exporter.
-func createDefaultConfig() configmodels.Exporter {
+func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: configmodels.ExporterSettings{
- TypeVal: configmodels.Type(typeStr),
+ ExporterSettings: config.ExporterSettings{
+ TypeVal: config.Type(typeStr),
  NameVal: typeStr,
  },
  }
@@ -50,23 +50,23 @@ func createDefaultConfig() configmodels.Exporter {
 func createTraceExporter(
  _ context.Context,
  params component.ExporterCreateParams,
- cfg configmodels.Exporter,
+ cfg config.Exporter,
 ) (component.TracesExporter, error) {
  return newTraceExporter(params.Logger, cfg)
 }
 
 func createMetricsExporter(
  _ context.Context,
  params component.ExporterCreateParams,
- cfg configmodels.Exporter,
+ cfg config.Exporter,
 ) (exp component.MetricsExporter, err error) {
  return newMetricsExporter(params.Logger, cfg)
 }
 
 func createLogsExporter(
  _ context.Context,
  params component.ExporterCreateParams,
- cfg configmodels.Exporter,
+ cfg config.Exporter,
 ) (exp component.LogsExporter, err error) {
  return newLogsExporter(params.Logger, cfg)
 }
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/gogo/protobuf v1.3.2
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.23.1-0.20210326174743-acb3ae141cae
+ go.opentelemetry.io/collector v0.23.1-0.20210326203202-f5bfc3c516be
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
@@ -909,8 +909,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210326174743-acb3ae141cae h1:rjGCn6ZBMKYePsmTKN9hCmQeyGEoxLOSptblqygB9AA=
-go.opentelemetry.io/collector v0.23.1-0.20210326174743-acb3ae141cae/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210326203202-f5bfc3c516be h1:e9f6dxCQ7Q0yoaR9ygg9QBxE+FjVCj2kuZk1Oi4I+vA=
+go.opentelemetry.io/collector v0.23.1-0.20210326203202-f5bfc3c516be/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter.go b/exporter/alibabacloudlogserviceexporter/logs_exporter.go
@@ -18,14 +18,14 @@ import (
  "context"
 
  "go.opentelemetry.io/collector/component"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/pdata"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.uber.org/zap"
 )
 
 // newLogsExporter return a new LogService logs exporter.
-func newLogsExporter(logger *zap.Logger, cfg configmodels.Exporter) (component.LogsExporter, error) {
+func newLogsExporter(logger *zap.Logger, cfg config.Exporter) (component.LogsExporter, error) {
 
  l := &logServiceLogsSender{
  logger: logger,

diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go
@@ -18,14 +18,14 @@ import (
  "context"
 
  "go.opentelemetry.io/collector/component"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/pdata"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.uber.org/zap"
 )
 
 // newMetricsExporter return a new LogSerice metrics exporter.
-func newMetricsExporter(logger *zap.Logger, cfg configmodels.Exporter) (component.MetricsExporter, error) {
+func newMetricsExporter(logger *zap.Logger, cfg config.Exporter) (component.MetricsExporter, error) {
 
  l := &logServiceMetricsSender{
  logger: logger,

diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go
@@ -18,14 +18,14 @@ import (
  "context"
 
  "go.opentelemetry.io/collector/component"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/pdata"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.uber.org/zap"
 )
 
 // newTraceExporter return a new LogSerice trace exporter.
-func newTraceExporter(logger *zap.Logger, cfg configmodels.Exporter) (component.TracesExporter, error) {
+func newTraceExporter(logger *zap.Logger, cfg config.Exporter) (component.TracesExporter, error) {
 
  l := &logServiceTraceSender{
  logger: logger,

diff --git a/exporter/awsemfexporter/config.go b/exporter/awsemfexporter/config.go
@@ -15,7 +15,7 @@
 package awsemfexporter
 
 import (
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.uber.org/zap"
 )
@@ -28,7 +28,7 @@ var (
 
 // Config defines configuration for AWS EMF exporter.
 type Config struct {
- configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+ config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
  // LogGroupName is the name of CloudWatch log group which defines group of log streams
  // that share the same retention, monitoring, and access control settings.
  LogGroupName string `mapstructure:"log_group_name"`

diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go
@@ -21,7 +21,7 @@ import (
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/component/componenttest"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/config/configtest"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.uber.org/zap"
@@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) {
  assert.Nil(t, err)
 
  factory := NewFactory()
- factories.Exporters[configmodels.Type(typeStr)] = factory
+ factories.Exporters[config.Type(typeStr)] = factory
  cfg, err := configtest.LoadConfigFile(
  t, path.Join(".", "testdata", "config.yaml"), factories,
  )
@@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) {
  r1.Validate()
  assert.Equal(t,
  &Config{
- ExporterSettings: configmodels.ExporterSettings{TypeVal: configmodels.Type(typeStr), NameVal: "awsemf/1"},
+ ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/1"},
  LogGroupName: "",
  LogStreamName: "",
  Endpoint: "",
@@ -70,7 +70,7 @@ func TestLoadConfig(t *testing.T) {
  r2.Validate()
  assert.Equal(t, r2,
  &Config{
- ExporterSettings: configmodels.ExporterSettings{TypeVal: configmodels.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"},
+ ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"},
  LogGroupName: "",
  LogStreamName: "",
  Endpoint: "",
@@ -97,7 +97,7 @@ func TestConfigValidate(t *testing.T) {
  {unit: "Megabytes", metricName: "memory_usage"},
  }
  config := &Config{
- ExporterSettings: configmodels.ExporterSettings{TypeVal: configmodels.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"},
+ ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"},
  RequestTimeoutSeconds: 30,
  MaxRetries: 1,
  DimensionRollupOption: "ZeroAndSingleDimensionRollup",

diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go
@@ -25,7 +25,7 @@ import (
  "github.com/aws/aws-sdk-go/aws/awserr"
  "github.com/google/uuid"
  "go.opentelemetry.io/collector/component"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/consumererror"
  "go.opentelemetry.io/collector/consumer/pdata"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
@@ -42,7 +42,7 @@ type emfExporter struct {
  //Each (log group, log stream) keeps a separate Pusher because of each (log group, log stream) requires separate stream token.
  groupStreamToPusherMap map[string]map[string]Pusher
  svcStructuredLog LogClient
- config configmodels.Exporter
+ config config.Exporter
  logger *zap.Logger
 
  metricTranslator metricTranslator
@@ -54,7 +54,7 @@ type emfExporter struct {
 
 // New func creates an EMF Exporter instance with data push callback func
 func New(
- config configmodels.Exporter,
+ config config.Exporter,
  params component.ExporterCreateParams,
 ) (component.MetricsExporter, error) {
  if config == nil {
@@ -92,7 +92,7 @@ func New(
 
 // NewEmfExporter creates a new exporter using exporterhelper
 func NewEmfExporter(
- config configmodels.Exporter,
+ config config.Exporter,
  params component.ExporterCreateParams,
 ) (component.MetricsExporter, error) {
  exp, err := New(config, params)

diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go
@@ -18,7 +18,7 @@ import (
  "context"
 
  "go.opentelemetry.io/collector/component"
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/exporter/exporterhelper"
 )
 
@@ -36,10 +36,10 @@ func NewFactory() component.ExporterFactory {
 }
 
 // CreateDefaultConfig creates the default configuration for exporter.
-func createDefaultConfig() configmodels.Exporter {
+func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: configmodels.ExporterSettings{
- TypeVal: configmodels.Type(typeStr),
+ ExporterSettings: config.ExporterSettings{
+ TypeVal: config.Type(typeStr),
  NameVal: typeStr,
  },
  LogGroupName: "",
@@ -63,7 +63,7 @@ func createDefaultConfig() configmodels.Exporter {
 // createMetricsExporter creates a metrics exporter based on this config.
 func createMetricsExporter(_ context.Context,
  params component.ExporterCreateParams,
- config configmodels.Exporter) (component.MetricsExporter, error) {
+ config config.Exporter) (component.MetricsExporter, error) {
 
  expCfg := config.(*Config)
 

diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go
@@ -23,8 +23,8 @@ import (
  "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/component/componenttest"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/config/configcheck"
- "go.opentelemetry.io/collector/config/configmodels"
  "go.opentelemetry.io/collector/config/configtest"
  "go.uber.org/zap"
 )
@@ -42,7 +42,7 @@ func TestCreateTraceExporter(t *testing.T) {
  factories, err := componenttest.NopFactories()
  require.NoError(t, err)
  factory := NewFactory()
- factories.Exporters[configmodels.Type(typeStr)] = factory
+ factories.Exporters[config.Type(typeStr)] = factory
  cfg, err := configtest.LoadConfigFile(
  t, path.Join(".", "testdata", "config.yaml"), factories,
  )
@@ -60,7 +60,7 @@ func TestCreateMetricsExporter(t *testing.T) {
  factories, err := componenttest.NopFactories()
  require.NoError(t, err)
  factory := NewFactory()
- factories.Exporters[configmodels.Type(typeStr)] = factory
+ factories.Exporters[config.Type(typeStr)] = factory
  cfg, err := configtest.LoadConfigFile(
  t, path.Join(".", "testdata", "config.yaml"), factories,
  )

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -17,7 +17,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.0.0-00010101000000-000000000000
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.23.1-0.20210326174743-acb3ae141cae
+ go.opentelemetry.io/collector v0.23.1-0.20210326203202-f5bfc3c516be
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.26.0
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -826,7 +826,6 @@ github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=
 github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
@@ -992,7 +991,6 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
-github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
 github.com/tklauser/go-sysconf v0.3.4 h1:HT8SVixZd3IzLdfs/xlpq0jeSfTX57g1v6wB1EuzV7M=
 github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek=
@@ -1051,8 +1049,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/collector v0.23.1-0.20210326174743-acb3ae141cae h1:rjGCn6ZBMKYePsmTKN9hCmQeyGEoxLOSptblqygB9AA=
-go.opentelemetry.io/collector v0.23.1-0.20210326174743-acb3ae141cae/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
+go.opentelemetry.io/collector v0.23.1-0.20210326203202-f5bfc3c516be h1:e9f6dxCQ7Q0yoaR9ygg9QBxE+FjVCj2kuZk1Oi4I+vA=
+go.opentelemetry.io/collector v0.23.1-0.20210326203202-f5bfc3c516be/go.mod h1:wMTwy0/4xrFRZj/XX1UH5VAd0WAVts9Rq7ZKQldCIkU=
 go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
 go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
 go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=

diff --git a/exporter/awskinesisexporter/config.go b/exporter/awskinesisexporter/config.go
@@ -15,7 +15,7 @@
 package awskinesisexporter
 
 import (
- "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/config"
 )
 
 // AWSConfig contains AWS specific configuration such as awskinesis stream, region, etc.
@@ -42,7 +42,7 @@ type KPLConfig struct {
 
 // Config contains the main configuration options for the awskinesis exporter
 type Config struct {
- configmodels.ExporterSettings `mapstructure:",squash"`
+ config.ExporterSettings `mapstructure:",squash"`
 
  AWS AWSConfig `mapstructure:"aws"`
  KPL KPLConfig `mapstructure:"kpl"`