Update core to latest, fix breaking change in exporter helper Push fu…

…ncs (#2688) Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
bogdandrutu · Mar 15, 2021 · 8c985f8 · 8c985f8
1 parent 047b1d9
commit 8c985f8
Show file tree

Hide file tree

Showing 182 changed files with 535 additions and 627 deletions.
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.22.1-0.20210313001744-407358bb0cca
+	go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61
 	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
@@ -753,7 +753,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
+github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -904,8 +904,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs=
-go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc=
 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
@@ -49,10 +49,11 @@ type logServiceLogsSender struct {
 
 func (s *logServiceLogsSender) pushLogsData(
 	ctx context.Context,
-	md pdata.Logs) (droppedTimeSeries int, err error) {
-	slsLogs, dropped := logDataToLogService(md)
+	md pdata.Logs) error {
+	var err error
+	slsLogs := logDataToLogService(md)
 	if len(slsLogs) > 0 {
 		err = s.client.SendLogs(slsLogs)
 	}
-	return dropped, err
+	return err
 }
diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go
@@ -42,8 +42,7 @@ const (
 	slsLogInstrumentationVersion = "otlp.version"
 )
 
-func logDataToLogService(ld pdata.Logs) ([]*sls.Log, int) {
-	numDroppedLogs := 0
+func logDataToLogService(ld pdata.Logs) []*sls.Log {
 	slsLogs := make([]*sls.Log, 0)
 	rls := ld.ResourceLogs()
 	for i := 0; i < rls.Len(); i++ {
@@ -57,16 +56,14 @@ func logDataToLogService(ld pdata.Logs) ([]*sls.Log, int) {
 			logs := ils.Logs()
 			for j := 0; j < logs.Len(); j++ {
 				slsLog := mapLogRecordToLogService(logs.At(j), resourceContents, instrumentationLibraryContents)
-				if slsLog == nil {
-					numDroppedLogs++
-				} else {
+				if slsLog != nil {
 					slsLogs = append(slsLogs, slsLog)
 				}
 			}
 		}
 	}
 
-	return slsLogs, numDroppedLogs
+	return slsLogs
 }
 
 func resourceToLogContents(resource pdata.Resource) []*sls.LogContent {

diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go
@@ -100,9 +100,8 @@ func createLogData(numberOfLogs int) pdata.Logs {
 func TestLogsDataToLogService(t *testing.T) {
 	totalLogCount := 10
 	validLogCount := totalLogCount - 1
-	gotLogs, dropped := logDataToLogService(createLogData(10))
+	gotLogs := logDataToLogService(createLogData(10))
 	assert.Equal(t, len(gotLogs), 9)
-	assert.Equal(t, dropped, 1)
 
 	gotLogPairs := make([][]logKeyValuePair, 0, len(gotLogs))
 

diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go
@@ -50,10 +50,11 @@ type logServiceMetricsSender struct {
 func (s *logServiceMetricsSender) pushMetricsData(
 	_ context.Context,
 	md pdata.Metrics,
-) (droppedTimeSeries int, err error) {
-	logs, dts := metricsDataToLogServiceData(s.logger, md)
+) error {
+	var err error
+	logs := metricsDataToLogServiceData(s.logger, md)
 	if len(logs) > 0 {
 		err = s.client.SendLogs(logs)
 	}
-	return dts, err
+	return err
 }
diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go
@@ -357,7 +357,7 @@ func metricDataToLogServiceData(md pdata.Metric, defaultLabels KeyValues) (logs
 func metricsDataToLogServiceData(
 	_ *zap.Logger,
 	md pdata.Metrics,
-) (logs []*sls.Log, numDroppedTimeSeries int) {
+) (logs []*sls.Log) {
 
 	resMetrics := md.ResourceMetrics()
 	for i := 0; i < resMetrics.Len(); i++ {
@@ -376,5 +376,5 @@ func metricsDataToLogServiceData(
 		}
 	}
 
-	return logs, numDroppedTimeSeries
+	return logs
 }
diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go
@@ -139,8 +139,7 @@ func TestMetricDataToLogService(t *testing.T) {
 	doubleSummaryDataPoint.QuantileValues().Append(quantileVal)
 	doubleSummaryDataPoint.QuantileValues().Append(quantileVal2)
 
-	gotLogs, gotNumDroppedTimeSeries := metricsDataToLogServiceData(logger, md)
-	assert.Equal(t, gotNumDroppedTimeSeries, 0)
+	gotLogs := metricsDataToLogServiceData(logger, md)
 	gotLogPairs := make([][]logKeyValuePair, 0, len(gotLogs))
 
 	for _, log := range gotLogs {

diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go
@@ -50,11 +50,11 @@ type logServiceTraceSender struct {
 func (s *logServiceTraceSender) pushTraceData(
 	_ context.Context,
 	td pdata.Traces,
-) (int, error) {
+) error {
 	var err error
-	slsLogs, dropped := traceDataToLogServiceData(td)
+	slsLogs := traceDataToLogServiceData(td)
 	if len(slsLogs) > 0 {
 		err = s.client.SendLogs(slsLogs)
 	}
-	return dropped, err
+	return err
 }
diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go
@@ -44,14 +44,14 @@ const (
 )
 
 // traceDataToLogService translates trace data into the LogService format.
-func traceDataToLogServiceData(td pdata.Traces) ([]*sls.Log, int) {
+func traceDataToLogServiceData(td pdata.Traces) []*sls.Log {
 	var slsLogs []*sls.Log
 	resourceSpansSlice := td.ResourceSpans()
 	for i := 0; i < resourceSpansSlice.Len(); i++ {
 		logs := resourceSpansToLogServiceData(resourceSpansSlice.At(i))
 		slsLogs = append(slsLogs, logs...)
 	}
-	return slsLogs, 0
+	return slsLogs
 }
 
 func resourceSpansToLogServiceData(resourceSpans pdata.ResourceSpans) []*sls.Log {

diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go
@@ -40,9 +40,8 @@ func (kv logKeyValuePairs) Swap(i, j int)      { kv[i], kv[j] = kv[j], kv[i] }
 func (kv logKeyValuePairs) Less(i, j int) bool { return kv[i].Key < kv[j].Key }
 
 func TestTraceDataToLogService(t *testing.T) {
-	gotLogs, dropped := traceDataToLogServiceData(constructSpanData())
+	gotLogs := traceDataToLogServiceData(constructSpanData())
 	assert.Equal(t, len(gotLogs), 2)
-	assert.Equal(t, dropped, 0)
 
 	gotLogPairs := make([][]logKeyValuePair, 0, len(gotLogs))
 

diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go
@@ -102,7 +102,7 @@ func NewEmfExporter(
 	)
 }
 
-func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) (droppedTimeSeries int, err error) {
+func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) error {
 	rms := md.ResourceMetrics()
 	labels := map[string]string{}
 	for i := 0; i < rms.Len(); i++ {
@@ -139,8 +139,7 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) (dr
 		if pusher != nil {
 			returnError := pusher.AddLogEntry(putLogEvent)
 			if returnError != nil {
-				err = wrapErrorIfBadRequest(&returnError)
-				return
+				return wrapErrorIfBadRequest(&returnError)
 			}
 		}
 	}
@@ -149,17 +148,17 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) (dr
 		returnError := pusher.ForceFlush()
 		if returnError != nil {
 			//TODO now we only have one pusher, so it's ok to return after first error occurred
-			err = wrapErrorIfBadRequest(&returnError)
+			err := wrapErrorIfBadRequest(&returnError)
 			if err != nil {
 				emf.logger.Error("Error force flushing logs. Skipping to next pusher.", zap.Error(err))
 			}
-			return
+			return err
 		}
 	}
 
 	emf.logger.Info("Finish processing resource metrics", zap.Any("labels", labels))
 
-	return
+	return nil
 }
 
 func (emf *emfExporter) getPusher(logGroup, logStream string) Pusher {
@@ -195,8 +194,7 @@ func (emf *emfExporter) listPushers() []Pusher {
 }
 
 func (emf *emfExporter) ConsumeMetrics(ctx context.Context, md pdata.Metrics) error {
-	_, err := emf.pushMetricsData(ctx, md)
-	return err
+	return emf.pushMetricsData(ctx, md)
 }
 
 // Shutdown stops the exporter and is invoked during shutdown.

diff --git a/exporter/awsemfexporter/emf_exporter_test.go b/exporter/awsemfexporter/emf_exporter_test.go
@@ -463,14 +463,10 @@ func TestPushMetricsDataWithErr(t *testing.T) {
 		},
 	}
 	md := internaldata.OCToMetrics(mdata)
-	_, err = exp.(*emfExporter).pushMetricsData(ctx, md)
-	assert.NotNil(t, err)
-	_, err = exp.(*emfExporter).pushMetricsData(ctx, md)
-	assert.NotNil(t, err)
-	_, err = exp.(*emfExporter).pushMetricsData(ctx, md)
-	assert.Nil(t, err)
-	err = exp.(*emfExporter).Shutdown(ctx)
-	assert.Nil(t, err)
+	assert.NotNil(t, exp.(*emfExporter).pushMetricsData(ctx, md))
+	assert.NotNil(t, exp.(*emfExporter).pushMetricsData(ctx, md))
+	assert.Nil(t, exp.(*emfExporter).pushMetricsData(ctx, md))
+	assert.Nil(t, exp.(*emfExporter).Shutdown(ctx))
 }
 
 func TestNewExporterWithoutConfig(t *testing.T) {

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.22.1-0.20210313001744-407358bb0cca
+	go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61
 	go.opentelemetry.io/otel v0.18.0
 	go.uber.org/zap v1.16.0
 	google.golang.org/protobuf v1.25.0

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -875,8 +875,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y=
-github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
+github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A=
+github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -1046,8 +1046,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs=
-go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc=
 go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8=
 go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78=
 go.opentelemetry.io/otel/metric v0.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE=

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.22.1-0.20210313001744-407358bb0cca
+	go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61
 	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
@@ -889,8 +889,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y=
-github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
+github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A=
+github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -1076,8 +1076,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs=
-go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc=
 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.22.1-0.20210313001744-407358bb0cca
+	go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61
 	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
@@ -875,8 +875,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y=
-github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
+github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A=
+github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -1046,8 +1046,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs=
-go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI=
+go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc=
 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
@@ -48,9 +48,9 @@ func newTraceExporter(
 	return exporterhelper.NewTraceExporter(
 		config,
 		logger,
-		func(ctx context.Context, td pdata.Traces) (totalDroppedSpans int, err error) {
+		func(ctx context.Context, td pdata.Traces) error {
+			var err error
 			logger.Debug("TraceExporter", typeLog, nameLog, zap.Int("#spans", td.SpanCount()))
-			totalDroppedSpans = 0
 			documents := make([]*string, 0, td.SpanCount())
 			for i := 0; i < td.ResourceSpans().Len(); i++ {
 				rspans := td.ResourceSpans().At(i)
@@ -62,7 +62,6 @@ func newTraceExporter(
 							config.(*Config).IndexedAttributes, config.(*Config).IndexAllAttributes)
 						if localErr != nil {
 							logger.Debug("Error translating span.", zap.Error(localErr))
-							totalDroppedSpans++
 							continue
 						}
 						documents = append(documents, &document)
@@ -83,15 +82,12 @@ func newTraceExporter(
 				}
 				if output != nil {
 					logger.Debug("response: " + output.String())
-					if output.UnprocessedTraceSegments != nil {
-						totalDroppedSpans += len(output.UnprocessedTraceSegments)
-					}
 				}
 				if err != nil {
 					break
 				}
 			}
-			return totalDroppedSpans, err
+			return err
 		},
 		exporterhelper.WithShutdown(func(context.Context) error {
 			return logger.Sync()

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.22.1-0.20210313001744-407358bb0cca
+	go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61
 	go.uber.org/zap v1.16.0
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777
 	gopkg.in/ini.v1 v1.57.0 // indirect