sets the span kind

Signed-off-by: Afzal <94980910+afzalbin64@users.noreply.github.com>

Author: sbin64

cmd/query/app/apiv3/otlp_translator.go

@@ -109,7 +109,7 @@ func jSpanToOTLP(jSpan *model.Span) (*tracev1.Span, resource, instrumentationLib
 		Events:            jLogsToOTLP(jSpan.GetLogs()),
 		Links:             jReferencesToOTLP(jSpan.GetReferences(), jSpan.ParentSpanID()),
 		Status:            status,
-		Kind:              tracev1.Span_SPAN_KIND_INTERNAL,
+		Kind:              tracev1.Span_SPAN_KIND_UNSPECIFIED,
 	}
 	if kind, found := jSpan.GetSpanKind(); found {
 		s.Kind = jSpanKindToInternal(kind.String())

model/span.go

@@ -41,13 +41,16 @@ const (
 // Flags is a bit map of flags for a span
 type Flags uint32
 
-// Map from string to trace.SpanKind
-var spanKindMapping = map[string]trace.SpanKind{
-	"client":   trace.SpanKindClient,
-	"server":   trace.SpanKindServer,
-	"producer": trace.SpanKindProducer,
-	"consumer": trace.SpanKindConsumer,
-	"internal": trace.SpanKindInternal,
+// Map from string to trace.SpanKind.
+func toSpanKind(s string) (trace.SpanKind, bool) {
+	sk, found := map[string]trace.SpanKind{
+		"client":   trace.SpanKindClient,
+		"server":   trace.SpanKindServer,
+		"producer": trace.SpanKindProducer,
+		"consumer": trace.SpanKindConsumer,
+		"internal": trace.SpanKindInternal,
+	}[s]
+	return sk, found
 }
 
 // Hash implements Hash from Hashable.
@@ -69,7 +72,7 @@ func (s *Span) HasSpanKind(kind trace.SpanKind) bool {
 // GetSpanKind returns value of `span.kind` tag and whether the tag can be found
 func (s *Span) GetSpanKind() (spanKind trace.SpanKind, found bool) {
 	if tag, ok := KeyValues(s.Tags).FindByKey(keySpanKind); ok {
-		if kind, ok := spanKindMapping[tag.AsString()]; ok {
+		if kind, ok := toSpanKind(tag.AsString()); ok {
 			return kind, true
 		}
 	}

model/span_test.go

@@ -122,6 +122,8 @@ var (
 	}
 )
 
+const keySpanKind = "span.kind"
+
 func TestSpanIDMarshalJSON(t *testing.T) {
 	for _, testCase := range testCasesSpanID {
 		expected := fmt.Sprintf(`{"traceId":"AAAAAAAAAAAAAAAAAAAAAA==","spanId":"%s"}`, testCase.b64)
@@ -188,7 +190,7 @@ func TestSpanIDUnmarshalJSONErrors(t *testing.T) {
 func TestIsRPCClientServer(t *testing.T) {
 	span1 := &model.Span{
 		Tags: model.KeyValues{
-			model.String(string("span.kind"), trace.SpanKindClient.String()),
+			model.String(keySpanKind, trace.SpanKindClient.String()),
 		},
 	}
 	assert.True(t, span1.IsRPCClient())