From 6dc93bc9e1e58f3e3389c3b5701dd5552f20a4d2 Mon Sep 17 00:00:00 2001 From: Pavel Kositsyn Date: Mon, 9 Nov 2020 14:05:45 +0300 Subject: [PATCH] fix comments and empty parent span check --- .../app/exporter/badgerexporter/factory.go | 2 +- .../app/exporter/cassandraexporter/factory.go | 2 +- .../esmodeltranslator/modeltranslator.go | 2 +- .../esmodeltranslator/modeltranslator_test.go | 25 +++++++------------ .../exporter/elasticsearchexporter/factory.go | 2 +- .../exporter/grpcpluginexporter/factory.go | 2 +- .../jaegerexporter/jaeger_exporter.go | 2 +- .../exporter/kafkaexporter/kafka_exporter.go | 2 +- .../app/exporter/memoryexporter/factory.go | 2 +- .../resourceprocessor/resource_processor.go | 2 +- .../jaegerreceiver/jaeger_receiver.go | 2 +- .../receiver/kafkareceiver/kafka_receiver.go | 2 +- .../zipkinreceiver/zipkin_receiver.go | 2 +- 13 files changed, 21 insertions(+), 28 deletions(-) diff --git a/cmd/opentelemetry/app/exporter/badgerexporter/factory.go b/cmd/opentelemetry/app/exporter/badgerexporter/factory.go index 0bd125cd1741..dcd1cc1ec26e 100644 --- a/cmd/opentelemetry/app/exporter/badgerexporter/factory.go +++ b/cmd/opentelemetry/app/exporter/badgerexporter/factory.go @@ -89,7 +89,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { } } -// CreateTraceExporter creates Jaeger Cassandra trace exporter. +// CreateTracesExporter creates Jaeger Cassandra trace exporter. // This function implements OTEL component.ExporterFactory interface. func (f Factory) CreateTracesExporter( _ context.Context, diff --git a/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go b/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go index 72f0ab6bd620..9209bcb9cb07 100644 --- a/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go +++ b/cmd/opentelemetry/app/exporter/cassandraexporter/factory.go @@ -71,7 +71,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { } } -// CreateTraceExporter creates Jaeger Cassandra trace exporter. +// CreateTracesExporter creates Jaeger Cassandra trace exporter. // This function implements OTEL component.ExporterFactory interface. func (f Factory) CreateTracesExporter( _ context.Context, diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go index 0c6335795ad7..9c99b7137ea6 100644 --- a/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go +++ b/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go @@ -167,7 +167,7 @@ func toTime(nano pdata.TimestampUnixNano) time.Time { } func references(links pdata.SpanLinkSlice, parentSpanID pdata.SpanID, traceID dbmodel.TraceID) ([]dbmodel.Reference, error) { - parentSpanIDSet := len(parentSpanID.Bytes()) != 0 + parentSpanIDSet := parentSpanID.IsValid() if !parentSpanIDSet && links.Len() == 0 { return emptyReferenceList, nil } diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go index ee7885a0353b..d173d787dd6a 100644 --- a/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go +++ b/cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go @@ -143,8 +143,8 @@ func TestConvertSpan(t *testing.T) { Resource: resource, InstrumentationLibrary: traces.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).InstrumentationLibrary(), DBSpan: &dbmodel.Span{ - TraceID: "30313233343536373839616263646566", - SpanID: "3031323334353637", + TraceID: "000102030405060708090a0b0c0d0e0f", + SpanID: "0001020304050607", StartTime: 1000, Duration: 1000, OperationName: "root", @@ -163,8 +163,8 @@ func TestConvertSpan(t *testing.T) { {Key: "event", Value: "eventName", Type: dbmodel.StringType}, {Key: "foo", Value: "bar", Type: dbmodel.StringType}}, Timestamp: 500}}, References: []dbmodel.Reference{ - {SpanID: "3031323334353637", TraceID: "30313233343536373839616263646566", RefType: dbmodel.ChildOf}, - {SpanID: "3031323334353637", TraceID: "30313233343536373839616263646566", RefType: dbmodel.FollowsFrom}}, + {SpanID: "0001020304050607", TraceID: "000102030405060708090a0b0c0d0e0f", RefType: dbmodel.ChildOf}, + {SpanID: "0001020304050607", TraceID: "000102030405060708090a0b0c0d0e0f", RefType: dbmodel.FollowsFrom}}, Process: dbmodel.Process{ ServiceName: "myservice", Tags: []dbmodel.KeyValue{{Key: "num", Value: "16.66", Type: dbmodel.Float64Type}}, @@ -190,21 +190,15 @@ func TestSpanEmptyRef(t *testing.T) { Resource: traces.ResourceSpans().At(0).Resource(), InstrumentationLibrary: traces.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).InstrumentationLibrary(), DBSpan: &dbmodel.Span{ - TraceID: "30313233343536373839616263646566", - SpanID: "3031323334353637", + TraceID: "000102030405060708090a0b0c0d0e0f", + SpanID: "0001020304050607", StartTime: 1000, Duration: 1000, OperationName: "root", StartTimeMillis: 1, - Tags: []dbmodel.KeyValue{}, // should not be nil - Logs: []dbmodel.Log{}, // should not be nil - References: []dbmodel.Reference{ - { - RefType: "CHILD_OF", - TraceID: "30313233343536373839616263646566", - SpanID: "3031323334353637", - }, - }, + Tags: []dbmodel.KeyValue{}, // should not be nil + Logs: []dbmodel.Log{}, // should not be nil + References: []dbmodel.Reference{}, // should not be nil Process: dbmodel.Process{ ServiceName: "myservice", Tags: nil, @@ -270,7 +264,6 @@ func addSpan(traces pdata.Traces, name string, traceID pdata.TraceID, spanID pda span.SetName(name) span.SetTraceID(traceID) span.SetSpanID(spanID) - span.SetParentSpanID(spanID) span.SetStartTime(pdata.TimestampUnixNano(time.Now().UnixNano())) span.SetEndTime(pdata.TimestampUnixNano(time.Now().UnixNano())) return span diff --git a/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go b/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go index f5e0cee29703..c254e45eddc4 100644 --- a/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go +++ b/cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go @@ -72,7 +72,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { } } -// CreateTraceExporter creates Jaeger Elasticsearch trace exporter. +// CreateTracesExporter creates Jaeger Elasticsearch trace exporter. // This function implements OTEL component.ExporterFactory interface. func (Factory) CreateTracesExporter( ctx context.Context, diff --git a/cmd/opentelemetry/app/exporter/grpcpluginexporter/factory.go b/cmd/opentelemetry/app/exporter/grpcpluginexporter/factory.go index d935ddb21334..741c90878eb4 100644 --- a/cmd/opentelemetry/app/exporter/grpcpluginexporter/factory.go +++ b/cmd/opentelemetry/app/exporter/grpcpluginexporter/factory.go @@ -65,7 +65,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { } } -// CreateTraceExporter creates Jaeger gRPC trace exporter. +// CreateTracesExporter creates Jaeger gRPC trace exporter. // This function implements OTEL component.ExporterFactory interface. func (f Factory) CreateTracesExporter( _ context.Context, diff --git a/cmd/opentelemetry/app/exporter/jaegerexporter/jaeger_exporter.go b/cmd/opentelemetry/app/exporter/jaegerexporter/jaeger_exporter.go index c89a54ca39db..e8ff5d87f314 100644 --- a/cmd/opentelemetry/app/exporter/jaegerexporter/jaeger_exporter.go +++ b/cmd/opentelemetry/app/exporter/jaegerexporter/jaeger_exporter.go @@ -58,7 +58,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { return cfg } -// CreateTraceExporter creates Jaeger trace exporter. +// CreateTracesExporter creates Jaeger trace exporter. // This function implements OTEL component.ExporterFactory interface. func (f Factory) CreateTracesExporter( ctx context.Context, diff --git a/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go b/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go index db916fc18228..4cf4c583b665 100644 --- a/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go +++ b/cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go @@ -97,7 +97,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { return cfg } -// CreateTraceExporter creates Jaeger trace exporter. +// CreateTracesExporter creates Jaeger trace exporter. // This function implements OTEL component.ExporterFactory interface. func (f Factory) CreateTracesExporter( ctx context.Context, diff --git a/cmd/opentelemetry/app/exporter/memoryexporter/factory.go b/cmd/opentelemetry/app/exporter/memoryexporter/factory.go index c45d5881f102..968b09a3bb6f 100644 --- a/cmd/opentelemetry/app/exporter/memoryexporter/factory.go +++ b/cmd/opentelemetry/app/exporter/memoryexporter/factory.go @@ -78,7 +78,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter { } } -// CreateTraceExporter creates Jaeger Kafka trace exporter. +// CreateTracesExporter creates Jaeger Kafka trace exporter. // This function implements OTEL component.ExporterFactory interface. func (f Factory) CreateTracesExporter( _ context.Context, diff --git a/cmd/opentelemetry/app/processor/resourceprocessor/resource_processor.go b/cmd/opentelemetry/app/processor/resourceprocessor/resource_processor.go index d613f4c551bd..b7630576c457 100644 --- a/cmd/opentelemetry/app/processor/resourceprocessor/resource_processor.go +++ b/cmd/opentelemetry/app/processor/resourceprocessor/resource_processor.go @@ -67,7 +67,7 @@ func (f Factory) GetTags() map[string]string { return tags } -// CreateTraceProcessor creates resource processor. +// CreateTracesProcessor creates resource processor. // This function implements OTEL component.ProcessorFactoryOld interface. func (f Factory) CreateTracesProcessor( ctx context.Context, diff --git a/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go b/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go index a6d045d14f1e..0f293dabeb9a 100644 --- a/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go +++ b/cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go @@ -147,7 +147,7 @@ func createDefaultSamplingConfig(v *viper.Viper) *jaegerreceiver.RemoteSamplingC return samplingConf } -// CreateTraceReceiver creates Jaeger receiver trace receiver. +// CreateTracesReceiver creates Jaeger receiver trace receiver. // This function implements OTEL component.ReceiverFactory interface. func (f *Factory) CreateTracesReceiver( ctx context.Context, diff --git a/cmd/opentelemetry/app/receiver/kafkareceiver/kafka_receiver.go b/cmd/opentelemetry/app/receiver/kafkareceiver/kafka_receiver.go index a3d5a327735c..912dc906de96 100644 --- a/cmd/opentelemetry/app/receiver/kafkareceiver/kafka_receiver.go +++ b/cmd/opentelemetry/app/receiver/kafkareceiver/kafka_receiver.go @@ -104,7 +104,7 @@ func (f *Factory) CreateDefaultConfig() configmodels.Receiver { return cfg } -// CreateTraceReceiver creates Jaeger receiver trace receiver. +// CreateTracesReceiver creates Jaeger receiver trace receiver. // This function implements OTEL component.ReceiverFactory interface. func (f *Factory) CreateTracesReceiver( ctx context.Context, diff --git a/cmd/opentelemetry/app/receiver/zipkinreceiver/zipkin_receiver.go b/cmd/opentelemetry/app/receiver/zipkinreceiver/zipkin_receiver.go index cabbe49dc742..8746b0cd195d 100644 --- a/cmd/opentelemetry/app/receiver/zipkinreceiver/zipkin_receiver.go +++ b/cmd/opentelemetry/app/receiver/zipkinreceiver/zipkin_receiver.go @@ -55,7 +55,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Receiver { return cfg } -// CreateTraceReceiver creates Zipkin receiver trace receiver. +// CreateTracesReceiver creates Zipkin receiver trace receiver. // This function implements OTEL component.ReceiverFactoryOld interface. func (f Factory) CreateTracesReceiver( ctx context.Context,