Update core to latest, start using helpers to construct config settin…

…gs (#2957) Signed-off-by: Bogdan Drutu <[email protected]>
observIQ · Apr 1, 2021 · 5fe49ca · 5fe49ca
1 parent 7276360
commit 5fe49ca
Show file tree

Hide file tree

Showing 287 changed files with 622 additions and 805 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/config.go b/exporter/alibabacloudlogserviceexporter/config.go
@@ -18,7 +18,7 @@ import "go.opentelemetry.io/collector/config"
 
 // Config defines configuration for AlibabaCloud Log Service exporter.
 type Config struct {
- config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+ *config.ExporterSettings `mapstructure:"-"`
  // 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
@@ -50,7 +50,7 @@ func TestLoadConfig(t *testing.T) {
 
  e1 := cfg.Exporters[expectedName]
  expectedCfg := Config{
- ExporterSettings: config.ExporterSettings{
+ ExporterSettings: &config.ExporterSettings{
  TypeVal: config.Type(typeStr),
  NameVal: expectedName,
  },

diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go
@@ -40,10 +40,7 @@ func NewFactory() component.ExporterFactory {
 // CreateDefaultConfig creates the default configuration for exporter.
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: config.Type(typeStr),
- NameVal: typeStr,
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  }
 }
 

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.20210331231428-f8bdcf682f15
+ go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf
  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
@@ -907,8 +907,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.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
-go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 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_test.go b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go
@@ -22,6 +22,7 @@ import (
 
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/pdata"
  "go.opentelemetry.io/collector/translator/conventions"
  "go.uber.org/zap"
@@ -54,9 +55,10 @@ func createSimpleLogData(numberOfLogs int) pdata.Logs {
 
 func TestNewLogsExporter(t *testing.T) {
  got, err := newLogsExporter(zap.NewNop(), &Config{
- Endpoint: "us-west-1.log.aliyuncs.com",
- Project: "demo-project",
- Logstore: "demo-logstore",
+ ExporterSettings: config.NewExporterSettings(typeStr),
+ Endpoint: "us-west-1.log.aliyuncs.com",
+ Project: "demo-project",
+ Logstore: "demo-logstore",
  })
  assert.NoError(t, err)
  require.NotNil(t, got)
@@ -69,10 +71,11 @@ func TestNewLogsExporter(t *testing.T) {
 
 func TestSTSTokenExporter(t *testing.T) {
  got, err := newLogsExporter(zap.NewNop(), &Config{
- Endpoint: "us-west-1.log.aliyuncs.com",
- Project: "demo-project",
- Logstore: "demo-logstore",
- TokenFilePath: path.Join(".", "testdata", "config.yaml"),
+ ExporterSettings: config.NewExporterSettings(typeStr),
+ Endpoint: "us-west-1.log.aliyuncs.com",
+ Project: "demo-project",
+ Logstore: "demo-logstore",
+ TokenFilePath: path.Join(".", "testdata", "config.yaml"),
  })
  assert.NoError(t, err)
  require.NotNil(t, got)

diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go
@@ -22,16 +22,18 @@ import (
  metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/testutil/metricstestutil"
  "go.opentelemetry.io/collector/translator/internaldata"
  "go.uber.org/zap"
 )
 
 func TestNewMetricsExporter(t *testing.T) {
  got, err := newMetricsExporter(zap.NewNop(), &Config{
- Endpoint: "us-west-1.log.aliyuncs.com",
- Project: "demo-project",
- Logstore: "demo-logstore",
+ ExporterSettings: config.NewExporterSettings(typeStr),
+ Endpoint: "us-west-1.log.aliyuncs.com",
+ Project: "demo-project",
+ Logstore: "demo-logstore",
  })
  assert.NoError(t, err)
  require.NotNil(t, got)

diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go
@@ -20,16 +20,18 @@ import (
 
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
+ "go.opentelemetry.io/collector/config"
  "go.opentelemetry.io/collector/consumer/pdata"
  "go.uber.org/zap"
 )
 
 func TestNewTraceExporter(t *testing.T) {
 
  got, err := newTraceExporter(zap.NewNop(), &Config{
- Endpoint: "cn-hangzhou.log.aliyuncs.com",
- Project: "demo-project",
- Logstore: "demo-logstore",
+ ExporterSettings: config.NewExporterSettings(typeStr),
+ Endpoint: "cn-hangzhou.log.aliyuncs.com",
+ Project: "demo-project",
+ Logstore: "demo-logstore",
  })
  assert.NoError(t, err)
  require.NotNil(t, got)

diff --git a/exporter/awsemfexporter/config.go b/exporter/awsemfexporter/config.go
@@ -28,7 +28,7 @@ var (
 
 // Config defines configuration for AWS EMF exporter.
 type Config struct {
- config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+ *config.ExporterSettings `mapstructure:"-"`
  // 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
@@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) {
  r1.Validate()
  assert.Equal(t,
  &Config{
- ExporterSettings: config.ExporterSettings{TypeVal: config.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: config.ExporterSettings{TypeVal: config.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: config.ExporterSettings{TypeVal: config.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/factory.go b/exporter/awsemfexporter/factory.go
@@ -38,10 +38,7 @@ func NewFactory() component.ExporterFactory {
 // CreateDefaultConfig creates the default configuration for exporter.
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: config.Type(typeStr),
- NameVal: typeStr,
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  LogGroupName: "",
  LogStreamName: "",
  Namespace: "",

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.20210331231428-f8bdcf682f15
+ go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf
  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
@@ -1047,8 +1047,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.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
-go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 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
@@ -42,7 +42,7 @@ type KPLConfig struct {
 
 // Config contains the main configuration options for the awskinesis exporter
 type Config struct {
- config.ExporterSettings `mapstructure:",squash"`
+ *config.ExporterSettings `mapstructure:"-"`
 
  AWS AWSConfig `mapstructure:"aws"`
  KPL KPLConfig `mapstructure:"kpl"`

diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go
@@ -42,10 +42,7 @@ func TestDefaultConfig(t *testing.T) {
 
  assert.Equal(t, e,
  &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: "awskinesis",
- NameVal: "awskinesis",
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  AWS: AWSConfig{
  Region: "us-west-2",
  },
@@ -83,10 +80,7 @@ func TestConfig(t *testing.T) {
 
  assert.Equal(t, e,
  &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: "awskinesis",
- NameVal: "awskinesis",
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  AWS: AWSConfig{
  StreamName: "test-stream",
  KinesisEndpoint: "awskinesis.mars-1.aws.galactic",

diff --git a/exporter/awskinesisexporter/factory.go b/exporter/awskinesisexporter/factory.go
@@ -39,10 +39,7 @@ func NewFactory() component.ExporterFactory {
 
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: typeStr,
- NameVal: typeStr,
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  AWS: AWSConfig{
  Region: "us-west-2",
  },

diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -12,7 +12,7 @@ require (
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
+ go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
@@ -1077,8 +1077,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.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
-go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 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/awsprometheusremotewriteexporter/config_test.go b/exporter/awsprometheusremotewriteexporter/config_test.go
@@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) {
  e1 := cfg.Exporters["awsprometheusremotewrite/2"]
  cfgComplete := &Config{
  Config: prw.Config{
- ExporterSettings: config.ExporterSettings{
+ ExporterSettings: &config.ExporterSettings{
  NameVal: "awsprometheusremotewrite/2",
  TypeVal: "awsprometheusremotewrite",
  },

diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -13,7 +13,7 @@ require (
  github.com/onsi/gomega v1.10.2 // indirect
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15
+ go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf
  go.uber.org/zap v1.16.0
  gopkg.in/ini.v1 v1.57.0 // indirect
 )
diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
@@ -1047,8 +1047,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.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
-go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 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/awsxrayexporter/config.go b/exporter/awsxrayexporter/config.go
@@ -18,7 +18,7 @@ import "go.opentelemetry.io/collector/config"
 
 // Config defines configuration for AWS X-Ray exporter.
 type Config struct {
- config.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+ *config.ExporterSettings `mapstructure:"-"`
  // Maximum number of concurrent calls to AWS X-Ray to upload documents.
  NumberOfWorkers int `mapstructure:"num_workers"`
  // X-Ray service endpoint to which the collector sends segment documents.

diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go
@@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) {
  r1 := cfg.Exporters["awsxray/customname"].(*Config)
  assert.Equal(t, r1,
  &Config{
- ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsxray/customname"},
+ ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsxray/customname"},
  NumberOfWorkers: 8,
  Endpoint: "",
  RequestTimeoutSeconds: 30,

diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go
@@ -37,10 +37,7 @@ func NewFactory() component.ExporterFactory {
 
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: config.Type(typeStr),
- NameVal: typeStr,
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  NumberOfWorkers: 8,
  Endpoint: "",
  RequestTimeoutSeconds: 30,

diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go
@@ -33,10 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) {
  factory := NewFactory()
  cfg := factory.CreateDefaultConfig()
  assert.Equal(t, cfg, &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: config.Type(typeStr),
- NameVal: typeStr,
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  NumberOfWorkers: 8,
  Endpoint: "",
  RequestTimeoutSeconds: 30,

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -14,7 +14,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray 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.20210331231428-f8bdcf682f15
+ go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf
  go.uber.org/zap v1.16.0
  golang.org/x/net v0.0.0-20210119194325-5f4716e94777
  gopkg.in/ini.v1 v1.57.0 // indirect

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -1047,8 +1047,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.20210331231428-f8bdcf682f15 h1:3U6eZM3+ZZ87T1i6vbvo3g0DpbhMiwp1o3KSm+O7qxM=
-go.opentelemetry.io/collector v0.23.1-0.20210331231428-f8bdcf682f15/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf h1:0eFtPrybUN7R8ZN7nwWKeco+3xemkjLCrXDmOY9+Wj0=
+go.opentelemetry.io/collector v0.23.1-0.20210331235005-1edaf40cedaf/go.mod h1:2mL8mFNp96idZ7zW/7IpKBaLryUBlfPs9nBrGcOeioM=
 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/azuremonitorexporter/config.go b/exporter/azuremonitorexporter/config.go
@@ -22,10 +22,9 @@ import (
 
 // Config defines configuration for Azure Monitor
 type Config struct {
- // squash ensures fields are correctly decoded in embedded struct.
- config.ExporterSettings `mapstructure:",squash"`
- Endpoint string `mapstructure:"endpoint"`
- InstrumentationKey string `mapstructure:"instrumentation_key"`
- MaxBatchSize int `mapstructure:"maxbatchsize"`
- MaxBatchInterval time.Duration `mapstructure:"maxbatchinterval"`
+ *config.ExporterSettings `mapstructure:"-"`
+ Endpoint string `mapstructure:"endpoint"`
+ InstrumentationKey string `mapstructure:"instrumentation_key"`
+ MaxBatchSize int `mapstructure:"maxbatchsize"`
+ MaxBatchInterval time.Duration `mapstructure:"maxbatchinterval"`
 }
diff --git a/exporter/azuremonitorexporter/config_test.go b/exporter/azuremonitorexporter/config_test.go
@@ -52,7 +52,7 @@ func TestLoadConfig(t *testing.T) {
  assert.Equal(
  t,
  &Config{
- ExporterSettings: config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: exporterType},
+ ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: exporterType},
  Endpoint: defaultEndpoint,
  InstrumentationKey: "abcdefg",
  MaxBatchSize: 100,

diff --git a/exporter/azuremonitorexporter/factory.go b/exporter/azuremonitorexporter/factory.go
@@ -52,10 +52,7 @@ type factory struct {
 
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.ExporterSettings{
- TypeVal: config.Type(typeStr),
- NameVal: typeStr,
- },
+ ExporterSettings: config.NewExporterSettings(typeStr),
  Endpoint: defaultEndpoint,
  MaxBatchSize: 1024,
  MaxBatchInterval: 10 * time.Second,