Replace usage of OpenTracing constants with OpenTelemetry in the domain model

model/span.go

@@ -20,8 +20,8 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/opentracing/opentracing-go/ext"
 	"github.com/uber/jaeger-client-go"
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 )
 
@@ -34,6 +34,7 @@ const (
 	FirehoseFlag = Flags(8)
 
 	samplerType        = "sampler.type"
+	keySpanKind        = "span.kind"
 	samplerTypeUnknown = "unknown"
 )
 
@@ -49,19 +50,19 @@ func (s *Span) Hash(w io.Writer) (err error) {
 }
 
 // HasSpanKind returns true if the span has a `span.kind` tag set to `kind`.
-func (s *Span) HasSpanKind(kind ext.SpanKindEnum) bool {
-	if tag, ok := KeyValues(s.Tags).FindByKey(string(ext.SpanKind)); ok {
-		return tag.AsString() == string(kind)
+func (s *Span) HasSpanKind(kind trace.SpanKind) bool {
+	if tag, ok := KeyValues(s.Tags).FindByKey(keySpanKind); ok {
+		return tag.AsString() == kind.String()
 	}
 	return false
 }
 
 // GetSpanKind returns value of `span.kind` tag and whether the tag can be found
 func (s *Span) GetSpanKind() (spanKind string, found bool) {
-	if tag, ok := KeyValues(s.Tags).FindByKey(string(ext.SpanKind)); ok {
+	if tag, ok := KeyValues(s.Tags).FindByKey(keySpanKind); ok {
 		return tag.AsString(), true
 	}
-	return "", false
+	return trace.SpanKindUnspecified.String(), false
 }
 
 // GetSamplerType returns the sampler type for span
@@ -79,13 +80,13 @@ func (s *Span) GetSamplerType() string {
 // IsRPCClient returns true if the span represents a client side of an RPC,
 // as indicated by the `span.kind` tag set to `client`.
 func (s *Span) IsRPCClient() bool {
-	return s.HasSpanKind(ext.SpanKindRPCClientEnum)
+	return s.HasSpanKind(trace.SpanKindClient)
 }
 
 // IsRPCServer returns true if the span represents a server side of an RPC,
 // as indicated by the `span.kind` tag set to `server`.
 func (s *Span) IsRPCServer() bool {
-	return s.HasSpanKind(ext.SpanKindRPCServerEnum)
+	return s.HasSpanKind(trace.SpanKindServer)
 }
 
 // NormalizeTimestamps changes all timestamps in this span to UTC.

model/span_test.go

@@ -23,9 +23,9 @@ import (
 
 	"github.com/gogo/protobuf/jsonpb"
 	"github.com/gogo/protobuf/proto"
-	"github.com/opentracing/opentracing-go/ext"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/model"
@@ -188,7 +188,7 @@ func TestSpanIDUnmarshalJSONErrors(t *testing.T) {
 func TestIsRPCClientServer(t *testing.T) {
 	span1 := &model.Span{
 		Tags: model.KeyValues{
-			model.String(string(ext.SpanKind), string(ext.SpanKindRPCClientEnum)),
+			model.String(string("span.kind"), trace.SpanKindClient.String()),
 		},
 	}
 	assert.True(t, span1.IsRPCClient())
@@ -227,12 +227,12 @@ func TestIsFirehoseEnabled(t *testing.T) {
 func TestGetSpanKind(t *testing.T) {
 	span := makeSpan(model.String("sampler.type", "lowerbound"))
 	spanKind, found := span.GetSpanKind()
-	assert.Equal(t, "", spanKind)
+	assert.Equal(t, trace.SpanKind.String(0), spanKind)
 	assert.Equal(t, false, found)
 
 	span = makeSpan(model.String("span.kind", "client"))
 	spanKind, found = span.GetSpanKind()
-	assert.Equal(t, "client", spanKind)
+	assert.Equal(t, trace.SpanKind.String(3), spanKind)
 	assert.Equal(t, true, found)
 }
 

plugin/storage/cassandra/spanstore/writer_test.go

@@ -401,7 +401,7 @@ func TestStorageMode_IndexOnly_FirehoseSpan(t *testing.T) {
 		assert.Equal(t, "planet-express", serviceWritten.Load())
 		assert.Equal(t, dbmodel.Operation{
 			ServiceName:   "planet-express",
-			SpanKind:      "",
+			SpanKind:      "unspecified",
 			OperationName: "package-delivery",
 		}, operationWritten.Load())
 	}, StoreIndexesOnly())