Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v2][storage] Implement reverse adapter to translate v2 writer to v1 #6555

Merged
merged 7 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions storage_v2/v1adapter/spanwriter.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright (c) 2025 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package v1adapter

import (
"context"

jaegerTranslator "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger"

"github.com/jaegertracing/jaeger/model"
"github.com/jaegertracing/jaeger/storage/spanstore"
"github.com/jaegertracing/jaeger/storage_v2/tracestore"
)

var _ spanstore.Writer = (*SpanWriter)(nil)

// SpanReader wraps a tracestore.Writer so that it can be downgraded to implement
// the v1 spanstore.Writer interface.
type SpanWriter struct {
traceWriter tracestore.Writer
}

func NewSpanWriter(traceWriter tracestore.Writer) *SpanWriter {
return &SpanWriter{
traceWriter: traceWriter,
}
}

func (sw *SpanWriter) WriteSpan(ctx context.Context, span *model.Span) error {
traces, _ := jaegerTranslator.ProtoToTraces([]*model.Batch{{Spans: []*model.Span{span}}})
return sw.traceWriter.WriteTraces(ctx, traces)
}
67 changes: 67 additions & 0 deletions storage_v2/v1adapter/spanwriter_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// Copyright (c) 2025 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package v1adapter

import (
"context"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/jaegertracing/jaeger/model"
tracestoremocks "github.com/jaegertracing/jaeger/storage_v2/tracestore/mocks"
)

func TestSpanWriter_WriteSpan(t *testing.T) {
tests := []struct {
name string
mockReturnErr error
expectedErr error
}{
{
name: "success",
mockReturnErr: nil,
expectedErr: nil,
},
{
name: "error in translator",
mockReturnErr: assert.AnError,
expectedErr: assert.AnError,
},
}

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
mockTraceWriter := &tracestoremocks.Writer{}
spanWriter := NewSpanWriter(mockTraceWriter)

now := time.Now().UTC()
testSpan := &model.Span{
TraceID: model.NewTraceID(0, 1),
SpanID: model.NewSpanID(1),
StartTime: now,
Duration: time.Second,
}

traces := ptrace.NewTraces()
resources := traces.ResourceSpans().AppendEmpty()
scopes := resources.ScopeSpans().AppendEmpty()
span := scopes.Spans().AppendEmpty()
span.SetTraceID(pcommon.TraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}))
span.SetSpanID(pcommon.SpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 1}))
span.SetStartTimestamp(pcommon.NewTimestampFromTime(now))
span.SetEndTimestamp(pcommon.NewTimestampFromTime(now.Add(time.Second)))

mockTraceWriter.On("WriteTraces", mock.Anything, traces).Return(test.mockReturnErr)

err := spanWriter.WriteSpan(context.Background(), testSpan)
require.ErrorIs(t, err, test.expectedErr)
})
}
}
File renamed without changes.
File renamed without changes.
Loading