end

Signed-off-by: Manik2708 <mehtamanik96@gmail.com>

Author: Manik2708

internal/storage/v2/elasticsearch/tracestore/tag_appender_test.go

@@ -7,14 +7,15 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	conventions "go.opentelemetry.io/collector/semconv/v1.16.0"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/internal/storage/elasticsearch/dbmodel"
 )
 
-func TestGetTagFromStatusCode(t *testing.T) {
+func TestAppendStatusCodeTag(t *testing.T) {
 	tests := []struct {
 		name string
 		code ptrace.StatusCode
@@ -53,7 +54,7 @@ func TestGetTagFromStatusCode(t *testing.T) {
 	}
 }
 
-func TestGetTagFromStatusMsg(t *testing.T) {
+func TestAppendStatusMsgTag(t *testing.T) {
 	tagAppender := newTagAppender(true, nil, ".")
 	tagAppender.appendStatusMsgTag("")
 	got, tagMap := tagAppender.getTags()
@@ -66,87 +67,82 @@ func TestGetTagFromStatusMsg(t *testing.T) {
 	assert.EqualValues(t, "test-error", tag)
 }
 
-func TestGetTagFromSpanKind(t *testing.T) {
+func TestAppendSpanKindTag(t *testing.T) {
 	tests := []struct {
-		name string
-		kind ptrace.SpanKind
-		tag  dbmodel.KeyValue
-		ok   bool
+		name  string
+		kind  ptrace.SpanKind
+		value string
+		ok    bool
 	}{
 		{
-			name: "unspecified",
-			kind: ptrace.SpanKindUnspecified,
-			tag:  dbmodel.KeyValue{},
-			ok:   false,
+			name:  "unspecified",
+			kind:  ptrace.SpanKindUnspecified,
+			value: "",
+			ok:    false,
 		},
 
 		{
-			name: "client",
-			kind: ptrace.SpanKindClient,
-			tag: dbmodel.KeyValue{
-				Key:   model.SpanKindKey,
-				Type:  dbmodel.StringType,
-				Value: string(model.SpanKindClient),
-			},
-			ok: true,
+			name:  "client",
+			kind:  ptrace.SpanKindClient,
+			value: string(model.SpanKindClient),
+			ok:    true,
 		},
 
 		{
-			name: "server",
-			kind: ptrace.SpanKindServer,
-			tag: dbmodel.KeyValue{
-				Key:   model.SpanKindKey,
-				Type:  dbmodel.StringType,
-				Value: string(model.SpanKindServer),
-			},
-			ok: true,
+			name:  "server",
+			kind:  ptrace.SpanKindServer,
+			value: string(model.SpanKindServer),
+			ok:    true,
 		},
 
 		{
-			name: "producer",
-			kind: ptrace.SpanKindProducer,
-			tag: dbmodel.KeyValue{
-				Key:   model.SpanKindKey,
-				Type:  dbmodel.StringType,
-				Value: string(model.SpanKindProducer),
-			},
-			ok: true,
+			name:  "producer",
+			kind:  ptrace.SpanKindProducer,
+			value: string(model.SpanKindProducer),
+			ok:    true,
 		},
 
 		{
-			name: "consumer",
-			kind: ptrace.SpanKindConsumer,
-			tag: dbmodel.KeyValue{
-				Key:   model.SpanKindKey,
-				Type:  dbmodel.StringType,
-				Value: string(model.SpanKindConsumer),
-			},
-			ok: true,
+			name:  "consumer",
+			kind:  ptrace.SpanKindConsumer,
+			value: string(model.SpanKindConsumer),
+			ok:    true,
 		},
 
 		{
-			name: "internal",
-			kind: ptrace.SpanKindInternal,
-			tag: dbmodel.KeyValue{
-				Key:   model.SpanKindKey,
-				Type:  dbmodel.StringType,
-				Value: string(model.SpanKindInternal),
-			},
-			ok: true,
+			name:  "internal",
+			kind:  ptrace.SpanKindInternal,
+			value: string(model.SpanKindInternal),
+			ok:    true,
 		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			tagAppender := newTagAppender(true, nil, ".")
+			tagAppender := newTagAppender(true, nil, "#")
 			tagAppender.appendSpanKindTag(test.kind)
 			tags, tagMap := tagAppender.getTags()
 			assert.Empty(t, tags)
-			tag, ok := tagMap[test.tag.Key]
+			tag, ok := tagMap["span#kind"]
 			assert.Equal(t, test.ok, ok)
 			if test.ok {
-				assert.EqualValues(t, test.tag.Value, tag)
+				assert.EqualValues(t, test.value, tag)
 			}
 		})
 	}
 }
+
+func TestAppendTagWhenTagKeysAsField(t *testing.T) {
+	tagKeysAsFields := map[string]bool{
+		"testing.key.1": true,
+	}
+	tagAppender := newTagAppender(false, tagKeysAsFields, "#")
+	tagAppender.appendTag("testing.key.1", pcommon.NewValueInt(1))
+	tagAppender.appendTag("testing.key.2", pcommon.NewValueInt(2))
+	tags, tagMap := tagAppender.getTags()
+	assert.Len(t, tags, 1)
+	assert.Len(t, tagMap, 1)
+	assert.Equal(t, int64(1), tagMap["testing#key#1"])
+	expected := dbmodel.KeyValue{Key: "testing.key.2", Type: "int64", Value: "2"}
+	assert.Equal(t, expected, tags[0])
+}

internal/storage/v2/elasticsearch/tracestore/to_dbmodel.go

@@ -24,25 +24,25 @@ const (
 	tagHTTPStatusMsg = "http.status_message"
 )
 
-// NewToDB creates FromDomain used to convert model span to db span
-func NewToDB(allTagsAsObject bool, tagKeysAsFields []string, tagDotReplacement string) ToDB {
+// NewToDBModel creates FromDomain used to convert model span to db span
+func NewToDBModel(allTagsAsObject bool, tagKeysAsFields []string, tagDotReplacement string) ToDBModel {
 	tags := map[string]bool{}
 	for _, k := range tagKeysAsFields {
 		tags[k] = true
 	}
-	return ToDB{allTagsAsFields: allTagsAsObject, tagKeysAsFields: tags, tagDotReplacement: tagDotReplacement}
+	return ToDBModel{allTagsAsFields: allTagsAsObject, tagKeysAsFields: tags, tagDotReplacement: tagDotReplacement}
 }
 
-// ToDB is used to convert model span to db span
-type ToDB struct {
+// ToDBModel is used to convert model span to db span
+type ToDBModel struct {
 	allTagsAsFields   bool
 	tagKeysAsFields   map[string]bool
 	tagDotReplacement string
 }
 
-// ToDBModel translates internal trace data into the DB Spans.
+// ConvertToDBModel translates internal trace data into the DB Spans.
 // Returns slice of translated DB Spans and error if translation failed.
-func (t ToDB) ToDBModel(td ptrace.Traces) []dbmodel.Span {
+func (t ToDBModel) ConvertToDBModel(td ptrace.Traces) []dbmodel.Span {
 	resourceSpans := td.ResourceSpans()
 
 	if resourceSpans.Len() == 0 {
@@ -61,7 +61,7 @@ func (t ToDB) ToDBModel(td ptrace.Traces) []dbmodel.Span {
 	return batches
 }
 
-func (t ToDB) resourceSpansToDbSpans(resourceSpans ptrace.ResourceSpans) []dbmodel.Span {
+func (t ToDBModel) resourceSpansToDbSpans(resourceSpans ptrace.ResourceSpans) []dbmodel.Span {
 	resource := resourceSpans.Resource()
 	scopeSpans := resourceSpans.ScopeSpans()
 
@@ -85,7 +85,7 @@ func (t ToDB) resourceSpansToDbSpans(resourceSpans ptrace.ResourceSpans) []dbmod
 	return dbSpans
 }
 
-func (t ToDB) resourceToDbProcess(resource pcommon.Resource) dbmodel.Process {
+func (t ToDBModel) resourceToDbProcess(resource pcommon.Resource) dbmodel.Process {
 	process := dbmodel.Process{}
 	attrs := resource.Attributes()
 	if attrs.Len() == 0 {
@@ -117,7 +117,7 @@ func appendTagsFromAttributes(dest []dbmodel.KeyValue, attrs pcommon.Map) []dbmo
 	return dest
 }
 
-func (t ToDB) spanToDbSpan(span ptrace.Span, libraryTags pcommon.InstrumentationScope, process dbmodel.Process) dbmodel.Span {
+func (t ToDBModel) spanToDbSpan(span ptrace.Span, libraryTags pcommon.InstrumentationScope, process dbmodel.Process) dbmodel.Span {
 	traceID := dbmodel.TraceID(span.TraceID().String())
 	parentSpanID := dbmodel.SpanID(span.ParentSpanID().String())
 	startTime := span.StartTimestamp().AsTime()
@@ -136,7 +136,7 @@ func (t ToDB) spanToDbSpan(span ptrace.Span, libraryTags pcommon.Instrumentation
 	}
 }
 
-func (t ToDB) getDbSpanTags(span ptrace.Span, scope pcommon.InstrumentationScope) ([]dbmodel.KeyValue, map[string]any) {
+func (t ToDBModel) getDbSpanTags(span ptrace.Span, scope pcommon.InstrumentationScope) ([]dbmodel.KeyValue, map[string]any) {
 	tagAppender := newTagAppender(t.allTagsAsFields, t.tagKeysAsFields, t.tagDotReplacement)
 	tagAppender.appendInstrumentationLibraryTags(scope)
 	tagAppender.appendSpanKindTag(span.Kind())

internal/storage/v2/elasticsearch/tracestore/to_dbmodel_test.go

@@ -24,7 +24,7 @@ func TestEmptyAttributes(t *testing.T) {
 	scopeSpans := spans.ScopeSpans().AppendEmpty()
 	spanScope := scopeSpans.Scope()
 	span := scopeSpans.Spans().AppendEmpty()
-	toDb := NewToDB(false, nil, ".")
+	toDb := NewToDBModel(false, nil, ".")
 	modelSpan := toDb.spanToDbSpan(span, spanScope, dbmodel.Process{})
 	assert.Empty(t, modelSpan.Tags)
 }
@@ -37,7 +37,7 @@ func TestEmptyLinkRefs(t *testing.T) {
 	span := scopeSpans.Spans().AppendEmpty()
 	spanLink := span.Links().AppendEmpty()
 	spanLink.Attributes().PutStr("testing-key", "testing-inputValue")
-	toDb := NewToDB(false, nil, ".")
+	toDb := NewToDBModel(false, nil, ".")
 	modelSpan := toDb.spanToDbSpan(span, spanScope, dbmodel.Process{})
 	assert.Len(t, modelSpan.References, 1)
 	assert.Equal(t, dbmodel.FollowsFrom, modelSpan.References[0].RefType)
@@ -49,7 +49,7 @@ func Test_resourceToDbProcess(t *testing.T) {
 	resource := resourceSpans.Resource()
 	resource.Attributes().PutStr(conventions.AttributeServiceName, "service")
 	resource.Attributes().PutStr("foo", "bar")
-	toDb := NewToDB(false, nil, ".")
+	toDb := NewToDBModel(false, nil, ".")
 	process := toDb.resourceToDbProcess(resource)
 	assert.Equal(t, "service", process.ServiceName)
 	expected := []dbmodel.KeyValue{
@@ -66,7 +66,7 @@ func Test_resourceToDbProcess_WhenOnlyServiceNameIsPresent(t *testing.T) {
 	traces := ptrace.NewTraces()
 	spans := traces.ResourceSpans().AppendEmpty()
 	spans.Resource().Attributes().PutStr(conventions.AttributeServiceName, "service")
-	toDb := NewToDB(false, nil, "")
+	toDb := NewToDBModel(false, nil, "")
 	process := toDb.resourceToDbProcess(spans.Resource())
 	assert.Equal(t, "service", process.ServiceName)
 }
@@ -200,8 +200,8 @@ func TestToDBModel(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			toDb := NewToDB(false, nil, "")
-			jbs := toDb.ToDBModel(test.td)
+			toDb := NewToDBModel(false, nil, "")
+			jbs := toDb.ConvertToDBModel(test.td)
 			if test.db == nil {
 				assert.Empty(t, jbs)
 			} else {
@@ -244,8 +244,8 @@ func BenchmarkInternalTracesToDbSpans(b *testing.B) {
 
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
-		toDb := NewToDB(false, nil, "")
-		batches := toDb.ToDBModel(td)
+		toDb := NewToDBModel(false, nil, "")
+		batches := toDb.ConvertToDBModel(td)
 		assert.NotEmpty(b, batches)
 	}
 }