span2

Author: sonalgaud12

internal/storage/v1/elasticsearch/factory_test.go

@@ -323,10 +323,10 @@ func testPasswordFromFile(t *testing.T) {
 	})
 
 	writer := spanstore.NewSpanWriter(f.GetSpanWriterParams())
-	span := &dbmodel.Span{
+	span1 := &dbmodel.Span{
 		Process: dbmodel.Process{ServiceName: "foo"},
 	}
-	writer.WriteSpan(time.Now(), span)
+	writer.WriteSpan(time.Now(), span1)
 	assert.Eventually(t,
 		func() bool {
 			pwd, ok := authReceived.Load(upwd1)
@@ -351,7 +351,10 @@ func testPasswordFromFile(t *testing.T) {
 		"expecting es.Client to change for the new password",
 	)
 
-	writer.WriteSpan(time.Now(), span)
+	span2 := &dbmodel.Span{
+		Process: dbmodel.Process{ServiceName: "foo"},
+	}
+	writer.WriteSpan(time.Now(), span2)
 	assert.Eventually(t,
 		func() bool {
 			pwd, ok := authReceived.Load(upwd2)

internal/storage/v1/elasticsearch/spanstore/writer.go

@@ -117,15 +117,12 @@ func getSpanAndServiceIndexFn(p SpanWriterParams, writeAlias string) spanAndServ
 // WriteSpan writes a span and its corresponding service:operation in ElasticSearch
 func (s *SpanWriter) WriteSpan(spanStartTime time.Time, span *dbmodel.Span) {
 	s.writerMetrics.Attempts.Inc(1)
-
-	spanCopy := s.copySpanForConversion(span)
-	s.convertNestedTagsToFieldTags(spanCopy)
-
+	s.convertNestedTagsToFieldTags(span)
 	spanIndexName, serviceIndexName := s.spanServiceIndex(spanStartTime)
 	if serviceIndexName != "" {
-		s.writeService(serviceIndexName, spanCopy)
+		s.writeService(serviceIndexName, span)
 	}
-	s.writeSpan(spanIndexName, spanCopy)
+	s.writeSpan(spanIndexName, span)
 	s.logger.Debug("Wrote span to ES index", zap.String("index", spanIndexName))
 }
 
@@ -138,25 +135,6 @@ func (s *SpanWriter) convertNestedTagsToFieldTags(span *dbmodel.Span) {
 	span.Tag = fieldTags
 }
 
-// Helper method to create a safe copy for conversion
-func (s *SpanWriter) copySpanForConversion(span *dbmodel.Span) *dbmodel.Span {
-	spanCopy := *span
-
-	spanCopy.Process = span.Process
-
-	if span.Process.Tags != nil {
-		spanCopy.Process.Tags = make([]dbmodel.KeyValue, len(span.Process.Tags))
-		copy(spanCopy.Process.Tags, span.Process.Tags)
-	}
-
-	if span.Tags != nil {
-		spanCopy.Tags = make([]dbmodel.KeyValue, len(span.Tags))
-		copy(spanCopy.Tags, span.Tags)
-	}
-
-	return &spanCopy
-}
-
 // Close closes SpanWriter
 func (s *SpanWriter) Close() error {
 	return s.client().Close()