Skip to content

Commit f6a0e29

Browse files
pkositsynpkositsyn
committed
fix comments and empty parent span check
Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>
1 parent fc8f5d3 commit f6a0e29

File tree

13 files changed

+21
-28
lines changed

13 files changed

+21
-28
lines changed

‎cmd/opentelemetry/app/exporter/badgerexporter/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
8989
}
9090
}
9191

92-
// CreateTraceExporter creates Jaeger Cassandra trace exporter.
92+
// CreateTracesExporter creates Jaeger Cassandra trace exporter.
9393
// This function implements OTEL component.ExporterFactory interface.
9494
func (f Factory) CreateTracesExporter(
9595
_ context.Context,

‎cmd/opentelemetry/app/exporter/cassandraexporter/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
7171
}
7272
}
7373

74-
// CreateTraceExporter creates Jaeger Cassandra trace exporter.
74+
// CreateTracesExporter creates Jaeger Cassandra trace exporter.
7575
// This function implements OTEL component.ExporterFactory interface.
7676
func (f Factory) CreateTracesExporter(
7777
_ context.Context,

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func toTime(nano pdata.TimestampUnixNano) time.Time {
167167
}
168168

169169
func references(links pdata.SpanLinkSlice, parentSpanID pdata.SpanID, traceID dbmodel.TraceID) ([]dbmodel.Reference, error) {
170-
parentSpanIDSet := len(parentSpanID.Bytes()) != 0
170+
parentSpanIDSet := parentSpanID.IsValid()
171171
if !parentSpanIDSet && links.Len() == 0 {
172172
return emptyReferenceList, nil
173173
}

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/esmodeltranslator/modeltranslator_test.go

+9-16
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ func TestConvertSpan(t *testing.T) {
143143
Resource: resource,
144144
InstrumentationLibrary: traces.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).InstrumentationLibrary(),
145145
DBSpan: &dbmodel.Span{
146-
TraceID: "30313233343536373839616263646566",
147-
SpanID: "3031323334353637",
146+
TraceID: "000102030405060708090a0b0c0d0e0f",
147+
SpanID: "0001020304050607",
148148
StartTime: 1000,
149149
Duration: 1000,
150150
OperationName: "root",
@@ -163,8 +163,8 @@ func TestConvertSpan(t *testing.T) {
163163
{Key: "event", Value: "eventName", Type: dbmodel.StringType},
164164
{Key: "foo", Value: "bar", Type: dbmodel.StringType}}, Timestamp: 500}},
165165
References: []dbmodel.Reference{
166-
{SpanID: "3031323334353637", TraceID: "30313233343536373839616263646566", RefType: dbmodel.ChildOf},
167-
{SpanID: "3031323334353637", TraceID: "30313233343536373839616263646566", RefType: dbmodel.FollowsFrom}},
166+
{SpanID: "0001020304050607", TraceID: "000102030405060708090a0b0c0d0e0f", RefType: dbmodel.ChildOf},
167+
{SpanID: "0001020304050607", TraceID: "000102030405060708090a0b0c0d0e0f", RefType: dbmodel.FollowsFrom}},
168168
Process: dbmodel.Process{
169169
ServiceName: "myservice",
170170
Tags: []dbmodel.KeyValue{{Key: "num", Value: "16.66", Type: dbmodel.Float64Type}},
@@ -190,21 +190,15 @@ func TestSpanEmptyRef(t *testing.T) {
190190
Resource: traces.ResourceSpans().At(0).Resource(),
191191
InstrumentationLibrary: traces.ResourceSpans().At(0).InstrumentationLibrarySpans().At(0).InstrumentationLibrary(),
192192
DBSpan: &dbmodel.Span{
193-
TraceID: "30313233343536373839616263646566",
194-
SpanID: "3031323334353637",
193+
TraceID: "000102030405060708090a0b0c0d0e0f",
194+
SpanID: "0001020304050607",
195195
StartTime: 1000,
196196
Duration: 1000,
197197
OperationName: "root",
198198
StartTimeMillis: 1,
199-
Tags: []dbmodel.KeyValue{}, // should not be nil
200-
Logs: []dbmodel.Log{}, // should not be nil
201-
References: []dbmodel.Reference{
202-
{
203-
RefType: "CHILD_OF",
204-
TraceID: "30313233343536373839616263646566",
205-
SpanID: "3031323334353637",
206-
},
207-
},
199+
Tags: []dbmodel.KeyValue{}, // should not be nil
200+
Logs: []dbmodel.Log{}, // should not be nil
201+
References: []dbmodel.Reference{}, // should not be nil
208202
Process: dbmodel.Process{
209203
ServiceName: "myservice",
210204
Tags: nil,
@@ -270,7 +264,6 @@ func addSpan(traces pdata.Traces, name string, traceID pdata.TraceID, spanID pda
270264
span.SetName(name)
271265
span.SetTraceID(traceID)
272266
span.SetSpanID(spanID)
273-
span.SetParentSpanID(spanID)
274267
span.SetStartTime(pdata.TimestampUnixNano(time.Now().UnixNano()))
275268
span.SetEndTime(pdata.TimestampUnixNano(time.Now().UnixNano()))
276269
return span

‎cmd/opentelemetry/app/exporter/elasticsearchexporter/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
7272
}
7373
}
7474

75-
// CreateTraceExporter creates Jaeger Elasticsearch trace exporter.
75+
// CreateTracesExporter creates Jaeger Elasticsearch trace exporter.
7676
// This function implements OTEL component.ExporterFactory interface.
7777
func (Factory) CreateTracesExporter(
7878
ctx context.Context,

‎cmd/opentelemetry/app/exporter/grpcpluginexporter/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
6565
}
6666
}
6767

68-
// CreateTraceExporter creates Jaeger gRPC trace exporter.
68+
// CreateTracesExporter creates Jaeger gRPC trace exporter.
6969
// This function implements OTEL component.ExporterFactory interface.
7070
func (f Factory) CreateTracesExporter(
7171
_ context.Context,

‎cmd/opentelemetry/app/exporter/jaegerexporter/jaeger_exporter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
5858
return cfg
5959
}
6060

61-
// CreateTraceExporter creates Jaeger trace exporter.
61+
// CreateTracesExporter creates Jaeger trace exporter.
6262
// This function implements OTEL component.ExporterFactory interface.
6363
func (f Factory) CreateTracesExporter(
6464
ctx context.Context,

‎cmd/opentelemetry/app/exporter/kafkaexporter/kafka_exporter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
9797
return cfg
9898
}
9999

100-
// CreateTraceExporter creates Jaeger trace exporter.
100+
// CreateTracesExporter creates Jaeger trace exporter.
101101
// This function implements OTEL component.ExporterFactory interface.
102102
func (f Factory) CreateTracesExporter(
103103
ctx context.Context,

‎cmd/opentelemetry/app/exporter/memoryexporter/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Exporter {
7878
}
7979
}
8080

81-
// CreateTraceExporter creates Jaeger Kafka trace exporter.
81+
// CreateTracesExporter creates Jaeger Kafka trace exporter.
8282
// This function implements OTEL component.ExporterFactory interface.
8383
func (f Factory) CreateTracesExporter(
8484
_ context.Context,

‎cmd/opentelemetry/app/processor/resourceprocessor/resource_processor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (f Factory) GetTags() map[string]string {
6767
return tags
6868
}
6969

70-
// CreateTraceProcessor creates resource processor.
70+
// CreateTracesProcessor creates resource processor.
7171
// This function implements OTEL component.ProcessorFactoryOld interface.
7272
func (f Factory) CreateTracesProcessor(
7373
ctx context.Context,

‎cmd/opentelemetry/app/receiver/jaegerreceiver/jaeger_receiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func createDefaultSamplingConfig(v *viper.Viper) *jaegerreceiver.RemoteSamplingC
147147
return samplingConf
148148
}
149149

150-
// CreateTraceReceiver creates Jaeger receiver trace receiver.
150+
// CreateTracesReceiver creates Jaeger receiver trace receiver.
151151
// This function implements OTEL component.ReceiverFactory interface.
152152
func (f *Factory) CreateTracesReceiver(
153153
ctx context.Context,

‎cmd/opentelemetry/app/receiver/kafkareceiver/kafka_receiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (f *Factory) CreateDefaultConfig() configmodels.Receiver {
104104
return cfg
105105
}
106106

107-
// CreateTraceReceiver creates Jaeger receiver trace receiver.
107+
// CreateTracesReceiver creates Jaeger receiver trace receiver.
108108
// This function implements OTEL component.ReceiverFactory interface.
109109
func (f *Factory) CreateTracesReceiver(
110110
ctx context.Context,

‎cmd/opentelemetry/app/receiver/zipkinreceiver/zipkin_receiver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (f Factory) CreateDefaultConfig() configmodels.Receiver {
5555
return cfg
5656
}
5757

58-
// CreateTraceReceiver creates Zipkin receiver trace receiver.
58+
// CreateTracesReceiver creates Zipkin receiver trace receiver.
5959
// This function implements OTEL component.ReceiverFactoryOld interface.
6060
func (f Factory) CreateTracesReceiver(
6161
ctx context.Context,

0 commit comments

Comments
 (0)