Extend IsEmpty to SpanID, remove usage of IsValid (#2342)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Jan 11, 2021 · 28e3cc1 · 28e3cc1
1 parent 60b5a25
commit 28e3cc1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/consumer/pdata/spanid.go b/consumer/pdata/spanid.go
@@ -40,6 +40,12 @@ func (t SpanID) HexString() string {
 }
 
 // IsValid returns true if id contains at leas one non-zero byte.
+// Deprecated: use !IsEmpty() instead.
 func (t SpanID) IsValid() bool {
 	return data.SpanID(t).IsValid()
 }
+
+// IsEmpty returns true if id doesn't contain at least one non-zero byte.
+func (t SpanID) IsEmpty() bool {
+	return !data.SpanID(t).IsValid()
+}
diff --git a/consumer/pdata/trace_test.go b/consumer/pdata/trace_test.go
@@ -95,9 +95,11 @@ func TestSpanCountWithEmpty(t *testing.T) {
 func TestSpanID(t *testing.T) {
 	sid := InvalidSpanID()
 	assert.EqualValues(t, [8]byte{}, sid.Bytes())
+	assert.True(t, sid.IsEmpty())
 
 	sid = NewSpanID([8]byte{1, 2, 3, 4, 4, 3, 2, 1})
 	assert.EqualValues(t, [8]byte{1, 2, 3, 4, 4, 3, 2, 1}, sid.Bytes())
+	assert.False(t, sid.IsEmpty())
 }
 
 func TestTraceID(t *testing.T) {

diff --git a/translator/internaldata/traces_to_oc.go b/translator/internaldata/traces_to_oc.go
@@ -370,15 +370,15 @@ func linksToOC(links pdata.SpanLinkSlice, droppedCount uint32) *octrace.Span_Lin
 }
 
 func traceIDToOC(tid pdata.TraceID) []byte {
-	if !tid.IsValid() {
+	if tid.IsEmpty() {
 		return nil
 	}
 	tidBytes := tid.Bytes()
 	return tidBytes[:]
 }
 
 func spanIDToOC(sid pdata.SpanID) []byte {
-	if !sid.IsValid() {
+	if sid.IsEmpty() {
 		return nil
 	}
 	sidBytes := sid.Bytes()

diff --git a/translator/trace/jaeger/traces_to_jaegerproto.go b/translator/trace/jaeger/traces_to_jaegerproto.go
@@ -274,7 +274,7 @@ func makeJaegerProtoReferences(
 	parentSpanID pdata.SpanID,
 	traceID model.TraceID,
 ) ([]model.SpanRef, error) {
-	parentSpanIDSet := parentSpanID.IsValid()
+	parentSpanIDSet := !parentSpanID.IsEmpty()
 	if !parentSpanIDSet && links.Len() == 0 {
 		return nil, nil
 	}

diff --git a/translator/trace/zipkin/traces_to_zipkinv2.go b/translator/trace/zipkin/traces_to_zipkinv2.go
@@ -101,11 +101,11 @@ func spanToZipkinSpan(
 
 	zs := &zipkinmodel.SpanModel{}
 
-	if !span.TraceID().IsValid() {
+	if span.TraceID().IsEmpty() {
 		return zs, errors.New("TraceID is invalid")
 	}
 	zs.TraceID = convertTraceID(span.TraceID())
-	if !span.SpanID().IsValid() {
+	if span.SpanID().IsEmpty() {
 		return zs, errors.New("SpanID is invalid")
 	}
 	zs.ID = convertSpanID(span.SpanID())
@@ -114,7 +114,7 @@ func spanToZipkinSpan(
 		tags[tracetranslator.TagW3CTraceState] = string(span.TraceState())
 	}
 
-	if span.ParentSpanID().IsValid() {
+	if !span.ParentSpanID().IsEmpty() {
 		id := convertSpanID(span.ParentSpanID())
 		zs.ParentID = &id
 	}