Delete v1/memory storage implementaiton (#7711)

Signed-off-by: Yuri Shkuro <[email protected]>

Author: yurishkuro

cmd/internal/storageconfig/config.go

@@ -18,9 +18,9 @@ import (
 	"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 )
 
 var (

cmd/internal/storageconfig/config_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/confmap"
 
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 )
 
 func TestConfigValidate(t *testing.T) {

cmd/internal/storageconfig/factory_test.go

@@ -23,10 +23,10 @@ import (
 	escfg "github.com/jaegertracing/jaeger/internal/storage/elasticsearch/config"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/clickhousetest"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 	"github.com/jaegertracing/jaeger/internal/telemetry"
 )
 

cmd/jaeger/internal/exporters/storageexporter/exporter_test.go

@@ -23,10 +23,10 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	"github.com/jaegertracing/jaeger/internal/jiter"
 	"github.com/jaegertracing/jaeger/internal/storage/v1"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
 	factorymocks "github.com/jaegertracing/jaeger/internal/storage/v1/mocks"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 	"github.com/jaegertracing/jaeger/internal/telemetry/otelsemconv"
 )
 

cmd/jaeger/internal/extension/jaegerstorage/extension_test.go

@@ -29,11 +29,11 @@ import (
 	"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
 	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/clickhousetest"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 )
 
 type errorFactory struct {

cmd/jaeger/internal/extension/remotesampling/extension_test.go

@@ -35,7 +35,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/internal/storageconfig"
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 )
 
 func makeStorageExtension(t *testing.T, memstoreName string) component.Host {

cmd/jaeger/internal/processors/adaptivesampling/processor_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/remotesampling"
 	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 )
 
 func makeStorageExtension(t *testing.T, memstoreName string) component.Host {

cmd/remote-storage/app/config.go

@@ -11,7 +11,7 @@ import (
 	"go.opentelemetry.io/collector/config/confignet"
 
 	"github.com/jaegertracing/jaeger/cmd/internal/storageconfig"
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 	"github.com/jaegertracing/jaeger/internal/tenancy"
 )
 

internal/storage/integration/memstore_test.go

@@ -7,10 +7,11 @@ package integration
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
-	"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
-	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
+	"github.com/jaegertracing/jaeger/internal/telemetry"
 	"github.com/jaegertracing/jaeger/internal/testutils"
 )
 
@@ -19,13 +20,21 @@ type MemStorageIntegrationTestSuite struct {
 	logger *zap.Logger
 }
 
-func (s *MemStorageIntegrationTestSuite) initialize(_ *testing.T) {
+func (s *MemStorageIntegrationTestSuite) initialize(t *testing.T) {
 	s.logger, _ = testutils.NewLogger()
+	telset := telemetry.NoopSettings()
+	telset.Logger = s.logger
+
+	f, err := memory.NewFactory(memory.Configuration{MaxTraces: 10000}, telset)
+	require.NoError(t, err)
+	traceReader, err := f.CreateTraceReader()
+	require.NoError(t, err)
+	traceWriter, err := f.CreateTraceWriter()
+	require.NoError(t, err)
 
-	store := memory.NewStore()
 	s.SamplingStore = memory.NewSamplingStore(2)
-	s.TraceReader = v1adapter.NewTraceReader(store)
-	s.TraceWriter = v1adapter.NewTraceWriter(store)
+	s.TraceReader = traceReader
+	s.TraceWriter = traceWriter
 
 	// TODO DependencyWriter is not implemented in memory store
 

internal/storage/integration/remote_memory_storage.go

@@ -19,7 +19,6 @@ import (
 
 	"github.com/jaegertracing/jaeger/cmd/remote-storage/app"
 	"github.com/jaegertracing/jaeger/internal/healthcheck"
-	memv1 "github.com/jaegertracing/jaeger/internal/storage/v1/memory"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
 	"github.com/jaegertracing/jaeger/internal/telemetry"
 	"github.com/jaegertracing/jaeger/internal/tenancy"
@@ -48,7 +47,7 @@ func StartNewRemoteMemoryStorage(t *testing.T, port int) *RemoteMemoryStorage {
 	telset.ReportStatus = telemetry.HCAdapter(healthcheck.New())
 
 	traceFactory, err := memory.NewFactory(
-		memv1.Configuration{
+		memory.Configuration{
 			MaxTraces: 10000,
 		},
 		telset,