Move Cassandra To Internal Directory

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
jaegertracing · Jan 31, 2025 · a4832c8 · a4832c8
1 parent 6d8c70e
commit a4832c8
Show file tree

Hide file tree

Showing 65 changed files with 17 additions and 17 deletions.
diff --git a/plugin/storage/cassandra/Dockerfile → internal/storage/v1/cassandra/Dockerfile b/plugin/storage/cassandra/Dockerfile → internal/storage/v1/cassandra/Dockerfile
diff --git a/...ge/cassandra/dependencystore/bootstrap.go → ...v1/cassandra/dependencystore/bootstrap.go b/...ge/cassandra/dependencystore/bootstrap.go → ...v1/cassandra/dependencystore/bootstrap.go
diff --git a/...ssandra/dependencystore/bootstrap_test.go → ...ssandra/dependencystore/bootstrap_test.go b/...ssandra/dependencystore/bootstrap_test.go → ...ssandra/dependencystore/bootstrap_test.go
diff --git a/...torage/cassandra/dependencystore/model.go → ...age/v1/cassandra/dependencystore/model.go b/...torage/cassandra/dependencystore/model.go → ...age/v1/cassandra/dependencystore/model.go
diff --git a/...e/cassandra/dependencystore/model_test.go → ...1/cassandra/dependencystore/model_test.go b/...e/cassandra/dependencystore/model_test.go → ...1/cassandra/dependencystore/model_test.go
diff --git a/...cassandra/dependencystore/package_test.go → ...cassandra/dependencystore/package_test.go b/...cassandra/dependencystore/package_test.go → ...cassandra/dependencystore/package_test.go
diff --git a/...rage/cassandra/dependencystore/storage.go → ...e/v1/cassandra/dependencystore/storage.go b/...rage/cassandra/dependencystore/storage.go → ...e/v1/cassandra/dependencystore/storage.go
diff --git a/...cassandra/dependencystore/storage_test.go → ...cassandra/dependencystore/storage_test.go b/...cassandra/dependencystore/storage_test.go → ...cassandra/dependencystore/storage_test.go
diff --git a/plugin/storage/cassandra/factory.go → internal/storage/v1/cassandra/factory.go b/plugin/storage/cassandra/factory.go → internal/storage/v1/cassandra/factory.go
@@ -15,6 +15,11 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 
+	cDepStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/dependencystore"
+	cSamplingStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/samplingstore"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/schema"
+	cSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/config"
 	gocqlw "github.com/jaegertracing/jaeger/pkg/cassandra/gocql"
@@ -23,11 +28,6 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin"
 	cLock "github.com/jaegertracing/jaeger/plugin/pkg/distributedlock/cassandra"
-	cDepStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/dependencystore"
-	cSamplingStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/samplingstore"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/schema"
-	cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/samplingstore"

diff --git a/plugin/storage/cassandra/factory_test.go → ...rnal/storage/v1/cassandra/factory_test.go b/plugin/storage/cassandra/factory_test.go → ...rnal/storage/v1/cassandra/factory_test.go
diff --git a/plugin/storage/cassandra/options.go → internal/storage/v1/cassandra/options.go b/plugin/storage/cassandra/options.go → internal/storage/v1/cassandra/options.go
diff --git a/plugin/storage/cassandra/options_test.go → ...rnal/storage/v1/cassandra/options_test.go b/plugin/storage/cassandra/options_test.go → ...rnal/storage/v1/cassandra/options_test.go
diff --git a/plugin/storage/cassandra/package_test.go → ...rnal/storage/v1/cassandra/package_test.go b/plugin/storage/cassandra/package_test.go → ...rnal/storage/v1/cassandra/package_test.go
diff --git a/...torage/cassandra/samplingstore/storage.go → ...age/v1/cassandra/samplingstore/storage.go b/...torage/cassandra/samplingstore/storage.go → ...age/v1/cassandra/samplingstore/storage.go
diff --git a/...e/cassandra/samplingstore/storage_test.go → ...1/cassandra/samplingstore/storage_test.go b/...e/cassandra/samplingstore/storage_test.go → ...1/cassandra/samplingstore/storage_test.go
diff --git a/...n/storage/cassandra/savetracetest/main.go → ...torage/v1/cassandra/savetracetest/main.go b/...n/storage/cassandra/savetracetest/main.go → ...torage/v1/cassandra/savetracetest/main.go
@@ -11,11 +11,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
+	cSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore"
 	cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
