Skip to content

Commit

Permalink
fix comments and empty parent span check
Browse files Browse the repository at this point in the history
  • Loading branch information
pkositsyn committed Nov 9, 2020
1 parent fc8f5d3 commit 6dc93bc
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 28 deletions.
2 changes: 1 addition & 1 deletion cmd/opentelemetry/app/exporter/badgerexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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}},
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion cmd/opentelemetry/app/exporter/memoryexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6dc93bc

Please sign in to comment.