Update core to latest, fix usage of Trace instead of Traces (open-tel…

…emetry#3105) Signed-off-by: Bogdan Drutu <[email protected]>
keisku · Apr 14, 2021 · 020dc8c · 020dc8c
1 parent 8ded668
commit 020dc8c
Show file tree

Hide file tree

Showing 227 changed files with 453 additions and 453 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go
@@ -32,7 +32,7 @@ func NewFactory() component.ExporterFactory {
  return exporterhelper.NewFactory(
  typeStr,
  createDefaultConfig,
- exporterhelper.WithTraces(createTraceExporter),
+ exporterhelper.WithTraces(createTracesExporter),
  exporterhelper.WithMetrics(createMetricsExporter),
  exporterhelper.WithLogs(createLogsExporter))
 }
@@ -44,12 +44,12 @@ func createDefaultConfig() config.Exporter {
  }
 }
 
-func createTraceExporter(
+func createTracesExporter(
  _ context.Context,
  params component.ExporterCreateParams,
  cfg config.Exporter,
 ) (component.TracesExporter, error) {
- return newTraceExporter(params.Logger, cfg)
+ return newTracesExporter(params.Logger, cfg)
 }
 
 func createMetricsExporter(

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.24.1-0.20210414150520-7b9a2651fe8e
+ go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
  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
@@ -908,8 +908,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.24.1-0.20210414150520-7b9a2651fe8e h1:jBdlkJx7nw6aGPSPq5YfTTOfnGXAdSzx9yNDoaTRC3A=
-go.opentelemetry.io/collector v0.24.1-0.20210414150520-7b9a2651fe8e/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327 h1:Br2+gOanaGNcN5KUyJM56Flpf7ex3D/rZtAQkm1h3C0=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
 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/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go
@@ -24,8 +24,8 @@ import (
  "go.uber.org/zap"
 )
 
-// newTraceExporter return a new LogSerice trace exporter.
-func newTraceExporter(logger *zap.Logger, cfg config.Exporter) (component.TracesExporter, error) {
+// newTracesExporter return a new LogSerice trace exporter.
+func newTracesExporter(logger *zap.Logger, cfg config.Exporter) (component.TracesExporter, error) {
 
  l := &logServiceTraceSender{
  logger: logger,
@@ -36,7 +36,7 @@ func newTraceExporter(logger *zap.Logger, cfg config.Exporter) (component.Traces
  return nil, err
  }
 
- return exporterhelper.NewTraceExporter(
+ return exporterhelper.NewTracesExporter(
  cfg,
  logger,
  l.pushTraceData)

diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go b/exporter/alibabacloudlogserviceexporter/trace_exporter_test.go
@@ -25,9 +25,9 @@ import (
  "go.uber.org/zap"
 )
 
-func TestNewTraceExporter(t *testing.T) {
+func TestNewTracesExporter(t *testing.T) {
 
- got, err := newTraceExporter(zap.NewNop(), &Config{
+ got, err := newTracesExporter(zap.NewNop(), &Config{
  ExporterSettings: config.NewExporterSettings(typeStr),
  Endpoint: "cn-hangzhou.log.aliyuncs.com",
  Project: "demo-project",
@@ -49,9 +49,9 @@ func TestNewTraceExporter(t *testing.T) {
  assert.Nil(t, got.Shutdown(context.Background()))
 }
 
-func TestNewFailsWithEmptyTraceExporterName(t *testing.T) {
+func TestNewFailsWithEmptyTracesExporterName(t *testing.T) {
 
- got, err := newTraceExporter(zap.NewNop(), &Config{})
+ got, err := newTracesExporter(zap.NewNop(), &Config{})
  assert.Error(t, err)
  require.Nil(t, got)
 }
diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go
@@ -36,7 +36,7 @@ func TestCreateDefaultConfig(t *testing.T) {
  assert.NoError(t, configcheck.ValidateConfig(cfg))
 }
 
-func TestCreateTraceExporter(t *testing.T) {
+func TestCreateTracesExporter(t *testing.T) {
  logger := zap.NewNop()
 
  factories, err := componenttest.NopFactories()

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.24.1-0.20210414150520-7b9a2651fe8e
+ go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
  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
@@ -1048,8 +1048,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.24.1-0.20210414150520-7b9a2651fe8e h1:jBdlkJx7nw6aGPSPq5YfTTOfnGXAdSzx9yNDoaTRC3A=
-go.opentelemetry.io/collector v0.24.1-0.20210414150520-7b9a2651fe8e/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327 h1:Br2+gOanaGNcN5KUyJM56Flpf7ex3D/rZtAQkm1h3C0=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
 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/factory.go b/exporter/awskinesisexporter/factory.go
@@ -34,7 +34,7 @@ func NewFactory() component.ExporterFactory {
  return exporterhelper.NewFactory(
  typeStr,
  createDefaultConfig,
- exporterhelper.WithTraces(createTraceExporter))
+ exporterhelper.WithTraces(createTracesExporter))
 }
 
 func createDefaultConfig() config.Exporter {
@@ -59,7 +59,7 @@ func createDefaultConfig() config.Exporter {
  }
 }
 
-func createTraceExporter(
+func createTracesExporter(
  _ context.Context,
  params component.ExporterCreateParams,
  config config.Exporter,

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.24.1-0.20210414150520-7b9a2651fe8e
+ go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
  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
@@ -1078,8 +1078,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.24.1-0.20210414150520-7b9a2651fe8e h1:jBdlkJx7nw6aGPSPq5YfTTOfnGXAdSzx9yNDoaTRC3A=
-go.opentelemetry.io/collector v0.24.1-0.20210414150520-7b9a2651fe8e/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327 h1:Br2+gOanaGNcN5KUyJM56Flpf7ex3D/rZtAQkm1h3C0=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
 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/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.24.1-0.20210414150520-7b9a2651fe8e
+ go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
  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
@@ -1048,8 +1048,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.24.1-0.20210414150520-7b9a2651fe8e h1:jBdlkJx7nw6aGPSPq5YfTTOfnGXAdSzx9yNDoaTRC3A=
-go.opentelemetry.io/collector v0.24.1-0.20210414150520-7b9a2651fe8e/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327 h1:Br2+gOanaGNcN5KUyJM56Flpf7ex3D/rZtAQkm1h3C0=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
 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
@@ -33,9 +33,9 @@ const (
  maxSegmentsPerPut = int(50) // limit imposed by PutTraceSegments API
 )
 
-// newTraceExporter creates an component.TraceExporter that converts to an X-Ray PutTraceSegments
+// newTracesExporter creates an component.TracesExporter that converts to an X-Ray PutTraceSegments
 // request and then posts the request to the configured region's X-Ray endpoint.
-func newTraceExporter(
+func newTracesExporter(
  config config.Exporter, params component.ExporterCreateParams, cn connAttr) (component.TracesExporter, error) {
  typeLog := zap.String("type", string(config.Type()))
  nameLog := zap.String("name", config.Name())
@@ -45,12 +45,12 @@ func newTraceExporter(
  return nil, err
  }
  xrayClient := newXRay(logger, awsConfig, params.ApplicationStartInfo, session)
- return exporterhelper.NewTraceExporter(
+ return exporterhelper.NewTracesExporter(
  config,
  logger,
  func(ctx context.Context, td pdata.Traces) error {
  var err error
- logger.Debug("TraceExporter", typeLog, nameLog, zap.Int("#spans", td.SpanCount()))
+ logger.Debug("TracesExporter", typeLog, nameLog, zap.Int("#spans", td.SpanCount()))
  documents := make([]*string, 0, td.SpanCount())
  for i := 0; i < td.ResourceSpans().Len(); i++ {
  rspans := td.ResourceSpans().At(i)

diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestTraceExport(t *testing.T) {
- traceExporter := initializeTraceExporter()
+ traceExporter := initializeTracesExporter()
  ctx := context.Background()
  td := constructSpanData()
  err := traceExporter.ConsumeTraces(ctx, td)
@@ -40,8 +40,8 @@ func TestTraceExport(t *testing.T) {
  assert.Nil(t, err)
 }
 
-func BenchmarkForTraceExporter(b *testing.B) {
- traceExporter := initializeTraceExporter()
+func BenchmarkForTracesExporter(b *testing.B) {
+ traceExporter := initializeTracesExporter()
  for i := 0; i < b.N; i++ {
  b.StopTimer()
  ctx := context.Background()
@@ -51,7 +51,7 @@ func BenchmarkForTraceExporter(b *testing.B) {
  }
 }
 
-func initializeTraceExporter() component.TracesExporter {
+func initializeTracesExporter() component.TracesExporter {
  os.Setenv("AWS_ACCESS_KEY_ID", "AKIASSWVJUY4PZXXXXXX")
  os.Setenv("AWS_SECRET_ACCESS_KEY", "XYrudg2H87u+ADAAq19Wqx3D41a09RsTXXXXXXXX")
  os.Setenv("AWS_DEFAULT_REGION", "us-east-1")
@@ -63,7 +63,7 @@ func initializeTraceExporter() component.TracesExporter {
  config.(*Config).LocalMode = true
  mconn := new(mockConn)
  mconn.sn, _ = getDefaultSession(logger)
- traceExporter, err := newTraceExporter(config, component.ExporterCreateParams{Logger: logger}, mconn)
+ traceExporter, err := newTracesExporter(config, component.ExporterCreateParams{Logger: logger}, mconn)
  if err != nil {
  panic(err)
  }

diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go
@@ -32,7 +32,7 @@ func NewFactory() component.ExporterFactory {
  return exporterhelper.NewFactory(
  typeStr,
  createDefaultConfig,
- exporterhelper.WithTraces(createTraceExporter))
+ exporterhelper.WithTraces(createTracesExporter))
 }
 
 func createDefaultConfig() config.Exporter {
@@ -51,11 +51,11 @@ func createDefaultConfig() config.Exporter {
  }
 }
 
-func createTraceExporter(
+func createTracesExporter(
  _ context.Context,
  params component.ExporterCreateParams,
  cfg config.Exporter,
 ) (component.TracesExporter, error) {
  eCfg := cfg.(*Config)
- return newTraceExporter(eCfg, params, &Conn{})
+ return newTracesExporter(eCfg, params, &Conn{})
 }
diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go
@@ -48,7 +48,7 @@ func TestCreateDefaultConfig(t *testing.T) {
  assert.NoError(t, configcheck.ValidateConfig(cfg))
 }
 
-func TestCreateTraceExporter(t *testing.T) {
+func TestCreateTracesExporter(t *testing.T) {
  logger := zap.NewNop()
 
  factories, err := componenttest.NopFactories()

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.24.1-0.20210414150520-7b9a2651fe8e
+ go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
  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
@@ -1048,8 +1048,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.24.1-0.20210414150520-7b9a2651fe8e h1:jBdlkJx7nw6aGPSPq5YfTTOfnGXAdSzx9yNDoaTRC3A=
-go.opentelemetry.io/collector v0.24.1-0.20210414150520-7b9a2651fe8e/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327 h1:Br2+gOanaGNcN5KUyJM56Flpf7ex3D/rZtAQkm1h3C0=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
 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/factory.go b/exporter/azuremonitorexporter/factory.go
@@ -42,7 +42,7 @@ func NewFactory() component.ExporterFactory {
  return exporterhelper.NewFactory(
  typeStr,
  createDefaultConfig,
- exporterhelper.WithTraces(f.createTraceExporter))
+ exporterhelper.WithTraces(f.createTracesExporter))
 }
 
 // Implements the interface from go.opentelemetry.io/collector/exporter/factory.go
@@ -59,7 +59,7 @@ func createDefaultConfig() config.Exporter {
  }
 }
 
-func (f *factory) createTraceExporter(
+func (f *factory) createTracesExporter(
  ctx context.Context,
  params component.ExporterCreateParams,
  cfg config.Exporter,
@@ -71,7 +71,7 @@ func (f *factory) createTraceExporter(
  }
 
  tc := f.getTransportChannel(exporterConfig, params.Logger)
- return newTraceExporter(exporterConfig, tc, params.Logger)
+ return newTracesExporter(exporterConfig, tc, params.Logger)
 }
 
 // Configures the transport channel.

diff --git a/exporter/azuremonitorexporter/factory_test.go b/exporter/azuremonitorexporter/factory_test.go
@@ -29,30 +29,30 @@ type badConfig struct {
  config.ExporterSettings `mapstructure:",squash"`
 }
 
-func TestCreateTraceExporterUsingSpecificTransportChannel(t *testing.T) {
+func TestCreateTracesExporterUsingSpecificTransportChannel(t *testing.T) {
  // mock transport channel creation
  f := factory{tChannel: &mockTransportChannel{}}
  ctx := context.Background()
  params := component.ExporterCreateParams{Logger: zap.NewNop()}
- exporter, err := f.createTraceExporter(ctx, params, createDefaultConfig())
+ exporter, err := f.createTracesExporter(ctx, params, createDefaultConfig())
  assert.NotNil(t, exporter)
  assert.Nil(t, err)
 }
 
-func TestCreateTraceExporterUsingDefaultTransportChannel(t *testing.T) {
+func TestCreateTracesExporterUsingDefaultTransportChannel(t *testing.T) {
  // We get the default transport channel creation, if we don't specify one during f creation
  f := factory{}
  assert.Nil(t, f.tChannel)
  ctx := context.Background()
  logger, _ := zap.NewDevelopment()
  params := component.ExporterCreateParams{Logger: logger}
- exporter, err := f.createTraceExporter(ctx, params, createDefaultConfig())
+ exporter, err := f.createTracesExporter(ctx, params, createDefaultConfig())
  assert.NotNil(t, exporter)
  assert.Nil(t, err)
  assert.NotNil(t, f.tChannel)
 }
 
-func TestCreateTraceExporterUsingBadConfig(t *testing.T) {
+func TestCreateTracesExporterUsingBadConfig(t *testing.T) {
  // We get the default transport channel creation, if we don't specify one during factory creation
  f := factory{}
  assert.Nil(t, f.tChannel)
@@ -61,7 +61,7 @@ func TestCreateTraceExporterUsingBadConfig(t *testing.T) {
 
  badConfig := &badConfig{}
 
- exporter, err := f.createTraceExporter(ctx, params, badConfig)
+ exporter, err := f.createTracesExporter(ctx, params, badConfig)
  assert.Nil(t, exporter)
  assert.NotNil(t, err)
 }
diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -15,7 +15,7 @@ require (
  github.com/pelletier/go-toml v1.8.0 // indirect
  github.com/stretchr/testify v1.7.0
  github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
- go.opentelemetry.io/collector v0.24.1-0.20210414150520-7b9a2651fe8e
+ go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
  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/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
@@ -1058,8 +1058,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.24.1-0.20210414150520-7b9a2651fe8e h1:jBdlkJx7nw6aGPSPq5YfTTOfnGXAdSzx9yNDoaTRC3A=
-go.opentelemetry.io/collector v0.24.1-0.20210414150520-7b9a2651fe8e/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327 h1:Br2+gOanaGNcN5KUyJM56Flpf7ex3D/rZtAQkm1h3C0=
+go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327/go.mod h1:hXpdip0pVo+lISHAzPtu13QIRHgqC1zZ/4EdgoEC0fc=
 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/traceexporter.go b/exporter/azuremonitorexporter/traceexporter.go
@@ -70,13 +70,13 @@ func (exporter *traceExporter) onTraceData(context context.Context, traceData pd
 }
 
 // Returns a new instance of the trace exporter
-func newTraceExporter(config *Config, transportChannel transportChannel, logger *zap.Logger) (component.TracesExporter, error) {
+func newTracesExporter(config *Config, transportChannel transportChannel, logger *zap.Logger) (component.TracesExporter, error) {
 
  exporter := &traceExporter{
  config: config,
  transportChannel: transportChannel,
  logger: logger,
  }
 
- return exporterhelper.NewTraceExporter(config, logger, exporter.onTraceData)
+ return exporterhelper.NewTracesExporter(config, logger, exporter.onTraceData)
 }