-	cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/plugin/storage/cassandra/schema/README.md → ...nal/storage/v1/cassandra/schema/README.md b/plugin/storage/cassandra/schema/README.md → ...nal/storage/v1/cassandra/schema/README.md
diff --git a/plugin/storage/cassandra/schema/create.sh → ...nal/storage/v1/cassandra/schema/create.sh b/plugin/storage/cassandra/schema/create.sh → ...nal/storage/v1/cassandra/schema/create.sh
diff --git a/...n/storage/cassandra/schema/create.test.sh → ...torage/v1/cassandra/schema/create.test.sh b/...n/storage/cassandra/schema/create.test.sh → ...torage/v1/cassandra/schema/create.test.sh
diff --git a/plugin/storage/cassandra/schema/docker.sh → ...nal/storage/v1/cassandra/schema/docker.sh b/plugin/storage/cassandra/schema/docker.sh → ...nal/storage/v1/cassandra/schema/docker.sh
diff --git a/.../cassandra/schema/migration/V002toV003.sh → .../cassandra/schema/migration/V002toV003.sh b/.../cassandra/schema/migration/V002toV003.sh → .../cassandra/schema/migration/V002toV003.sh
diff --git a/...andra/schema/migration/v001tov002part1.sh → ...andra/schema/migration/v001tov002part1.sh b/...andra/schema/migration/v001tov002part1.sh → ...andra/schema/migration/v001tov002part1.sh
diff --git a/...andra/schema/migration/v001tov002part2.sh → ...andra/schema/migration/v001tov002part2.sh b/...andra/schema/migration/v001tov002part2.sh → ...andra/schema/migration/v001tov002part2.sh
diff --git a/.../storage/cassandra/schema/package_test.go → ...orage/v1/cassandra/schema/package_test.go b/.../storage/cassandra/schema/package_test.go → ...orage/v1/cassandra/schema/package_test.go
diff --git a/plugin/storage/cassandra/schema/schema.go → ...nal/storage/v1/cassandra/schema/schema.go b/plugin/storage/cassandra/schema/schema.go → ...nal/storage/v1/cassandra/schema/schema.go
diff --git a/...n/storage/cassandra/schema/schema_test.go → ...torage/v1/cassandra/schema/schema_test.go b/...n/storage/cassandra/schema/schema_test.go → ...torage/v1/cassandra/schema/schema_test.go
diff --git a/...in/storage/cassandra/schema/v001.cql.tmpl → ...storage/v1/cassandra/schema/v001.cql.tmpl b/...in/storage/cassandra/schema/v001.cql.tmpl → ...storage/v1/cassandra/schema/v001.cql.tmpl
diff --git a/...in/storage/cassandra/schema/v002.cql.tmpl → ...storage/v1/cassandra/schema/v002.cql.tmpl b/...in/storage/cassandra/schema/v002.cql.tmpl → ...storage/v1/cassandra/schema/v002.cql.tmpl
diff --git a/...in/storage/cassandra/schema/v003.cql.tmpl → ...storage/v1/cassandra/schema/v003.cql.tmpl b/...in/storage/cassandra/schema/v003.cql.tmpl → ...storage/v1/cassandra/schema/v003.cql.tmpl
diff --git a/...ge/cassandra/schema/v004-go-tmpl.cql.tmpl → ...v1/cassandra/schema/v004-go-tmpl.cql.tmpl b/...ge/cassandra/schema/v004-go-tmpl.cql.tmpl → ...v1/cassandra/schema/v004-go-tmpl.cql.tmpl
diff --git a/...in/storage/cassandra/schema/v004.cql.tmpl → ...storage/v1/cassandra/schema/v004.cql.tmpl b/...in/storage/cassandra/schema/v004.cql.tmpl → ...storage/v1/cassandra/schema/v004.cql.tmpl
diff --git a/.../cassandra/spanstore/dbmodel/converter.go → .../cassandra/spanstore/dbmodel/converter.go b/.../cassandra/spanstore/dbmodel/converter.go → .../cassandra/spanstore/dbmodel/converter.go
diff --git a/...andra/spanstore/dbmodel/converter_test.go → ...andra/spanstore/dbmodel/converter_test.go b/...andra/spanstore/dbmodel/converter_test.go → ...andra/spanstore/dbmodel/converter_test.go
diff --git a/...ge/cassandra/spanstore/dbmodel/cql_udt.go → ...v1/cassandra/spanstore/dbmodel/cql_udt.go b/...ge/cassandra/spanstore/dbmodel/cql_udt.go → ...v1/cassandra/spanstore/dbmodel/cql_udt.go
diff --git a/...ssandra/spanstore/dbmodel/cql_udt_test.go → ...ssandra/spanstore/dbmodel/cql_udt_test.go b/...ssandra/spanstore/dbmodel/cql_udt_test.go → ...ssandra/spanstore/dbmodel/cql_udt_test.go
diff --git a/...ssandra/spanstore/dbmodel/index_filter.go → ...ssandra/spanstore/dbmodel/index_filter.go b/...ssandra/spanstore/dbmodel/index_filter.go → ...ssandra/spanstore/dbmodel/index_filter.go
diff --git a/...ra/spanstore/dbmodel/index_filter_test.go → ...ra/spanstore/dbmodel/index_filter_test.go b/...ra/spanstore/dbmodel/index_filter_test.go → ...ra/spanstore/dbmodel/index_filter_test.go
diff --git a/...rage/cassandra/spanstore/dbmodel/model.go → ...e/v1/cassandra/spanstore/dbmodel/model.go b/...rage/cassandra/spanstore/dbmodel/model.go → ...e/v1/cassandra/spanstore/dbmodel/model.go
diff --git a/...cassandra/spanstore/dbmodel/model_test.go → ...cassandra/spanstore/dbmodel/model_test.go b/...cassandra/spanstore/dbmodel/model_test.go → ...cassandra/spanstore/dbmodel/model_test.go
diff --git a/.../cassandra/spanstore/dbmodel/operation.go → .../cassandra/spanstore/dbmodel/operation.go b/.../cassandra/spanstore/dbmodel/operation.go → .../cassandra/spanstore/dbmodel/operation.go
diff --git a/...ssandra/spanstore/dbmodel/package_test.go → ...ssandra/spanstore/dbmodel/package_test.go b/...ssandra/spanstore/dbmodel/package_test.go → ...ssandra/spanstore/dbmodel/package_test.go
diff --git a/...cassandra/spanstore/dbmodel/tag_filter.go → ...cassandra/spanstore/dbmodel/tag_filter.go b/...cassandra/spanstore/dbmodel/tag_filter.go → ...cassandra/spanstore/dbmodel/tag_filter.go
diff --git a/.../spanstore/dbmodel/tag_filter_drop_all.go → .../spanstore/dbmodel/tag_filter_drop_all.go b/.../spanstore/dbmodel/tag_filter_drop_all.go → .../spanstore/dbmodel/tag_filter_drop_all.go
diff --git a/...store/dbmodel/tag_filter_drop_all_test.go → ...store/dbmodel/tag_filter_drop_all_test.go b/...store/dbmodel/tag_filter_drop_all_test.go → ...store/dbmodel/tag_filter_drop_all_test.go
diff --git a/...anstore/dbmodel/tag_filter_exact_match.go → ...anstore/dbmodel/tag_filter_exact_match.go b/...anstore/dbmodel/tag_filter_exact_match.go → ...anstore/dbmodel/tag_filter_exact_match.go
diff --git a/...re/dbmodel/tag_filter_exact_match_test.go → ...re/dbmodel/tag_filter_exact_match_test.go b/...re/dbmodel/tag_filter_exact_match_test.go → ...re/dbmodel/tag_filter_exact_match_test.go
diff --git a/...ndra/spanstore/dbmodel/tag_filter_test.go → ...ndra/spanstore/dbmodel/tag_filter_test.go b/...ndra/spanstore/dbmodel/tag_filter_test.go → ...ndra/spanstore/dbmodel/tag_filter_test.go
diff --git a/...cassandra/spanstore/dbmodel/unique_ids.go → ...cassandra/spanstore/dbmodel/unique_ids.go b/...cassandra/spanstore/dbmodel/unique_ids.go → ...cassandra/spanstore/dbmodel/unique_ids.go
diff --git a/...ndra/spanstore/dbmodel/unique_ids_test.go → ...ndra/spanstore/dbmodel/unique_ids_test.go b/...ndra/spanstore/dbmodel/unique_ids_test.go → ...ndra/spanstore/dbmodel/unique_ids_test.go
diff --git a/...assandra/spanstore/dbmodel/unique_tags.go → ...assandra/spanstore/dbmodel/unique_tags.go b/...assandra/spanstore/dbmodel/unique_tags.go → ...assandra/spanstore/dbmodel/unique_tags.go
diff --git a/...dra/spanstore/dbmodel/unique_tags_test.go → ...dra/spanstore/dbmodel/unique_tags_test.go b/...dra/spanstore/dbmodel/unique_tags_test.go → ...dra/spanstore/dbmodel/unique_tags_test.go
diff --git a/...rage/cassandra/spanstore/matchers_test.go → ...e/v1/cassandra/spanstore/matchers_test.go b/...rage/cassandra/spanstore/matchers_test.go → ...e/v1/cassandra/spanstore/matchers_test.go
diff --git a/...ge/cassandra/spanstore/operation_names.go → ...v1/cassandra/spanstore/operation_names.go b/...ge/cassandra/spanstore/operation_names.go → ...v1/cassandra/spanstore/operation_names.go
@@ -10,11 +10,11 @@ import (
 
 	"go.uber.org/zap"
 
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cache"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/...ssandra/spanstore/operation_names_test.go → ...ssandra/spanstore/operation_names_test.go b/...ssandra/spanstore/operation_names_test.go → ...ssandra/spanstore/operation_names_test.go
@@ -16,9 +16,9 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/internal/metricstest"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/...orage/cassandra/spanstore/package_test.go → ...ge/v1/cassandra/spanstore/package_test.go b/...orage/cassandra/spanstore/package_test.go → ...ge/v1/cassandra/spanstore/package_test.go
diff --git a/plugin/storage/cassandra/spanstore/reader.go → .../storage/v1/cassandra/spanstore/reader.go b/plugin/storage/cassandra/spanstore/reader.go → .../storage/v1/cassandra/spanstore/reader.go
@@ -16,11 +16,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/...torage/cassandra/spanstore/reader_test.go → ...age/v1/cassandra/spanstore/reader_test.go b/...torage/cassandra/spanstore/reader_test.go → ...age/v1/cassandra/spanstore/reader_test.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/internal/metricstest"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/...rage/cassandra/spanstore/service_names.go → ...e/v1/cassandra/spanstore/service_names.go b/...rage/cassandra/spanstore/service_names.go → ...e/v1/cassandra/spanstore/service_names.go
diff --git a/...cassandra/spanstore/service_names_test.go → ...cassandra/spanstore/service_names_test.go b/...cassandra/spanstore/service_names_test.go → ...cassandra/spanstore/service_names_test.go
diff --git a/plugin/storage/cassandra/spanstore/writer.go → .../storage/v1/cassandra/spanstore/writer.go b/plugin/storage/cassandra/spanstore/writer.go → .../storage/v1/cassandra/spanstore/writer.go
@@ -15,10 +15,10 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra"
 	casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 )
 
 const (

diff --git a/...age/cassandra/spanstore/writer_options.go → .../v1/cassandra/spanstore/writer_options.go b/...age/cassandra/spanstore/writer_options.go → .../v1/cassandra/spanstore/writer_options.go
@@ -5,7 +5,7 @@
 package spanstore
 
 import (
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 )
 
 // Option is a function that sets some option on the writer.

diff --git a/...assandra/spanstore/writer_options_test.go → ...assandra/spanstore/writer_options_test.go b/...assandra/spanstore/writer_options_test.go → ...assandra/spanstore/writer_options_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 )
 
 func TestWriterOptions(t *testing.T) {

diff --git a/...torage/cassandra/spanstore/writer_test.go → ...age/v1/cassandra/spanstore/writer_test.go b/...torage/cassandra/spanstore/writer_test.go → ...age/v1/cassandra/spanstore/writer_test.go
@@ -20,9 +20,9 @@ import (
 
 	"github.com/jaegertracing/jaeger-idl/model/v1"
 	"github.com/jaegertracing/jaeger/internal/metricstest"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 

diff --git a/plugin/storage/factory.go b/plugin/storage/factory.go
@@ -14,11 +14,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/internal/safeexpvar"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
 	"github.com/jaegertracing/jaeger/plugin/storage/blackhole"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
 	"github.com/jaegertracing/jaeger/plugin/storage/kafka"

diff --git a/plugin/storage/integration/cassandra_test.go b/plugin/storage/integration/cassandra_test.go
@@ -14,10 +14,10 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )