Update Otel core, fix Trace(s)Exporter renaming and testbed changes (#…

…1416)
open-telemetry · Oct 29, 2020 · 1b51650 · 1b51650
1 parent 65f181d
commit 1b51650
Show file tree

Hide file tree

Showing 165 changed files with 957 additions and 13,768 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go
@@ -66,14 +66,14 @@ func TestLoadConfig(t *testing.T) {
 	params := component.ExporterCreateParams{Logger: zap.NewNop()}
 
 	// missing params
-	te, err := factory.CreateTraceExporter(context.Background(), params, e0)
+	te, err := factory.CreateTracesExporter(context.Background(), params, e0)
 	require.Error(t, err)
 	require.Nil(t, te)
 	me, err := factory.CreateMetricsExporter(context.Background(), params, e0)
 	require.Error(t, err)
 	require.Nil(t, me)
 
-	te, err = factory.CreateTraceExporter(context.Background(), params, e1)
+	te, err = factory.CreateTracesExporter(context.Background(), params, e1)
 	require.NoError(t, err)
 	require.NotNil(t, te)
 	me, err = factory.CreateMetricsExporter(context.Background(), params, e1)

diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go
@@ -50,7 +50,7 @@ func createTraceExporter(
 	_ context.Context,
 	params component.ExporterCreateParams,
 	cfg configmodels.Exporter,
-) (component.TraceExporter, error) {
+) (component.TracesExporter, error) {
 	return newTraceExporter(params.Logger, cfg)
 }
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/census-instrumentation/opencensus-proto v0.3.0
 	github.com/gogo/protobuf v1.3.1
 	github.com/stretchr/testify v1.6.1
-	go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
+	go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
 	go.uber.org/zap v1.16.0
 	google.golang.org/protobuf v1.25.0
 )
diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go
@@ -27,7 +27,7 @@ import (
 )
 
 // newTraceExporter return a new LogSerice trace exporter.
-func newTraceExporter(logger *zap.Logger, cfg configmodels.Exporter) (component.TraceExporter, error) {
+func newTraceExporter(logger *zap.Logger, cfg configmodels.Exporter) (component.TracesExporter, error) {
 
 	l := &logServiceTraceSender{
 		logger: logger,

diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go
@@ -49,7 +49,7 @@ func TestCreateTraceExporter(t *testing.T) {
 	require.NoError(t, err)
 
 	ctx := context.Background()
-	exporter, err := factory.CreateTraceExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters["awsemf/1"])
+	exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters["awsemf/1"])
 	assert.NotNil(t, err)
 	assert.Nil(t, exporter)
 }

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -8,6 +8,6 @@ require (
 	github.com/golang/protobuf v1.4.2
 	github.com/google/uuid v1.1.2
 	github.com/stretchr/testify v1.6.1
-	go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
+	go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
 	go.uber.org/zap v1.16.0
 )
diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go
@@ -35,7 +35,7 @@ const (
 
 // NewTraceExporter creates an component.TraceExporterOld that converts to an X-Ray PutTraceSegments
 // request and then posts the request to the configured region's X-Ray endpoint.
-func NewTraceExporter(config configmodels.Exporter, logger *zap.Logger, cn connAttr) (component.TraceExporter, error) {
+func NewTraceExporter(config configmodels.Exporter, logger *zap.Logger, cn connAttr) (component.TracesExporter, error) {
 	typeLog := zap.String("type", string(config.Type()))
 	nameLog := zap.String("name", config.Name())
 	awsConfig, session, err := GetAWSConfigSession(logger, cn, config.(*Config))

diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go
@@ -49,7 +49,7 @@ func BenchmarkForTraceExporter(b *testing.B) {
 	}
 }
 
-func initializeTraceExporter() component.TraceExporter {
+func initializeTraceExporter() 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")

diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go
@@ -58,7 +58,7 @@ func createTraceExporter(
 	_ context.Context,
 	params component.ExporterCreateParams,
 	cfg configmodels.Exporter,
-) (component.TraceExporter, error) {
+) (component.TracesExporter, error) {
 	eCfg := cfg.(*Config)
 	return NewTraceExporter(eCfg, params.Logger, &Conn{})
 }
diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go
@@ -64,7 +64,7 @@ func TestCreateTraceExporter(t *testing.T) {
 	require.NoError(t, err)
 
 	ctx := context.Background()
-	exporter, err := factory.CreateTraceExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters["awsxray/customname"])
+	exporter, err := factory.CreateTracesExporter(ctx, component.ExporterCreateParams{Logger: logger}, cfg.Exporters["awsxray/customname"])
 	assert.Nil(t, err)
 	assert.NotNil(t, exporter)
 }

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/aws/aws-sdk-go v1.35.17
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.6.1
-	go.opentelemetry.io/collector v0.13.1-0.20201029001237-1d38caf3b757
+	go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
 	go.uber.org/zap v1.16.0
 	golang.org/x/net v0.0.0-20200822124328-c89045814202
 	google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect