diff --git a/Makefile.BuildBinaries.mk b/Makefile.BuildBinaries.mk index 54f3b439ba6..7138fd3f610 100644 --- a/Makefile.BuildBinaries.mk +++ b/Makefile.BuildBinaries.mk @@ -51,11 +51,11 @@ build-anonymizer: .PHONY: build-esmapping-generator build-esmapping-generator: - $(GOBUILD) $(BUILD_INFO) -o ./plugin/storage/es/esmapping-generator-$(GOOS)-$(GOARCH) ./cmd/esmapping-generator/ + $(GOBUILD) $(BUILD_INFO) -o ./internal/storage/v1/es/esmapping-generator-$(GOOS)-$(GOARCH) ./cmd/esmapping-generator/ .PHONY: build-esmapping-generator-linux build-esmapping-generator-linux: - GOOS=linux $(BUILD_INFO) GOARCH=amd64 $(GOBUILD) -o ./plugin/storage/es/esmapping-generator ./cmd/esmapping-generator/ + GOOS=linux $(BUILD_INFO) GOARCH=amd64 $(GOBUILD) -o ./internal/storage/v1/es/esmapping-generator ./cmd/esmapping-generator/ .PHONY: build-es-index-cleaner build-es-index-cleaner: diff --git a/cmd/es-rollover/app/init/action.go b/cmd/es-rollover/app/init/action.go index 4651aba3ece..cb489da7a1a 100644 --- a/cmd/es-rollover/app/init/action.go +++ b/cmd/es-rollover/app/init/action.go @@ -11,11 +11,11 @@ import ( "strings" "github.com/jaegertracing/jaeger/cmd/es-rollover/app" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/mappings" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/pkg/es/client" "github.com/jaegertracing/jaeger/pkg/es/config" "github.com/jaegertracing/jaeger/pkg/es/filter" - "github.com/jaegertracing/jaeger/plugin/storage/es/mappings" ) const ilmVersionSupport = 7 diff --git a/cmd/esmapping-generator/app/renderer/render.go b/cmd/esmapping-generator/app/renderer/render.go index 47c8bc3fb59..5d603742b9e 100644 --- a/cmd/esmapping-generator/app/renderer/render.go +++ b/cmd/esmapping-generator/app/renderer/render.go @@ -7,9 +7,9 @@ import ( "strconv" "github.com/jaegertracing/jaeger/cmd/esmapping-generator/app" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/mappings" "github.com/jaegertracing/jaeger/pkg/es" cfg "github.com/jaegertracing/jaeger/pkg/es/config" - "github.com/jaegertracing/jaeger/plugin/storage/es/mappings" ) // GetMappingAsString returns rendered index templates as string diff --git a/cmd/esmapping-generator/app/renderer/render_test.go b/cmd/esmapping-generator/app/renderer/render_test.go index afec6849dff..b1c8db26610 100644 --- a/cmd/esmapping-generator/app/renderer/render_test.go +++ b/cmd/esmapping-generator/app/renderer/render_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "github.com/jaegertracing/jaeger/cmd/esmapping-generator/app" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/mappings" "github.com/jaegertracing/jaeger/pkg/es/mocks" "github.com/jaegertracing/jaeger/pkg/testutils" - "github.com/jaegertracing/jaeger/plugin/storage/es/mappings" ) func TestIsValidOption(t *testing.T) { diff --git a/cmd/esmapping-generator/generator/esmapping_generator.go b/cmd/esmapping-generator/generator/esmapping_generator.go index 6b3f346fdc8..4c80e7cd85e 100644 --- a/cmd/esmapping-generator/generator/esmapping_generator.go +++ b/cmd/esmapping-generator/generator/esmapping_generator.go @@ -8,8 +8,8 @@ import ( "github.com/jaegertracing/jaeger/cmd/esmapping-generator/app" "github.com/jaegertracing/jaeger/cmd/esmapping-generator/app/renderer" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/mappings" "github.com/jaegertracing/jaeger/pkg/es" - "github.com/jaegertracing/jaeger/plugin/storage/es/mappings" ) func GenerateMappings(options app.Options) (string, error) { diff --git a/cmd/jaeger/internal/extension/jaegerstorage/config.go b/cmd/jaeger/internal/extension/jaegerstorage/config.go index e6e0f6ad300..1e6bd51476e 100644 --- a/cmd/jaeger/internal/extension/jaegerstorage/config.go +++ b/cmd/jaeger/internal/extension/jaegerstorage/config.go @@ -14,13 +14,13 @@ import ( "github.com/jaegertracing/jaeger/internal/storage/v1/badger" "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra" + "github.com/jaegertracing/jaeger/internal/storage/v1/es" "github.com/jaegertracing/jaeger/internal/storage/v1/grpc" "github.com/jaegertracing/jaeger/internal/storage/v1/memory" casCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config" esCfg "github.com/jaegertracing/jaeger/pkg/es/config" promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config" "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus" - "github.com/jaegertracing/jaeger/plugin/storage/es" ) var ( diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension.go b/cmd/jaeger/internal/extension/jaegerstorage/extension.go index adfbe7b0fbd..fe3f2eeca97 100644 --- a/cmd/jaeger/internal/extension/jaegerstorage/extension.go +++ b/cmd/jaeger/internal/extension/jaegerstorage/extension.go @@ -14,12 +14,12 @@ import ( "github.com/jaegertracing/jaeger/internal/storage/v1/badger" "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra" + "github.com/jaegertracing/jaeger/internal/storage/v1/es" "github.com/jaegertracing/jaeger/internal/storage/v1/grpc" "github.com/jaegertracing/jaeger/internal/storage/v1/memory" "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger/pkg/telemetry" "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus" - "github.com/jaegertracing/jaeger/plugin/storage/es" "github.com/jaegertracing/jaeger/storage" "github.com/jaegertracing/jaeger/storage_v2/tracestore" "github.com/jaegertracing/jaeger/storage_v2/v1adapter" diff --git a/cmd/query/app/token_propagation_test.go b/cmd/query/app/token_propagation_test.go index 2af20349b2c..3a04f68dc49 100644 --- a/cmd/query/app/token_propagation_test.go +++ b/cmd/query/app/token_propagation_test.go @@ -22,11 +22,11 @@ import ( "github.com/jaegertracing/jaeger/cmd/internal/flags" "github.com/jaegertracing/jaeger/cmd/query/app/querysvc" v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc" + "github.com/jaegertracing/jaeger/internal/storage/v1/es" "github.com/jaegertracing/jaeger/pkg/bearertoken" "github.com/jaegertracing/jaeger/pkg/config" "github.com/jaegertracing/jaeger/pkg/telemetry" "github.com/jaegertracing/jaeger/pkg/tenancy" - "github.com/jaegertracing/jaeger/plugin/storage/es" "github.com/jaegertracing/jaeger/ports" "github.com/jaegertracing/jaeger/storage_v2/v1adapter" ) diff --git a/plugin/storage/es/.gitignore b/internal/storage/v1/es/.gitignore similarity index 100% rename from plugin/storage/es/.gitignore rename to internal/storage/v1/es/.gitignore diff --git a/plugin/storage/es/README.md b/internal/storage/v1/es/README.md similarity index 100% rename from plugin/storage/es/README.md rename to internal/storage/v1/es/README.md diff --git a/plugin/storage/es/dependencystore/dbmodel/converter.go b/internal/storage/v1/es/dependencystore/dbmodel/converter.go similarity index 100% rename from plugin/storage/es/dependencystore/dbmodel/converter.go rename to internal/storage/v1/es/dependencystore/dbmodel/converter.go diff --git a/plugin/storage/es/dependencystore/dbmodel/converter_test.go b/internal/storage/v1/es/dependencystore/dbmodel/converter_test.go similarity index 100% rename from plugin/storage/es/dependencystore/dbmodel/converter_test.go rename to internal/storage/v1/es/dependencystore/dbmodel/converter_test.go diff --git a/plugin/storage/es/dependencystore/dbmodel/model.go b/internal/storage/v1/es/dependencystore/dbmodel/model.go similarity index 100% rename from plugin/storage/es/dependencystore/dbmodel/model.go rename to internal/storage/v1/es/dependencystore/dbmodel/model.go diff --git a/plugin/storage/es/dependencystore/storage.go b/internal/storage/v1/es/dependencystore/storage.go similarity index 98% rename from plugin/storage/es/dependencystore/storage.go rename to internal/storage/v1/es/dependencystore/storage.go index 4ded346f30d..6de8ee9355f 100644 --- a/plugin/storage/es/dependencystore/storage.go +++ b/internal/storage/v1/es/dependencystore/storage.go @@ -15,9 +15,9 @@ import ( "go.uber.org/zap" "github.com/jaegertracing/jaeger-idl/model/v1" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/dependencystore/dbmodel" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/pkg/es/config" - "github.com/jaegertracing/jaeger/plugin/storage/es/dependencystore/dbmodel" ) const ( diff --git a/plugin/storage/es/dependencystore/storage_test.go b/internal/storage/v1/es/dependencystore/storage_test.go similarity index 100% rename from plugin/storage/es/dependencystore/storage_test.go rename to internal/storage/v1/es/dependencystore/storage_test.go diff --git a/plugin/storage/es/factory.go b/internal/storage/v1/es/factory.go similarity index 97% rename from plugin/storage/es/factory.go rename to internal/storage/v1/es/factory.go index 595e81ffe29..3e9ad88b1b8 100644 --- a/plugin/storage/es/factory.go +++ b/internal/storage/v1/es/factory.go @@ -20,15 +20,15 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" + esDepStore "github.com/jaegertracing/jaeger/internal/storage/v1/es/dependencystore" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/mappings" + esSampleStore "github.com/jaegertracing/jaeger/internal/storage/v1/es/samplingstore" + esSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/pkg/es/config" "github.com/jaegertracing/jaeger/pkg/fswatcher" "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger/plugin" - esDepStore "github.com/jaegertracing/jaeger/plugin/storage/es/dependencystore" - "github.com/jaegertracing/jaeger/plugin/storage/es/mappings" - esSampleStore "github.com/jaegertracing/jaeger/plugin/storage/es/samplingstore" - esSpanStore "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore" "github.com/jaegertracing/jaeger/storage" "github.com/jaegertracing/jaeger/storage/dependencystore" "github.com/jaegertracing/jaeger/storage/samplingstore" diff --git a/plugin/storage/es/factory_test.go b/internal/storage/v1/es/factory_test.go similarity index 100% rename from plugin/storage/es/factory_test.go rename to internal/storage/v1/es/factory_test.go diff --git a/plugin/storage/es/fixtures/tags_01.txt b/internal/storage/v1/es/fixtures/tags_01.txt similarity index 100% rename from plugin/storage/es/fixtures/tags_01.txt rename to internal/storage/v1/es/fixtures/tags_01.txt diff --git a/plugin/storage/es/fixtures/tags_02.txt b/internal/storage/v1/es/fixtures/tags_02.txt similarity index 100% rename from plugin/storage/es/fixtures/tags_02.txt rename to internal/storage/v1/es/fixtures/tags_02.txt diff --git a/plugin/storage/es/mappings/fixtures/jaeger-dependencies-6.json b/internal/storage/v1/es/mappings/fixtures/jaeger-dependencies-6.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-dependencies-6.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-dependencies-6.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-dependencies-7.json b/internal/storage/v1/es/mappings/fixtures/jaeger-dependencies-7.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-dependencies-7.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-dependencies-7.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-dependencies-8.json b/internal/storage/v1/es/mappings/fixtures/jaeger-dependencies-8.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-dependencies-8.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-dependencies-8.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-sampling-6.json b/internal/storage/v1/es/mappings/fixtures/jaeger-sampling-6.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-sampling-6.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-sampling-6.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-sampling-7.json b/internal/storage/v1/es/mappings/fixtures/jaeger-sampling-7.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-sampling-7.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-sampling-7.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-sampling-8.json b/internal/storage/v1/es/mappings/fixtures/jaeger-sampling-8.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-sampling-8.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-sampling-8.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-service-6.json b/internal/storage/v1/es/mappings/fixtures/jaeger-service-6.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-service-6.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-service-6.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-service-7.json b/internal/storage/v1/es/mappings/fixtures/jaeger-service-7.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-service-7.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-service-7.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-service-8.json b/internal/storage/v1/es/mappings/fixtures/jaeger-service-8.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-service-8.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-service-8.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-span-6.json b/internal/storage/v1/es/mappings/fixtures/jaeger-span-6.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-span-6.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-span-6.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-span-7.json b/internal/storage/v1/es/mappings/fixtures/jaeger-span-7.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-span-7.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-span-7.json diff --git a/plugin/storage/es/mappings/fixtures/jaeger-span-8.json b/internal/storage/v1/es/mappings/fixtures/jaeger-span-8.json similarity index 100% rename from plugin/storage/es/mappings/fixtures/jaeger-span-8.json rename to internal/storage/v1/es/mappings/fixtures/jaeger-span-8.json diff --git a/plugin/storage/es/mappings/jaeger-dependencies-6.json b/internal/storage/v1/es/mappings/jaeger-dependencies-6.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-dependencies-6.json rename to internal/storage/v1/es/mappings/jaeger-dependencies-6.json diff --git a/plugin/storage/es/mappings/jaeger-dependencies-7.json b/internal/storage/v1/es/mappings/jaeger-dependencies-7.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-dependencies-7.json rename to internal/storage/v1/es/mappings/jaeger-dependencies-7.json diff --git a/plugin/storage/es/mappings/jaeger-dependencies-8.json b/internal/storage/v1/es/mappings/jaeger-dependencies-8.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-dependencies-8.json rename to internal/storage/v1/es/mappings/jaeger-dependencies-8.json diff --git a/plugin/storage/es/mappings/jaeger-sampling-6.json b/internal/storage/v1/es/mappings/jaeger-sampling-6.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-sampling-6.json rename to internal/storage/v1/es/mappings/jaeger-sampling-6.json diff --git a/plugin/storage/es/mappings/jaeger-sampling-7.json b/internal/storage/v1/es/mappings/jaeger-sampling-7.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-sampling-7.json rename to internal/storage/v1/es/mappings/jaeger-sampling-7.json diff --git a/plugin/storage/es/mappings/jaeger-sampling-8.json b/internal/storage/v1/es/mappings/jaeger-sampling-8.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-sampling-8.json rename to internal/storage/v1/es/mappings/jaeger-sampling-8.json diff --git a/plugin/storage/es/mappings/jaeger-service-6.json b/internal/storage/v1/es/mappings/jaeger-service-6.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-service-6.json rename to internal/storage/v1/es/mappings/jaeger-service-6.json diff --git a/plugin/storage/es/mappings/jaeger-service-7.json b/internal/storage/v1/es/mappings/jaeger-service-7.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-service-7.json rename to internal/storage/v1/es/mappings/jaeger-service-7.json diff --git a/plugin/storage/es/mappings/jaeger-service-8.json b/internal/storage/v1/es/mappings/jaeger-service-8.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-service-8.json rename to internal/storage/v1/es/mappings/jaeger-service-8.json diff --git a/plugin/storage/es/mappings/jaeger-span-6.json b/internal/storage/v1/es/mappings/jaeger-span-6.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-span-6.json rename to internal/storage/v1/es/mappings/jaeger-span-6.json diff --git a/plugin/storage/es/mappings/jaeger-span-7.json b/internal/storage/v1/es/mappings/jaeger-span-7.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-span-7.json rename to internal/storage/v1/es/mappings/jaeger-span-7.json diff --git a/plugin/storage/es/mappings/jaeger-span-8.json b/internal/storage/v1/es/mappings/jaeger-span-8.json similarity index 100% rename from plugin/storage/es/mappings/jaeger-span-8.json rename to internal/storage/v1/es/mappings/jaeger-span-8.json diff --git a/plugin/storage/es/mappings/mapping.go b/internal/storage/v1/es/mappings/mapping.go similarity index 100% rename from plugin/storage/es/mappings/mapping.go rename to internal/storage/v1/es/mappings/mapping.go diff --git a/plugin/storage/es/mappings/mapping_test.go b/internal/storage/v1/es/mappings/mapping_test.go similarity index 100% rename from plugin/storage/es/mappings/mapping_test.go rename to internal/storage/v1/es/mappings/mapping_test.go diff --git a/plugin/storage/es/options.go b/internal/storage/v1/es/options.go similarity index 100% rename from plugin/storage/es/options.go rename to internal/storage/v1/es/options.go diff --git a/plugin/storage/es/options_test.go b/internal/storage/v1/es/options_test.go similarity index 100% rename from plugin/storage/es/options_test.go rename to internal/storage/v1/es/options_test.go diff --git a/plugin/storage/es/package_test.go b/internal/storage/v1/es/package_test.go similarity index 100% rename from plugin/storage/es/package_test.go rename to internal/storage/v1/es/package_test.go diff --git a/plugin/storage/es/samplingstore/dbmodel/converter.go b/internal/storage/v1/es/samplingstore/dbmodel/converter.go similarity index 100% rename from plugin/storage/es/samplingstore/dbmodel/converter.go rename to internal/storage/v1/es/samplingstore/dbmodel/converter.go diff --git a/plugin/storage/es/samplingstore/dbmodel/converter_test.go b/internal/storage/v1/es/samplingstore/dbmodel/converter_test.go similarity index 100% rename from plugin/storage/es/samplingstore/dbmodel/converter_test.go rename to internal/storage/v1/es/samplingstore/dbmodel/converter_test.go diff --git a/plugin/storage/es/samplingstore/dbmodel/model.go b/internal/storage/v1/es/samplingstore/dbmodel/model.go similarity index 100% rename from plugin/storage/es/samplingstore/dbmodel/model.go rename to internal/storage/v1/es/samplingstore/dbmodel/model.go diff --git a/plugin/storage/es/samplingstore/storage.go b/internal/storage/v1/es/samplingstore/storage.go similarity index 98% rename from plugin/storage/es/samplingstore/storage.go rename to internal/storage/v1/es/samplingstore/storage.go index db6c960c69c..d1c10a31757 100644 --- a/plugin/storage/es/samplingstore/storage.go +++ b/internal/storage/v1/es/samplingstore/storage.go @@ -13,9 +13,9 @@ import ( "github.com/olivere/elastic" "go.uber.org/zap" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/samplingstore/dbmodel" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/pkg/es/config" - "github.com/jaegertracing/jaeger/plugin/storage/es/samplingstore/dbmodel" "github.com/jaegertracing/jaeger/storage/samplingstore/model" ) diff --git a/plugin/storage/es/samplingstore/storage_test.go b/internal/storage/v1/es/samplingstore/storage_test.go similarity index 99% rename from plugin/storage/es/samplingstore/storage_test.go rename to internal/storage/v1/es/samplingstore/storage_test.go index be821db11cc..32c9cb2b565 100644 --- a/plugin/storage/es/samplingstore/storage_test.go +++ b/internal/storage/v1/es/samplingstore/storage_test.go @@ -16,11 +16,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/samplingstore/dbmodel" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/pkg/es/config" "github.com/jaegertracing/jaeger/pkg/es/mocks" "github.com/jaegertracing/jaeger/pkg/testutils" - "github.com/jaegertracing/jaeger/plugin/storage/es/samplingstore/dbmodel" samplemodel "github.com/jaegertracing/jaeger/storage/samplingstore/model" ) diff --git a/plugin/storage/es/spanstore/fixtures/query_01.json b/internal/storage/v1/es/spanstore/fixtures/query_01.json similarity index 100% rename from plugin/storage/es/spanstore/fixtures/query_01.json rename to internal/storage/v1/es/spanstore/fixtures/query_01.json diff --git a/plugin/storage/es/spanstore/fixtures/query_02.json b/internal/storage/v1/es/spanstore/fixtures/query_02.json similarity index 100% rename from plugin/storage/es/spanstore/fixtures/query_02.json rename to internal/storage/v1/es/spanstore/fixtures/query_02.json diff --git a/plugin/storage/es/spanstore/fixtures/query_03.json b/internal/storage/v1/es/spanstore/fixtures/query_03.json similarity index 100% rename from plugin/storage/es/spanstore/fixtures/query_03.json rename to internal/storage/v1/es/spanstore/fixtures/query_03.json diff --git a/plugin/storage/es/spanstore/index_utils.go b/internal/storage/v1/es/spanstore/index_utils.go similarity index 100% rename from plugin/storage/es/spanstore/index_utils.go rename to internal/storage/v1/es/spanstore/index_utils.go diff --git a/plugin/storage/es/spanstore/internal/dbmodel/fixtures/domain_01.json b/internal/storage/v1/es/spanstore/internal/dbmodel/fixtures/domain_01.json similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/fixtures/domain_01.json rename to internal/storage/v1/es/spanstore/internal/dbmodel/fixtures/domain_01.json diff --git a/plugin/storage/es/spanstore/internal/dbmodel/fixtures/es_01.json b/internal/storage/v1/es/spanstore/internal/dbmodel/fixtures/es_01.json similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/fixtures/es_01.json rename to internal/storage/v1/es/spanstore/internal/dbmodel/fixtures/es_01.json diff --git a/plugin/storage/es/spanstore/internal/dbmodel/from_domain.go b/internal/storage/v1/es/spanstore/internal/dbmodel/from_domain.go similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/from_domain.go rename to internal/storage/v1/es/spanstore/internal/dbmodel/from_domain.go diff --git a/plugin/storage/es/spanstore/internal/dbmodel/from_domain_test.go b/internal/storage/v1/es/spanstore/internal/dbmodel/from_domain_test.go similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/from_domain_test.go rename to internal/storage/v1/es/spanstore/internal/dbmodel/from_domain_test.go diff --git a/plugin/storage/es/spanstore/internal/dbmodel/json_span_compare_test.go b/internal/storage/v1/es/spanstore/internal/dbmodel/json_span_compare_test.go similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/json_span_compare_test.go rename to internal/storage/v1/es/spanstore/internal/dbmodel/json_span_compare_test.go diff --git a/plugin/storage/es/spanstore/internal/dbmodel/model.go b/internal/storage/v1/es/spanstore/internal/dbmodel/model.go similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/model.go rename to internal/storage/v1/es/spanstore/internal/dbmodel/model.go diff --git a/plugin/storage/es/spanstore/internal/dbmodel/package_test.go b/internal/storage/v1/es/spanstore/internal/dbmodel/package_test.go similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/package_test.go rename to internal/storage/v1/es/spanstore/internal/dbmodel/package_test.go diff --git a/plugin/storage/es/spanstore/internal/dbmodel/to_domain.go b/internal/storage/v1/es/spanstore/internal/dbmodel/to_domain.go similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/to_domain.go rename to internal/storage/v1/es/spanstore/internal/dbmodel/to_domain.go diff --git a/plugin/storage/es/spanstore/internal/dbmodel/to_domain_test.go b/internal/storage/v1/es/spanstore/internal/dbmodel/to_domain_test.go similarity index 100% rename from plugin/storage/es/spanstore/internal/dbmodel/to_domain_test.go rename to internal/storage/v1/es/spanstore/internal/dbmodel/to_domain_test.go diff --git a/plugin/storage/es/spanstore/package_test.go b/internal/storage/v1/es/spanstore/package_test.go similarity index 100% rename from plugin/storage/es/spanstore/package_test.go rename to internal/storage/v1/es/spanstore/package_test.go diff --git a/plugin/storage/es/spanstore/reader.go b/internal/storage/v1/es/spanstore/reader.go similarity index 99% rename from plugin/storage/es/spanstore/reader.go rename to internal/storage/v1/es/spanstore/reader.go index 840ba06762a..cda5b5f06a3 100644 --- a/plugin/storage/es/spanstore/reader.go +++ b/internal/storage/v1/es/spanstore/reader.go @@ -20,9 +20,9 @@ import ( "go.uber.org/zap" "github.com/jaegertracing/jaeger-idl/model/v1" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/pkg/es" cfg "github.com/jaegertracing/jaeger/pkg/es/config" - "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/storage/spanstore" ) diff --git a/plugin/storage/es/spanstore/reader_test.go b/internal/storage/v1/es/spanstore/reader_test.go similarity index 99% rename from plugin/storage/es/spanstore/reader_test.go rename to internal/storage/v1/es/spanstore/reader_test.go index c95705da2b7..2b090f6d34b 100644 --- a/plugin/storage/es/spanstore/reader_test.go +++ b/internal/storage/v1/es/spanstore/reader_test.go @@ -25,11 +25,11 @@ import ( "go.uber.org/zap/zaptest" "github.com/jaegertracing/jaeger-idl/model/v1" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/pkg/es/config" "github.com/jaegertracing/jaeger/pkg/es/mocks" "github.com/jaegertracing/jaeger/pkg/testutils" - "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/storage/spanstore" ) diff --git a/plugin/storage/es/spanstore/service_operation.go b/internal/storage/v1/es/spanstore/service_operation.go similarity index 97% rename from plugin/storage/es/spanstore/service_operation.go rename to internal/storage/v1/es/spanstore/service_operation.go index 0ac2c20e3cb..14e278b12a7 100644 --- a/plugin/storage/es/spanstore/service_operation.go +++ b/internal/storage/v1/es/spanstore/service_operation.go @@ -15,9 +15,9 @@ import ( "github.com/olivere/elastic" "go.uber.org/zap" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/pkg/cache" "github.com/jaegertracing/jaeger/pkg/es" - "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" ) const ( diff --git a/plugin/storage/es/spanstore/service_operation_test.go b/internal/storage/v1/es/spanstore/service_operation_test.go similarity index 97% rename from plugin/storage/es/spanstore/service_operation_test.go rename to internal/storage/v1/es/spanstore/service_operation_test.go index b1ba9f2c377..0619aa7a914 100644 --- a/plugin/storage/es/spanstore/service_operation_test.go +++ b/internal/storage/v1/es/spanstore/service_operation_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/pkg/es/mocks" - "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/storage/spanstore" ) diff --git a/plugin/storage/es/spanstore/writer.go b/internal/storage/v1/es/spanstore/writer.go similarity index 98% rename from plugin/storage/es/spanstore/writer.go rename to internal/storage/v1/es/spanstore/writer.go index 2291ce07277..d3484f6de01 100644 --- a/plugin/storage/es/spanstore/writer.go +++ b/internal/storage/v1/es/spanstore/writer.go @@ -12,11 +12,11 @@ import ( "go.uber.org/zap" "github.com/jaegertracing/jaeger-idl/model/v1" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/pkg/cache" "github.com/jaegertracing/jaeger/pkg/es" cfg "github.com/jaegertracing/jaeger/pkg/es/config" "github.com/jaegertracing/jaeger/pkg/metrics" - "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/storage/spanstore/spanstoremetrics" ) diff --git a/plugin/storage/es/spanstore/writer_test.go b/internal/storage/v1/es/spanstore/writer_test.go similarity index 99% rename from plugin/storage/es/spanstore/writer_test.go rename to internal/storage/v1/es/spanstore/writer_test.go index 88b37239f5f..0af434a5139 100644 --- a/plugin/storage/es/spanstore/writer_test.go +++ b/internal/storage/v1/es/spanstore/writer_test.go @@ -18,11 +18,11 @@ import ( "github.com/jaegertracing/jaeger-idl/model/v1" "github.com/jaegertracing/jaeger/internal/metricstest" + "github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/pkg/es" "github.com/jaegertracing/jaeger/pkg/es/config" "github.com/jaegertracing/jaeger/pkg/es/mocks" "github.com/jaegertracing/jaeger/pkg/testutils" - "github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/internal/dbmodel" "github.com/jaegertracing/jaeger/storage/spanstore" ) diff --git a/plugin/storage/factory.go b/plugin/storage/factory.go index 42557aeb26f..b1d295c40a3 100644 --- a/plugin/storage/factory.go +++ b/plugin/storage/factory.go @@ -16,12 +16,12 @@ import ( "github.com/jaegertracing/jaeger/internal/safeexpvar" "github.com/jaegertracing/jaeger/internal/storage/v1/badger" "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra" + "github.com/jaegertracing/jaeger/internal/storage/v1/es" "github.com/jaegertracing/jaeger/internal/storage/v1/grpc" "github.com/jaegertracing/jaeger/internal/storage/v1/memory" "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger/plugin" "github.com/jaegertracing/jaeger/plugin/storage/blackhole" - "github.com/jaegertracing/jaeger/plugin/storage/es" "github.com/jaegertracing/jaeger/plugin/storage/kafka" "github.com/jaegertracing/jaeger/storage" "github.com/jaegertracing/jaeger/storage/dependencystore" diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go index 20cb803138a..a2fe61eeebb 100644 --- a/plugin/storage/integration/elasticsearch_test.go +++ b/plugin/storage/integration/elasticsearch_test.go @@ -22,10 +22,10 @@ import ( "go.uber.org/zap/zaptest" "github.com/jaegertracing/jaeger-idl/model/v1" + "github.com/jaegertracing/jaeger/internal/storage/v1/es" "github.com/jaegertracing/jaeger/pkg/config" "github.com/jaegertracing/jaeger/pkg/metrics" "github.com/jaegertracing/jaeger/pkg/testutils" - "github.com/jaegertracing/jaeger/plugin/storage/es" "github.com/jaegertracing/jaeger/storage/dependencystore" "github.com/jaegertracing/jaeger/storage_v2/tracestore" "github.com/jaegertracing/jaeger/storage_v2/v1adapter" diff --git a/scripts/build/package-deploy.sh b/scripts/build/package-deploy.sh index fbac33def87..c73b8dbc748 100755 --- a/scripts/build/package-deploy.sh +++ b/scripts/build/package-deploy.sh @@ -67,7 +67,7 @@ function stage-tool-platform-files { cp "./cmd/es-index-cleaner/es-index-cleaner-${PLATFORM}" "${TOOLS_PACKAGE_STAGING_DIR}/jaeger-es-index-cleaner${FILE_EXTENSION}" cp "./cmd/es-rollover/es-rollover-${PLATFORM}" "${TOOLS_PACKAGE_STAGING_DIR}/jaeger-es-rollover${FILE_EXTENSION}" - cp "./plugin/storage/es/esmapping-generator-${PLATFORM}" "${TOOLS_PACKAGE_STAGING_DIR}/jaeger-esmapping-generator${FILE_EXTENSION}" + cp "./internal/storage/v1/es/esmapping-generator-${PLATFORM}" "${TOOLS_PACKAGE_STAGING_DIR}/jaeger-esmapping-generator${FILE_EXTENSION}" } # package pulls built files for the platform ($2) and compresses it using the compression ($1).