Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 29, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
178 changes: 16 additions & 162 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/trace_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
301 changes: 17 additions & 284 deletions exporter/awsemfexporter/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/awsxray.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/awsxray_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{})
}
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading