Update contrib to the latest collector code. (#166)

Signed-off-by: Bogdan Drutu <[email protected]>
observIQ · Apr 7, 2020 · 2d96832 · 2d96832
1 parent f41c7ec
commit 2d96832
Show file tree

Hide file tree

Showing 72 changed files with 192 additions and 182 deletions.
diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go
@@ -16,9 +16,9 @@ package main
 
 import (
  "github.com/open-telemetry/opentelemetry-collector/component"
+ "github.com/open-telemetry/opentelemetry-collector/component/componenterror"
  "github.com/open-telemetry/opentelemetry-collector/config"
  "github.com/open-telemetry/opentelemetry-collector/defaults"
- "github.com/open-telemetry/opentelemetry-collector/oterr"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter"
@@ -95,5 +95,5 @@ func components() (config.Factories, error) {
  errs = append(errs, err)
  }
 
- return factories, oterr.CombineErrors(errs)
+ return factories, componenterror.CombineErrors(errs)
 }
diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go
@@ -53,7 +53,9 @@ func NewTraceExporter(config configmodels.Exporter, logger *zap.Logger, cn connA
  }
  return droppedSpans, err
  },
- exporterhelper.WithShutdown(logger.Sync),
+ exporterhelper.WithShutdown(func(context.Context) error {
+ return logger.Sync()
+ }),
  )
 }
 

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -7,7 +7,7 @@ require (
  github.com/census-instrumentation/opencensus-proto v0.2.1
  github.com/golang/protobuf v1.3.5
  github.com/mattn/go-isatty v0.0.10 // indirect
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/stretchr/testify v1.4.0
  go.uber.org/zap v1.10.0
  golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -906,8 +906,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/aws/aws-sdk-go v1.23.20 // indirect
  github.com/census-instrumentation/opencensus-proto v0.2.1
  github.com/golang/protobuf v1.3.5
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/stretchr/testify v1.4.0
  github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
  go.uber.org/multierr v1.4.0 // indirect

diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
@@ -830,8 +830,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/carbonexporter/exporter.go b/exporter/carbonexporter/exporter.go
@@ -77,7 +77,7 @@ func (cs *carbonSender) pushMetricsData(
  return dropped, nil
 }
 
-func (cs *carbonSender) Shutdown() error {
+func (cs *carbonSender) Shutdown(context.Context) error {
  cs.connPool.Close()
  return nil
 }

diff --git a/exporter/carbonexporter/exporter_test.go b/exporter/carbonexporter/exporter_test.go
@@ -149,11 +149,11 @@ func TestConsumeMetricsData(t *testing.T) {
  require.NoError(t, err)
 
  mh := component.NewMockHost()
- require.NoError(t, exp.Start(mh))
+ require.NoError(t, exp.Start(context.Background(), mh))
 
  if !tt.createServer {
  require.Error(t, exp.ConsumeMetricsData(context.Background(), tt.md))
- assert.NoError(t, exp.Shutdown())
+ assert.NoError(t, exp.Shutdown(context.Background()))
  return
  }
 
@@ -163,7 +163,7 @@ func TestConsumeMetricsData(t *testing.T) {
  // See comment about recvfrom at connPool.Write for detailed
  // information.
  exp.ConsumeMetricsData(context.Background(), tt.md)
- assert.NoError(t, exp.Shutdown())
+ assert.NoError(t, exp.Shutdown(context.Background()))
  return
  }
 
@@ -194,7 +194,7 @@ func TestConsumeMetricsData(t *testing.T) {
  }()
 
  require.NoError(t, exp.ConsumeMetricsData(context.Background(), tt.md))
- assert.NoError(t, exp.Shutdown())
+ assert.NoError(t, exp.Shutdown(context.Background()))
 
  wg.Wait()
  })
@@ -271,7 +271,7 @@ func Test_connPool_Concurrency(t *testing.T) {
 
  close(startCh) // Release all workers
  writersWG.Wait()
- sender.Shutdown()
+ sender.Shutdown(context.Background())
 
  recvWG.Wait()
 }

diff --git a/exporter/carbonexporter/factory_test.go b/exporter/carbonexporter/factory_test.go
@@ -15,6 +15,7 @@
 package carbonexporter
 
 import (
+ "context"
  "testing"
 
  "github.com/open-telemetry/opentelemetry-collector/config/configcheck"
@@ -66,5 +67,5 @@ func TestCreateInstanceViaFactory(t *testing.T) {
  assert.NoError(t, err)
  require.NotNil(t, exp)
 
- assert.NoError(t, exp.Shutdown())
+ assert.NoError(t, exp.Shutdown(context.Background()))
 }
diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
  github.com/census-instrumentation/opencensus-proto v0.2.1
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/stretchr/testify v1.4.0
  go.uber.org/zap v1.10.0
 )
diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum
@@ -823,8 +823,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/google/go-cmp v0.4.0
  github.com/honeycombio/opentelemetry-exporter-go v0.3.1
  github.com/klauspost/compress v1.10.2
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/stretchr/testify v1.5.1
  go.opentelemetry.io/otel v0.3.0
  go.uber.org/zap v1.14.0

diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum
@@ -850,8 +850,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/honeycombexporter/honeycomb.go b/exporter/honeycombexporter/honeycomb.go
@@ -19,9 +19,9 @@ import (
 
  "github.com/honeycombio/opentelemetry-exporter-go/honeycomb"
  "github.com/open-telemetry/opentelemetry-collector/component"
+ "github.com/open-telemetry/opentelemetry-collector/component/componenterror"
  "github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
  "github.com/open-telemetry/opentelemetry-collector/exporter/exporterhelper"
- "github.com/open-telemetry/opentelemetry-collector/oterr"
  "go.opentelemetry.io/otel/api/core"
 )
 
@@ -77,7 +77,7 @@ func (e *HoneycombExporter) pushTraceData(ctx context.Context, td consumerdata.T
  }
  }
 
- return len(td.Spans) - goodSpans, oterr.CombineErrors(errs)
+ return len(td.Spans) - goodSpans, componenterror.CombineErrors(errs)
 }
 
 func convertNodeAttributes(attributes map[string]string) []core.KeyValue {
@@ -90,7 +90,7 @@ func convertNodeAttributes(attributes map[string]string) []core.KeyValue {
  return result
 }
 
-func (e *HoneycombExporter) Shutdown() error {
+func (e *HoneycombExporter) Shutdown(context.Context) error {
  e.exporter.Close()
  return nil
 }
diff --git a/exporter/honeycombexporter/honeycomb_test.go b/exporter/honeycombexporter/honeycomb_test.go
@@ -81,7 +81,7 @@ func testTraceExporter(td consumerdata.TraceData, t *testing.T) []honeycombData
  ctx := context.Background()
  err = exporter.ConsumeTraceData(ctx, td)
  require.NoError(t, err)
- exporter.Shutdown()
+ exporter.Shutdown(context.Background())
 
  return got
 }

diff --git a/exporter/jaegerthrifthttpexporter/factory_test.go b/exporter/jaegerthrifthttpexporter/factory_test.go
@@ -15,6 +15,7 @@
 package jaegerthrifthttpexporter
 
 import (
+ "context"
  "testing"
  "time"
 
@@ -60,7 +61,7 @@ func TestCreateInstanceViaFactory(t *testing.T) {
  assert.NoError(t, err)
  assert.NotNil(t, exp)
 
- assert.NoError(t, exp.Shutdown())
+ assert.NoError(t, exp.Shutdown(context.Background()))
 }
 
 func TestFactory_CreateTraceExporter(t *testing.T) {

diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/golang/protobuf v1.3.5
  github.com/google/go-cmp v0.4.0
  github.com/jaegertracing/jaeger v1.17.0
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/stretchr/testify v1.4.0
  go.uber.org/zap v1.10.0
 )
diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum
@@ -814,8 +814,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/kinesisexporter/exporter.go b/exporter/kinesisexporter/exporter.go
@@ -37,12 +37,12 @@ var _ (component.TraceExporterOld) = (*Exporter)(nil)
 // by connecting to the endpoint. Host parameter can be used for communicating
 // with the host after Start() has already returned. If error is returned by
 // Start() then the collector startup will be aborted.
-func (e Exporter) Start(host component.Host) error {
+func (e Exporter) Start(_ context.Context, host component.Host) error {
  return nil
 }
 
 // Shutdown is invoked during exporter shutdown.
-func (e Exporter) Shutdown() error {
+func (e Exporter) Shutdown(context.Context) error {
  e.kinesis.Flush()
  return nil
 }

diff --git a/exporter/kinesisexporter/go.mod b/exporter/kinesisexporter/go.mod
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kinesi
 go 1.14
 
 require (
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/signalfx/opencensus-go-exporter-kinesis v0.4.2
  github.com/stretchr/testify v1.4.0
  go.uber.org/zap v1.10.0

diff --git a/exporter/kinesisexporter/go.sum b/exporter/kinesisexporter/go.sum
@@ -833,8 +833,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/lightstepexporter/go.mod b/exporter/lightstepexporter/go.mod
@@ -4,7 +4,7 @@ go 1.14
 
 require (
  github.com/lightstep/opentelemetry-exporter-go v0.1.5
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/stretchr/testify v1.4.0
  go.opentelemetry.io/otel v0.2.3
  go.uber.org/zap v1.14.0

diff --git a/exporter/lightstepexporter/go.sum b/exporter/lightstepexporter/go.sum
@@ -842,8 +842,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/lightstepexporter/lightstep.go b/exporter/lightstepexporter/lightstep.go
@@ -19,9 +19,9 @@ import (
 
  "github.com/lightstep/opentelemetry-exporter-go/lightstep"
  "github.com/open-telemetry/opentelemetry-collector/component"
+ "github.com/open-telemetry/opentelemetry-collector/component/componenterror"
  "github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
  "github.com/open-telemetry/opentelemetry-collector/exporter/exporterhelper"
- "github.com/open-telemetry/opentelemetry-collector/oterr"
  "go.opentelemetry.io/otel/api/core"
 )
 
@@ -69,11 +69,11 @@ func (e *LightStepExporter) pushTraceData(ctx context.Context, td consumerdata.T
  }
  }
 
- return len(td.Spans) - goodSpans, oterr.CombineErrors(errs)
+ return len(td.Spans) - goodSpans, componenterror.CombineErrors(errs)
 }
 
 // Shutdown closes the LightStep opentelemetry exporter.
-func (e *LightStepExporter) Shutdown() error {
+func (e *LightStepExporter) Shutdown(context.Context) error {
  e.exporter.Close()
  return nil
 }
diff --git a/exporter/sapmexporter/exporter.go b/exporter/sapmexporter/exporter.go
@@ -33,7 +33,7 @@ type sapmExporter struct {
  logger *zap.Logger
 }
 
-func (se *sapmExporter) Shutdown() error {
+func (se *sapmExporter) Shutdown(context.Context) error {
  se.client.Stop()
  return nil
 }

diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmex
 go 1.14
 
 require (
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/signalfx/sapm-proto v0.3.0
  github.com/stretchr/testify v1.4.0
  go.uber.org/multierr v1.4.0 // indirect

diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum
@@ -848,8 +848,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74 h1:iJp3dzRmFnnCZ0ouUl2RGmb9VqfwmypB6lKMpQJbUxE=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74/go.mod h1:c5EgyLBK6FoGCaJpOEQ0j+sHqmfuoRzOm29tdVA/wDg=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a h1:cyWzDa+Yy90KFQtrKj34eu/7CafWvgrX1gDMFV9hoCc=
+github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a/go.mod h1:ToId5i+aPnBYgtZ2i9mN0PWfQ415BSx9uU3h7SF5yQs=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go
@@ -15,6 +15,7 @@
 package signalfxexporter
 
 import (
+ "context"
  "testing"
  "time"
 
@@ -69,7 +70,7 @@ func TestCreateInstanceViaFactory(t *testing.T) {
  assert.NoError(t, err)
  require.NotNil(t, exp)
 
- assert.NoError(t, exp.Shutdown())
+ assert.NoError(t, exp.Shutdown(context.Background()))
 }
 
 func TestFactory_CreateMetricsExporter(t *testing.T) {

diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod
@@ -5,7 +5,7 @@ go 1.14
 require (
  github.com/census-instrumentation/opencensus-proto v0.2.1
  github.com/golang/protobuf v1.3.5
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200403190033-92bb7a9bde74
+ github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200406204246-eea53c92e34a
  github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190530013331-054be550cb49
  github.com/stretchr/testify v1.4.0
  go.uber.org/zap v1.12.0