fixed formatting and testing coverage

Signed-off-by: SoumyaRaikwar <[email protected]>

Author: SoumyaRaikwar

internal/storage/integration/integration.go

@@ -425,13 +425,12 @@ func (s *StorageIntegration) writeTrace(t *testing.T, traces ptrace.Traces) {
 }
 
 func (s *StorageIntegration) loadParseAndWriteExampleTrace(t *testing.T) *model.Trace {
-    trace := s.getTraceFixture(t, "example_trace")  
-    otelTraces := v1adapter.V1TraceToOtelTrace(trace)  
-    s.writeTrace(t, otelTraces)  
-    return trace  
+	trace := s.getTraceFixture(t, "example_trace")
+	otelTraces := v1adapter.V1TraceToOtelTrace(trace)
+	s.writeTrace(t, otelTraces)
+	return trace
 }
 
-
 func (s *StorageIntegration) writeLargeTraceWithDuplicateSpanIds(
 	t *testing.T,
 	totalCount int,

internal/storage/v2/v1adapter/translator_test.go

@@ -255,34 +255,44 @@ func TestV1TracesFromSeq2(t *testing.T) {
 	}
 }
 
-func TestV1TraceToOtelTrace_ReturnsExptectedOtelTrace(t *testing.T) {
+func TestV1TraceFromOtelTrace_ReturnsExpectedModelTrace(t *testing.T) {
 	jTrace := &model.Trace{
 		Spans: []*model.Span{
 			{
 				TraceID:       model.NewTraceID(2, 3),
 				SpanID:        model.NewSpanID(1),
 				Process:       model.NewProcess("Service1", nil),
-				OperationName: "two-resources-1",
-			}, {
+				OperationName: "test-operation-1",
+			},
+			{
 				TraceID:       model.NewTraceID(2, 3),
 				SpanID:        model.NewSpanID(2),
-				Process:       model.NewProcess("service2", nil),
-				OperationName: "two-resources-2",
+				Process:       model.NewProcess("Service1", nil),
+				OperationName: "test-operation-2",
 			},
 		},
 	}
-	actualTrace := V1TraceToOtelTrace(jTrace)
+
+	otelTraces := V1TraceToOtelTrace(jTrace)
+
+	actualTrace := V1TraceFromOtelTrace(otelTraces)
 
 	require.NotEmpty(t, actualTrace)
-	require.Equal(t, 2, actualTrace.ResourceSpans().Len())
+	require.Len(t, actualTrace.Spans, 2)
+	assert.Equal(t, model.NewTraceID(2, 3), actualTrace.Spans[0].TraceID)
+	assert.Equal(t, model.NewSpanID(1), actualTrace.Spans[0].SpanID)
+	assert.Equal(t, "test-operation-1", actualTrace.Spans[0].OperationName)
+	assert.Equal(t, "Service1", actualTrace.Spans[0].Process.ServiceName)
+	assert.Equal(t, model.NewSpanID(2), actualTrace.Spans[1].SpanID)
+	assert.Equal(t, "test-operation-2", actualTrace.Spans[1].OperationName)
 }
 
-func TestV1TraceToOtelTrace_ReturnEmptyOtelTrace(t *testing.T) {
-	jTrace := &model.Trace{}
-	eTrace := ptrace.NewTraces()
-	aTrace := V1TraceToOtelTrace(jTrace)
+func TestV1TraceFromOtelTrace_ReturnEmptyModelTrace(t *testing.T) {
+	otelTraces := ptrace.NewTraces()
+	actualTrace := V1TraceFromOtelTrace(otelTraces)
 
-	require.Equal(t, eTrace.SpanCount(), aTrace.SpanCount(), 0)
+	require.NotEmpty(t, actualTrace)
+	require.Len(t, actualTrace.Spans, 0)
 }
 
 func TestV1TraceIDsFromSeq2(t *testing.T) {