Update core to latest, fix usage of config.ComponentID (#3316)

Signed-off-by: Bogdan Drutu <[email protected]>
observIQ · May 4, 2021 · 7bf2266 · 7bf2266
1 parent 4cb6765
commit 7bf2266
Show file tree

Hide file tree

Showing 299 changed files with 648 additions and 759 deletions.
diff --git a/cmd/otelcontribcol/components_test.go b/cmd/otelcontribcol/components_test.go
@@ -28,7 +28,7 @@ func TestDefaultComponents(t *testing.T) {
  exts := factories.Extensions
  for k, v := range exts {
  assert.Equal(t, k, v.Type())
- assert.Equal(t, k, v.CreateDefaultConfig().Type())
+ assert.Equal(t, config.NewID(k), v.CreateDefaultConfig().ID())
  }
 
  recvs := factories.Receivers
@@ -46,6 +46,6 @@ func TestDefaultComponents(t *testing.T) {
  exps := factories.Exporters
  for k, v := range exps {
  assert.Equal(t, k, v.Type())
- assert.Equal(t, k, v.CreateDefaultConfig().Type())
+ assert.Equal(t, config.NewID(k), v.CreateDefaultConfig().ID())
  }
 }
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:"-"`
+ config.ExporterSettings `mapstructure:",squash"`
  // 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
@@ -39,26 +39,21 @@ func TestLoadConfig(t *testing.T) {
  require.NoError(t, err)
  require.NotNil(t, cfg)
 
- e0 := cfg.Exporters[typeStr]
+ e0 := cfg.Exporters[config.NewID(typeStr)]
 
  // Endpoint doesn't have a default value so set it directly.
  defaultCfg := factory.CreateDefaultConfig().(*Config)
  defaultCfg.Endpoint = "cn-hangzhou.log.aliyuncs.com"
  assert.Equal(t, defaultCfg, e0)
 
- expectedName := typeStr + "/2"
-
- e1 := cfg.Exporters[expectedName]
+ e1 := cfg.Exporters[config.NewIDWithName(typeStr, "2")]
  expectedCfg := Config{
- ExporterSettings: &config.ExporterSettings{
- TypeVal: config.Type(typeStr),
- NameVal: expectedName,
- },
- Endpoint: "cn-hangzhou.log.aliyuncs.com",
- Project: "demo-project",
- Logstore: "demo-logstore",
- AccessKeyID: "test-id",
- AccessKeySecret: "test-secret",
+ ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "2")),
+ Endpoint: "cn-hangzhou.log.aliyuncs.com",
+ Project: "demo-project",
+ Logstore: "demo-logstore",
+ AccessKeyID: "test-id",
+ AccessKeySecret: "test-secret",
  }
  assert.Equal(t, &expectedCfg, e1)
 

diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go
@@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory {
 // CreateDefaultConfig creates the default configuration for exporter.
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(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.25.1-0.20210503214610-665e9657ac28
+ go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
  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
@@ -912,8 +912,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.25.1-0.20210503214610-665e9657ac28 h1:poKw2J0C1ZE9qi85qJOOvJHHp7UJkHk80OP8IqfoFc8=
-go.opentelemetry.io/collector v0.25.1-0.20210503214610-665e9657ac28/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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
@@ -52,7 +52,7 @@ func createSimpleLogData(numberOfLogs int) pdata.Logs {
 
 func TestNewLogsExporter(t *testing.T) {
  got, err := newLogsExporter(zap.NewNop(), &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
  Endpoint: "us-west-1.log.aliyuncs.com",
  Project: "demo-project",
  Logstore: "demo-logstore",
@@ -68,7 +68,7 @@ func TestNewLogsExporter(t *testing.T) {
 
 func TestSTSTokenExporter(t *testing.T) {
  got, err := newLogsExporter(zap.NewNop(), &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
  Endpoint: "us-west-1.log.aliyuncs.com",
  Project: "demo-project",
  Logstore: "demo-logstore",

diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter_test.go
@@ -30,7 +30,7 @@ import (
 
 func TestNewMetricsExporter(t *testing.T) {
  got, err := newMetricsExporter(zap.NewNop(), &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
  Endpoint: "us-west-1.log.aliyuncs.com",
  Project: "demo-project",
  Logstore: "demo-logstore",

diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go
@@ -28,7 +28,7 @@ import (
 func TestNewTracesExporter(t *testing.T) {
 
  got, err := newTracesExporter(zap.NewNop(), &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
  Endpoint: "cn-hangzhou.log.aliyuncs.com",
  Project: "demo-project",
  Logstore: "demo-logstore",

diff --git a/exporter/awsemfexporter/config.go b/exporter/awsemfexporter/config.go
@@ -30,7 +30,7 @@ var (
 
 // Config defines configuration for AWS EMF exporter.
 type Config struct {
- *config.ExporterSettings `mapstructure:"-"`
+ config.ExporterSettings `mapstructure:",squash"`
  // AWSSessionSettings contains the common configuration options
  // for creating AWS session to communicate with backend
  awsutil.AWSSessionSettings `mapstructure:",squash"`

diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go
@@ -44,14 +44,14 @@ func TestLoadConfig(t *testing.T) {
 
  assert.Equal(t, 3, len(cfg.Exporters))
 
- r0 := cfg.Exporters["awsemf"]
+ r0 := cfg.Exporters[config.NewID(typeStr)]
  assert.Equal(t, factory.CreateDefaultConfig(), r0)
 
- r1 := cfg.Exporters["awsemf/1"].(*Config)
- r1.Validate()
+ r1 := cfg.Exporters[config.NewIDWithName(typeStr, "1")].(*Config)
+ assert.NoError(t, r1.Validate())
  assert.Equal(t,
  &Config{
- ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/1"},
+ ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "1")),
  AWSSessionSettings: awsutil.AWSSessionSettings{
  NumberOfWorkers: 8,
  Endpoint: "",
@@ -71,11 +71,11 @@ func TestLoadConfig(t *testing.T) {
  MetricDescriptors: []MetricDescriptor{},
  }, r1)
 
- r2 := cfg.Exporters["awsemf/resource_attr_to_label"].(*Config)
- r2.Validate()
+ r2 := cfg.Exporters[config.NewIDWithName(typeStr, "resource_attr_to_label")].(*Config)
+ assert.NoError(t, r2.Validate())
  assert.Equal(t, r2,
  &Config{
- ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"},
+ ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "resource_attr_to_label")),
  AWSSessionSettings: awsutil.AWSSessionSettings{
  NumberOfWorkers: 8,
  Endpoint: "",
@@ -104,8 +104,8 @@ func TestConfigValidate(t *testing.T) {
  {unit: "INVALID", metricName: "404"},
  {unit: "Megabytes", metricName: "memory_usage"},
  }
- config := &Config{
- ExporterSettings: &config.ExporterSettings{TypeVal: config.Type(typeStr), NameVal: "awsemf/resource_attr_to_label"},
+ cfg := &Config{
+ ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "1")),
  AWSSessionSettings: awsutil.AWSSessionSettings{
  RequestTimeoutSeconds: 30,
  MaxRetries: 1,
@@ -115,11 +115,11 @@ func TestConfigValidate(t *testing.T) {
  MetricDescriptors: incorrectDescriptor,
  logger: zap.NewNop(),
  }
- config.Validate()
+ assert.NoError(t, cfg.Validate())
 
- assert.Equal(t, 2, len(config.MetricDescriptors))
+ assert.Equal(t, 2, len(cfg.MetricDescriptors))
  assert.Equal(t, []MetricDescriptor{
  {unit: "Count", metricName: "apiserver_total", overwrite: true},
  {unit: "Megabytes", metricName: "memory_usage"},
- }, config.MetricDescriptors)
+ }, cfg.MetricDescriptors)
 }
diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go
@@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory {
 // CreateDefaultConfig creates the default configuration for exporter.
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
  AWSSessionSettings: awsutil.CreateDefaultSessionConfig(),
  LogGroupName: "",
  LogStreamName: "",

diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go
@@ -49,7 +49,7 @@ func TestCreateTracesExporter(t *testing.T) {
  require.NoError(t, err)
 
  ctx := context.Background()
- exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters["awsemf/1"])
+ exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "1")])
  assert.NotNil(t, err)
  assert.Nil(t, exporter)
 }
@@ -67,7 +67,7 @@ func TestCreateMetricsExporter(t *testing.T) {
  require.NoError(t, err)
 
  ctx := context.Background()
- exporter, err := factory.CreateMetricsExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters["awsemf/1"])
+ exporter, err := factory.CreateMetricsExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters[config.NewIDWithName(typeStr, "1")])
  assert.Nil(t, err)
  assert.NotNil(t, exporter)
 }
diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -10,7 +10,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-00010101000000-000000000000
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector v0.25.1-0.20210503214610-665e9657ac28
+ go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.26.0
 )

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -1034,8 +1034,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.25.1-0.20210503214610-665e9657ac28 h1:poKw2J0C1ZE9qi85qJOOvJHHp7UJkHk80OP8IqfoFc8=
-go.opentelemetry.io/collector v0.25.1-0.20210503214610-665e9657ac28/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g=
 go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo=
 go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU=

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:"-"`
+ config.ExporterSettings `mapstructure:",squash"`
 
  AWS AWSConfig `mapstructure:"aws"`
  KPL KPLConfig `mapstructure:"kpl"`

diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go
@@ -38,11 +38,11 @@ func TestDefaultConfig(t *testing.T) {
  require.NoError(t, err)
  require.NotNil(t, cfg)
 
- e := cfg.Exporters["awskinesis"]
+ e := cfg.Exporters[config.NewID(typeStr)]
 
  assert.Equal(t, e,
  &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
  AWS: AWSConfig{
  Region: "us-west-2",
  },
@@ -76,11 +76,11 @@ func TestConfig(t *testing.T) {
  require.NoError(t, err)
  require.NotNil(t, cfg)
 
- e := cfg.Exporters["awskinesis"]
+ e := cfg.Exporters[config.NewID(typeStr)]
 
  assert.Equal(t, e,
  &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(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,7 +39,7 @@ func NewFactory() component.ExporterFactory {
 
 func createDefaultConfig() config.Exporter {
  return &Config{
- ExporterSettings: config.NewExporterSettings(typeStr),
+ ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)),
  AWS: AWSConfig{
  Region: "us-west-2",
  },
@@ -66,7 +66,7 @@ func createTracesExporter(
 ) (component.TracesExporter, error) {
  c := config.(*Config)
  k, err := awskinesis.NewExporter(&awskinesis.Options{
- Name: c.Name(),
+ Name: c.ID().String(),
  StreamName: c.AWS.StreamName,
  AWSRegion: c.AWS.Region,
  AWSRole: c.AWS.Role,

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.25.1-0.20210503214610-665e9657ac28
+ go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
  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
@@ -1084,8 +1084,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.25.1-0.20210503214610-665e9657ac28 h1:poKw2J0C1ZE9qi85qJOOvJHHp7UJkHk80OP8IqfoFc8=
-go.opentelemetry.io/collector v0.25.1-0.20210503214610-665e9657ac28/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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
@@ -43,22 +43,19 @@ func TestLoadConfig(t *testing.T) {
  require.NotNil(t, cfg)
 
  // From the default configurations -- checks if a correct exporter is instantiated
- e0 := cfg.Exporters["awsprometheusremotewrite"]
+ e0 := cfg.Exporters[config.NewID(typeStr)]
  cfgDefault := factory.CreateDefaultConfig()
  // testing function equality is not supported in Go hence these will be ignored for this test
  cfgDefault.(*Config).HTTPClientSettings.CustomRoundTripper = nil
  e0.(*Config).HTTPClientSettings.CustomRoundTripper = nil
  assert.Equal(t, e0, cfgDefault)
 
  // checks if the correct Config struct can be instantiated from testdata/config.yaml
- e1 := cfg.Exporters["awsprometheusremotewrite/2"]
+ e1 := cfg.Exporters[config.NewIDWithName(typeStr, "2")]
  cfgComplete := &Config{
  Config: prw.Config{
- ExporterSettings: &config.ExporterSettings{
- NameVal: "awsprometheusremotewrite/2",
- TypeVal: "awsprometheusremotewrite",
- },
- TimeoutSettings: exporterhelper.DefaultTimeoutSettings(),
+ ExporterSettings: config.NewExporterSettings(config.NewIDWithName(typeStr, "2")),
+ TimeoutSettings: exporterhelper.DefaultTimeoutSettings(),
  RetrySettings: exporterhelper.RetrySettings{
  Enabled: true,
  InitialInterval: 10 * time.Second,

diff --git a/exporter/awsprometheusremotewriteexporter/factory.go b/exporter/awsprometheusremotewriteexporter/factory.go
@@ -54,8 +54,7 @@ func (af *awsFactory) CreateDefaultConfig() config.Exporter {
  },
  }
 
- cfg.TypeVal = typeStr
- cfg.NameVal = typeStr
+ cfg.ExporterSettings = config.NewExporterSettings(config.NewID(typeStr))
  cfg.HTTPClientSettings.CustomRoundTripper = func(next http.RoundTripper) (http.RoundTripper, error) {
  return newSigningRoundTripper(cfg, next)
  }

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.25.1-0.20210503214610-665e9657ac28
+ go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7
  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
@@ -1054,8 +1054,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.25.1-0.20210503214610-665e9657ac28 h1:poKw2J0C1ZE9qi85qJOOvJHHp7UJkHk80OP8IqfoFc8=
-go.opentelemetry.io/collector v0.25.1-0.20210503214610-665e9657ac28/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7 h1:PYYvkjl9+PSQcWc1kklY9fxhMamvzTWR1s03DZCViWQ=
+go.opentelemetry.io/collector v0.25.1-0.20210504151019-4603bad78ae7/go.mod h1:umsD61HigOQmEhlesNUobwjuEDh2lY6AvKY4SSx/fMA=
 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/awsxray.go b/exporter/awsxrayexporter/awsxray.go
@@ -38,8 +38,8 @@ const (
 // request and then posts the request to the configured region's X-Ray endpoint.
 func newTracesExporter(
  config config.Exporter, params component.ExporterCreateParams, cn awsutil.ConnAttr) (component.TracesExporter, error) {
- typeLog := zap.String("type", string(config.Type()))
- nameLog := zap.String("name", config.Name())
+ typeLog := zap.String("type", string(config.ID().Type()))
+ nameLog := zap.String("name", config.ID().String())
  logger := params.Logger
  awsConfig, session, err := awsutil.GetAWSConfigSession(logger, cn, &config.(*Config).AWSSessionSettings)
  if err != nil {

diff --git a/exporter/awsxrayexporter/config.go b/exporter/awsxrayexporter/config.go
@@ -22,7 +22,7 @@ import (
 
 // Config defines configuration for AWS X-Ray exporter.
 type Config struct {
- *config.ExporterSettings `mapstructure:"-"`
+ config.ExporterSettings `mapstructure:",squash"`
  // AWSSessionSettings contains the common configuration options
  // for creating AWS session to communicate with backend
  awsutil.AWSSessionSettings `mapstructure:",squash"`