SpanKind support for badger

cmd/jaeger/internal/integration/badger_test.go

@@ -17,10 +17,6 @@ func TestBadgerStorage(t *testing.T) {
 		StorageIntegration: integration.StorageIntegration{
 			SkipArchiveTest: true,
 			CleanUp:         purge,
-
-			// TODO: remove this once badger supports returning spanKind from GetOperations
-			// Cf https://github.com/jaegertracing/jaeger/issues/1922
-			GetOperationsMissingSpanKind: true,
 		},
 	}
 	s.e2eInitialize(t, "badger")

model/converter/thrift/zipkin/to_domain.go

@@ -392,7 +392,9 @@
 func (toDomain) getSpanKindTag(annotations []*zipkincore.Annotation) (model.KeyValue, bool) {
 	for _, a := range annotations {
 		if spanKind, ok := coreAnnotations[a.Value]; ok {
-			return model.SpanKindTag(model.SpanKind(spanKind)), true
+			if k, err := model.SpanKindFromString(spanKind); err == nil {
+				return model.SpanKindTag(k), true
+			}
 		}
 	}
 	return model.KeyValue{}, false

model/converter/thrift/zipkin/to_domain_test.go

@@ -106,8 +106,8 @@ func TestToDomainMultipleSpanKinds(t *testing.T) {
 		json         string
 		tagFirstKey  string
 		tagSecondKey string
-		tagFirstVal  model.SpanKind
-		tagSecondVal model.SpanKind
+		tagFirstVal  string
+		tagSecondVal string
 	}{
 		{
 			json: `[{ "trace_id": -1, "id": 31, "annotations": [
@@ -117,8 +117,8 @@ func TestToDomainMultipleSpanKinds(t *testing.T) {
 		]}]`,
 			tagFirstKey:  model.SpanKindKey,
 			tagSecondKey: model.SpanKindKey,
-			tagFirstVal:  model.SpanKindClient,
-			tagSecondVal: model.SpanKindServer,
+			tagFirstVal:  model.SpanKindClient.String(),
+			tagSecondVal: model.SpanKindServer.String(),
 		},
 		{
 			json: `[{ "trace_id": -1, "id": 31, "annotations": [
@@ -128,8 +128,8 @@ func TestToDomainMultipleSpanKinds(t *testing.T) {
 		]}]`,
 			tagFirstKey:  model.SpanKindKey,
 			tagSecondKey: model.SpanKindKey,
-			tagFirstVal:  model.SpanKindServer,
-			tagSecondVal: model.SpanKindClient,
+			tagFirstVal:  model.SpanKindServer.String(),
+			tagSecondVal: model.SpanKindClient.String(),
 		},
 	}
 

model/keyvalue.go

@@ -31,24 +31,70 @@
 	SamplerParamKey = "sampler.param"
 )
 
-type SpanKind string
+type SpanKind int
 
 const (
-	SpanKindClient      SpanKind = "client"
-	SpanKindServer      SpanKind = "server"
-	SpanKindProducer    SpanKind = "producer"
-	SpanKindConsumer    SpanKind = "consumer"
-	SpanKindInternal    SpanKind = "internal"
-	SpanKindUnspecified SpanKind = ""
+	SpanKindUnspecified SpanKind = iota
+	SpanKindClient
+	SpanKindServer
+	SpanKindProducer
+	SpanKindConsumer
+	SpanKindInternal
 )
 
+var toSpanKind = map[string]SpanKind{
+	"client":   SpanKindClient,
+	"server":   SpanKindServer,
+	"producer": SpanKindProducer,
+	"consumer": SpanKindConsumer,
+	"internal": SpanKindInternal,
+	"":         SpanKindUnspecified,
+}
+
 func SpanKindFromString(kind string) (SpanKind, error) {
-	switch SpanKind(kind) {
-	case SpanKindClient, SpanKindServer, SpanKindProducer, SpanKindConsumer, SpanKindInternal, SpanKindUnspecified:
-		return SpanKind(kind), nil
+	if sKind, ok := toSpanKind[kind]; ok {
+		return sKind, nil
+	}
+	return SpanKindUnspecified, fmt.Errorf("unknown span kind %s", kind)
+}
+
+func (sk SpanKind) String() string {
+	switch sk {
+	case SpanKindClient:
+		return "client"
+	case SpanKindServer:
+		return "server"
+	case SpanKindProducer:
+		return "producer"
+	case SpanKindConsumer:
+		return "consumer"
+	case SpanKindInternal:
+		return "internal"
+	default:
+		return ""
+	}
+}
+
+func (sk SpanKind) Validate() bool {
+	switch sk {
+	case SpanKindClient, SpanKindServer, SpanKindProducer, SpanKindConsumer, SpanKindInternal:
+		return true
 	default:
-		return SpanKindUnspecified, fmt.Errorf("unknown span kind %q", kind)
+		return false
+	}
+}
+
+func GetSpanKindFromStringNumericString(s string) SpanKind {
+	kind, err := strconv.Atoi(s)
+	if err != nil {
+		return SpanKindUnspecified
+	}
+	sKind := SpanKind(kind)
+	ok := sKind.Validate()
+	if !ok {
+		return SpanKindUnspecified
 	}
+	return sKind
 }
 
 // KeyValues is a type alias that exposes convenience functions like Sort, FindByKey.

model/span.go

@@ -58,7 +58,7 @@
 }
 
 func SpanKindTag(kind SpanKind) KeyValue {
-	return String(SpanKindKey, string(kind))
+	return String(SpanKindKey, kind.String())
 }
 
 // Hash implements Hash from Hashable.
@@ -72,7 +72,7 @@
 // HasSpanKind returns true if the span has a `span.kind` tag set to `kind`.
 func (s *Span) HasSpanKind(kind SpanKind) bool {
 	if tag, ok := KeyValues(s.Tags).FindByKey(SpanKindKey); ok {
-		return tag.AsString() == string(kind)
+		return tag.AsString() == kind.String()
 	}
 	return false
 }

model/span_test.go

@@ -207,7 +207,7 @@ func TestGetSpanKind(t *testing.T) {
 	assert.Equal(t, model.SpanKindUnspecified, spanKind)
 	assert.False(t, found)
 
-	span = makeSpan(model.SpanKindTag("client"))
+	span = makeSpan(model.SpanKindTag(model.SpanKindClient))
 	spanKind, found = span.GetSpanKind()
 	assert.Equal(t, model.SpanKindClient, spanKind)
 	assert.True(t, found)