[refactor] Move elasticsearch implementation to internal package (j…

…aegertracing#6648) ## Which problem is this PR solving? - Towards jaegertracing#6637 ## Description of the changes - This PR moves the implementation for elasticsearch storage from `plugin/storage/` to `internal/storage/` ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: Mahad Zaryab <[email protected]> Signed-off-by: Mahad Zaryab <[email protected]>
mahadzaryab1 · Feb 2, 2025 · d590c11 · d590c11
1 parent eecc334
commit d590c11
Show file tree

Hide file tree

Showing 76 changed files with 25 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → internal/storage/v1/es/.gitignore b/plugin/storage/es/.gitignore → internal/storage/v1/es/.gitignore
diff --git a/plugin/storage/es/README.md → internal/storage/v1/es/README.md b/plugin/storage/es/README.md → internal/storage/v1/es/README.md
diff --git a/...e/es/dependencystore/dbmodel/converter.go → ...1/es/dependencystore/dbmodel/converter.go b/...e/es/dependencystore/dbmodel/converter.go → ...1/es/dependencystore/dbmodel/converter.go
diff --git a/...dependencystore/dbmodel/converter_test.go → ...dependencystore/dbmodel/converter_test.go b/...dependencystore/dbmodel/converter_test.go → ...dependencystore/dbmodel/converter_test.go
diff --git a/...orage/es/dependencystore/dbmodel/model.go → ...ge/v1/es/dependencystore/dbmodel/model.go b/...orage/es/dependencystore/dbmodel/model.go → ...ge/v1/es/dependencystore/dbmodel/model.go
diff --git a/plugin/storage/es/dependencystore/storage.go → .../storage/v1/es/dependencystore/storage.go b/plugin/storage/es/dependencystore/storage.go → .../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/...torage/es/dependencystore/storage_test.go → ...age/v1/es/dependencystore/storage_test.go b/...torage/es/dependencystore/storage_test.go → ...age/v1/es/dependencystore/storage_test.go
diff --git a/plugin/storage/es/factory.go → internal/storage/v1/es/factory.go b/plugin/storage/es/factory.go → 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 → internal/storage/v1/es/factory_test.go b/plugin/storage/es/factory_test.go → internal/storage/v1/es/factory_test.go
diff --git a/plugin/storage/es/fixtures/tags_01.txt → internal/storage/v1/es/fixtures/tags_01.txt b/plugin/storage/es/fixtures/tags_01.txt → internal/storage/v1/es/fixtures/tags_01.txt
diff --git a/plugin/storage/es/fixtures/tags_02.txt → internal/storage/v1/es/fixtures/tags_02.txt b/plugin/storage/es/fixtures/tags_02.txt → internal/storage/v1/es/fixtures/tags_02.txt
diff --git a/...pings/fixtures/jaeger-dependencies-6.json → ...pings/fixtures/jaeger-dependencies-6.json b/...pings/fixtures/jaeger-dependencies-6.json → ...pings/fixtures/jaeger-dependencies-6.json
diff --git a/...pings/fixtures/jaeger-dependencies-7.json → ...pings/fixtures/jaeger-dependencies-7.json b/...pings/fixtures/jaeger-dependencies-7.json → ...pings/fixtures/jaeger-dependencies-7.json
diff --git a/...pings/fixtures/jaeger-dependencies-8.json → ...pings/fixtures/jaeger-dependencies-8.json b/...pings/fixtures/jaeger-dependencies-8.json → ...pings/fixtures/jaeger-dependencies-8.json
diff --git a/.../mappings/fixtures/jaeger-sampling-6.json → .../mappings/fixtures/jaeger-sampling-6.json b/.../mappings/fixtures/jaeger-sampling-6.json → .../mappings/fixtures/jaeger-sampling-6.json
diff --git a/.../mappings/fixtures/jaeger-sampling-7.json → .../mappings/fixtures/jaeger-sampling-7.json b/.../mappings/fixtures/jaeger-sampling-7.json → .../mappings/fixtures/jaeger-sampling-7.json
diff --git a/.../mappings/fixtures/jaeger-sampling-8.json → .../mappings/fixtures/jaeger-sampling-8.json b/.../mappings/fixtures/jaeger-sampling-8.json → .../mappings/fixtures/jaeger-sampling-8.json
diff --git a/...s/mappings/fixtures/jaeger-service-6.json → ...s/mappings/fixtures/jaeger-service-6.json b/...s/mappings/fixtures/jaeger-service-6.json → ...s/mappings/fixtures/jaeger-service-6.json
diff --git a/...s/mappings/fixtures/jaeger-service-7.json → ...s/mappings/fixtures/jaeger-service-7.json b/...s/mappings/fixtures/jaeger-service-7.json → ...s/mappings/fixtures/jaeger-service-7.json
diff --git a/...s/mappings/fixtures/jaeger-service-8.json → ...s/mappings/fixtures/jaeger-service-8.json b/...s/mappings/fixtures/jaeger-service-8.json → ...s/mappings/fixtures/jaeger-service-8.json
diff --git a/...e/es/mappings/fixtures/jaeger-span-6.json → ...1/es/mappings/fixtures/jaeger-span-6.json b/...e/es/mappings/fixtures/jaeger-span-6.json → ...1/es/mappings/fixtures/jaeger-span-6.json
diff --git a/...e/es/mappings/fixtures/jaeger-span-7.json → ...1/es/mappings/fixtures/jaeger-span-7.json b/...e/es/mappings/fixtures/jaeger-span-7.json → ...1/es/mappings/fixtures/jaeger-span-7.json
diff --git a/...e/es/mappings/fixtures/jaeger-span-8.json → ...1/es/mappings/fixtures/jaeger-span-8.json b/...e/es/mappings/fixtures/jaeger-span-8.json → ...1/es/mappings/fixtures/jaeger-span-8.json
diff --git a/...ge/es/mappings/jaeger-dependencies-6.json → ...v1/es/mappings/jaeger-dependencies-6.json b/...ge/es/mappings/jaeger-dependencies-6.json → ...v1/es/mappings/jaeger-dependencies-6.json
diff --git a/...ge/es/mappings/jaeger-dependencies-7.json → ...v1/es/mappings/jaeger-dependencies-7.json b/...ge/es/mappings/jaeger-dependencies-7.json → ...v1/es/mappings/jaeger-dependencies-7.json
diff --git a/...ge/es/mappings/jaeger-dependencies-8.json → ...v1/es/mappings/jaeger-dependencies-8.json b/...ge/es/mappings/jaeger-dependencies-8.json → ...v1/es/mappings/jaeger-dependencies-8.json
diff --git a/...torage/es/mappings/jaeger-sampling-6.json → ...age/v1/es/mappings/jaeger-sampling-6.json b/...torage/es/mappings/jaeger-sampling-6.json → ...age/v1/es/mappings/jaeger-sampling-6.json
diff --git a/...torage/es/mappings/jaeger-sampling-7.json → ...age/v1/es/mappings/jaeger-sampling-7.json b/...torage/es/mappings/jaeger-sampling-7.json → ...age/v1/es/mappings/jaeger-sampling-7.json
diff --git a/...torage/es/mappings/jaeger-sampling-8.json → ...age/v1/es/mappings/jaeger-sampling-8.json b/...torage/es/mappings/jaeger-sampling-8.json → ...age/v1/es/mappings/jaeger-sampling-8.json
diff --git a/...storage/es/mappings/jaeger-service-6.json → ...rage/v1/es/mappings/jaeger-service-6.json b/...storage/es/mappings/jaeger-service-6.json → ...rage/v1/es/mappings/jaeger-service-6.json
diff --git a/...storage/es/mappings/jaeger-service-7.json → ...rage/v1/es/mappings/jaeger-service-7.json b/...storage/es/mappings/jaeger-service-7.json → ...rage/v1/es/mappings/jaeger-service-7.json
diff --git a/...storage/es/mappings/jaeger-service-8.json → ...rage/v1/es/mappings/jaeger-service-8.json b/...storage/es/mappings/jaeger-service-8.json → ...rage/v1/es/mappings/jaeger-service-8.json
diff --git a/...in/storage/es/mappings/jaeger-span-6.json → ...storage/v1/es/mappings/jaeger-span-6.json b/...in/storage/es/mappings/jaeger-span-6.json → ...storage/v1/es/mappings/jaeger-span-6.json
diff --git a/...in/storage/es/mappings/jaeger-span-7.json → ...storage/v1/es/mappings/jaeger-span-7.json b/...in/storage/es/mappings/jaeger-span-7.json → ...storage/v1/es/mappings/jaeger-span-7.json
diff --git a/...in/storage/es/mappings/jaeger-span-8.json → ...storage/v1/es/mappings/jaeger-span-8.json b/...in/storage/es/mappings/jaeger-span-8.json → ...storage/v1/es/mappings/jaeger-span-8.json
diff --git a/plugin/storage/es/mappings/mapping.go → internal/storage/v1/es/mappings/mapping.go b/plugin/storage/es/mappings/mapping.go → internal/storage/v1/es/mappings/mapping.go
diff --git a/plugin/storage/es/mappings/mapping_test.go → ...al/storage/v1/es/mappings/mapping_test.go b/plugin/storage/es/mappings/mapping_test.go → ...al/storage/v1/es/mappings/mapping_test.go
diff --git a/plugin/storage/es/options.go → internal/storage/v1/es/options.go b/plugin/storage/es/options.go → internal/storage/v1/es/options.go
diff --git a/plugin/storage/es/options_test.go → internal/storage/v1/es/options_test.go b/plugin/storage/es/options_test.go → internal/storage/v1/es/options_test.go
diff --git a/plugin/storage/es/package_test.go → internal/storage/v1/es/package_test.go b/plugin/storage/es/package_test.go → internal/storage/v1/es/package_test.go
diff --git a/...age/es/samplingstore/dbmodel/converter.go → .../v1/es/samplingstore/dbmodel/converter.go b/...age/es/samplingstore/dbmodel/converter.go → .../v1/es/samplingstore/dbmodel/converter.go
diff --git a/...s/samplingstore/dbmodel/converter_test.go → ...s/samplingstore/dbmodel/converter_test.go b/...s/samplingstore/dbmodel/converter_test.go → ...s/samplingstore/dbmodel/converter_test.go
diff --git a/...storage/es/samplingstore/dbmodel/model.go → ...rage/v1/es/samplingstore/dbmodel/model.go b/...storage/es/samplingstore/dbmodel/model.go → ...rage/v1/es/samplingstore/dbmodel/model.go
diff --git a/plugin/storage/es/samplingstore/storage.go → ...al/storage/v1/es/samplingstore/storage.go b/plugin/storage/es/samplingstore/storage.go → ...al/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/.../storage/es/samplingstore/storage_test.go → ...orage/v1/es/samplingstore/storage_test.go b/.../storage/es/samplingstore/storage_test.go → ...orage/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/...orage/es/spanstore/fixtures/query_01.json → ...ge/v1/es/spanstore/fixtures/query_01.json b/...orage/es/spanstore/fixtures/query_01.json → ...ge/v1/es/spanstore/fixtures/query_01.json
diff --git a/...orage/es/spanstore/fixtures/query_02.json → ...ge/v1/es/spanstore/fixtures/query_02.json b/...orage/es/spanstore/fixtures/query_02.json → ...ge/v1/es/spanstore/fixtures/query_02.json
diff --git a/...orage/es/spanstore/fixtures/query_03.json → ...ge/v1/es/spanstore/fixtures/query_03.json b/...orage/es/spanstore/fixtures/query_03.json → ...ge/v1/es/spanstore/fixtures/query_03.json
diff --git a/plugin/storage/es/spanstore/index_utils.go → ...al/storage/v1/es/spanstore/index_utils.go b/plugin/storage/es/spanstore/index_utils.go → ...al/storage/v1/es/spanstore/index_utils.go
diff --git a/.../internal/dbmodel/fixtures/domain_01.json → .../internal/dbmodel/fixtures/domain_01.json b/.../internal/dbmodel/fixtures/domain_01.json → .../internal/dbmodel/fixtures/domain_01.json
diff --git a/...tore/internal/dbmodel/fixtures/es_01.json → ...tore/internal/dbmodel/fixtures/es_01.json b/...tore/internal/dbmodel/fixtures/es_01.json → ...tore/internal/dbmodel/fixtures/es_01.json
diff --git a/...spanstore/internal/dbmodel/from_domain.go → ...spanstore/internal/dbmodel/from_domain.go b/...spanstore/internal/dbmodel/from_domain.go → ...spanstore/internal/dbmodel/from_domain.go
diff --git a/...tore/internal/dbmodel/from_domain_test.go → ...tore/internal/dbmodel/from_domain_test.go b/...tore/internal/dbmodel/from_domain_test.go → ...tore/internal/dbmodel/from_domain_test.go
diff --git a/...nternal/dbmodel/json_span_compare_test.go → ...nternal/dbmodel/json_span_compare_test.go b/...nternal/dbmodel/json_span_compare_test.go → ...nternal/dbmodel/json_span_compare_test.go
diff --git a/...ge/es/spanstore/internal/dbmodel/model.go → ...v1/es/spanstore/internal/dbmodel/model.go b/...ge/es/spanstore/internal/dbmodel/model.go → ...v1/es/spanstore/internal/dbmodel/model.go
diff --git a/...panstore/internal/dbmodel/package_test.go → ...panstore/internal/dbmodel/package_test.go b/...panstore/internal/dbmodel/package_test.go → ...panstore/internal/dbmodel/package_test.go
diff --git a/...s/spanstore/internal/dbmodel/to_domain.go → ...s/spanstore/internal/dbmodel/to_domain.go b/...s/spanstore/internal/dbmodel/to_domain.go → ...s/spanstore/internal/dbmodel/to_domain.go
diff --git a/...nstore/internal/dbmodel/to_domain_test.go → ...nstore/internal/dbmodel/to_domain_test.go b/...nstore/internal/dbmodel/to_domain_test.go → ...nstore/internal/dbmodel/to_domain_test.go
diff --git a/plugin/storage/es/spanstore/package_test.go → ...l/storage/v1/es/spanstore/package_test.go b/plugin/storage/es/spanstore/package_test.go → ...l/storage/v1/es/spanstore/package_test.go
diff --git a/plugin/storage/es/spanstore/reader.go → internal/storage/v1/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go → 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 → ...al/storage/v1/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go → ...al/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/...storage/es/spanstore/service_operation.go → ...rage/v1/es/spanstore/service_operation.go b/...storage/es/spanstore/service_operation.go → ...rage/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/...ge/es/spanstore/service_operation_test.go → ...v1/es/spanstore/service_operation_test.go b/...ge/es/spanstore/service_operation_test.go → ...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 → internal/storage/v1/es/spanstore/writer.go b/plugin/storage/es/spanstore/writer.go → 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 → ...al/storage/v1/es/spanstore/writer_test.go b/plugin/storage/es/spanstore/writer_test.go → ...al/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
@@ -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
@@ -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
@@ -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).