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.

Sign up for GitHub

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

[refactor] Rename storage/v1/es to storage/v1/elasticsearch #6655

Merged
merged 2 commits into from
Feb 2, 2025
+31 −35
Merged

[refactor] Rename storage/v1/es to storage/v1/elasticsearch #6655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89826b8
[refactor] Rename storage/v1/es to storage/v1/elasticsearch
yurishkuro Feb 2, 2025
a623802
Use standard ./cmd/{name} for binary location
yurishkuro Feb 2, 2025
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
6 changes: 1 addition & 5 deletions Makefile.BuildBinaries.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ build-anonymizer:

.PHONY: build-esmapping-generator
build-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 ./internal/storage/v1/es/esmapping-generator ./cmd/esmapping-generator/
$(GOBUILD) $(BUILD_INFO) -o ./cmd/esmapping-generator/esmapping-generator-$(GOOS)-$(GOARCH) ./cmd/esmapping-generator/

.PHONY: build-es-index-cleaner
build-es-index-cleaner:
Expand Down
2 changes: 1 addition & 1 deletion cmd/es-rollover/app/init/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/jaegertracing/jaeger/cmd/es-rollover/app"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/mappings"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/mappings"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/pkg/es/client"
"github.com/jaegertracing/jaeger/pkg/es/config"
Expand Down
2 changes: 1 addition & 1 deletion cmd/esmapping-generator/app/renderer/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"

"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/mappings"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/mappings"
"github.com/jaegertracing/jaeger/pkg/es"
cfg "github.com/jaegertracing/jaeger/pkg/es/config"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/esmapping-generator/app/renderer/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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/internal/storage/v1/elasticsearch/mappings"
"github.com/jaegertracing/jaeger/pkg/es/mocks"
"github.com/jaegertracing/jaeger/pkg/testutils"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/esmapping-generator/generator/esmapping_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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/internal/storage/v1/elasticsearch/mappings"
"github.com/jaegertracing/jaeger/pkg/es"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/jaegerstorage/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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"
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
casCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/jaegerstorage/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/jaegertracing/jaeger/internal/storage/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
"github.com/jaegertracing/jaeger/internal/storage/v1/es"
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
"github.com/jaegertracing/jaeger/pkg/metrics"
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/token_propagation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ 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"
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
"github.com/jaegertracing/jaeger/pkg/bearertoken"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/telemetry"
Expand Down
0 internal/storage/v1/es/.gitignore → internal/storage/v1/elasticsearch/.gitignore
View file
Open in desktop
File renamed without changes.
0 internal/storage/v1/es/README.md → internal/storage/v1/elasticsearch/README.md
View file
Open in desktop
File renamed without changes.
0 ...1/es/dependencystore/dbmodel/converter.go → ...arch/dependencystore/dbmodel/converter.go
View file
Open in desktop
File renamed without changes.
0 ...dependencystore/dbmodel/converter_test.go → ...dependencystore/dbmodel/converter_test.go
View file
Open in desktop
File renamed without changes.
0 ...ge/v1/es/dependencystore/dbmodel/model.go → ...icsearch/dependencystore/dbmodel/model.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../storage/v1/es/dependencystore/storage.go → .../elasticsearch/dependencystore/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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/internal/storage/v1/elasticsearch/dependencystore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/pkg/es/config"
)
Expand Down
0 ...age/v1/es/dependencystore/storage_test.go → ...ticsearch/dependencystore/storage_test.go
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions internal/storage/v1/es/factory.go → internal/storage/v1/elasticsearch/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 2017 Uber Technologies, Inc.
// SPDX-License-Identifier: Apache-2.0

package es
package elasticsearch

import (
"context"
Expand All @@ -25,10 +25,10 @@ import (
"github.com/jaegertracing/jaeger/internal/storage/v1/api/samplingstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore/spanstoremetrics"
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"
esDepStore "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/dependencystore"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/mappings"
esSampleStore "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/samplingstore"
esSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/spanstore"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/pkg/es/config"
"github.com/jaegertracing/jaeger/pkg/fswatcher"
Expand Down
2 changes: 1 addition & 1 deletion internal/storage/v1/es/factory_test.go → .../storage/v1/elasticsearch/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 2017 Uber Technologies, Inc.
// SPDX-License-Identifier: Apache-2.0

package es
package elasticsearch

import (
"context"
Expand Down
0 internal/storage/v1/es/fixtures/tags_01.txt → ...age/v1/elasticsearch/fixtures/tags_01.txt
View file
Open in desktop
File renamed without changes.
0 internal/storage/v1/es/fixtures/tags_02.txt → ...age/v1/elasticsearch/fixtures/tags_02.txt
View file
Open in desktop
File renamed without changes.
0 ...pings/fixtures/jaeger-dependencies-6.json → ...pings/fixtures/jaeger-dependencies-6.json
View file
Open in desktop
File renamed without changes.
0 ...pings/fixtures/jaeger-dependencies-7.json → ...pings/fixtures/jaeger-dependencies-7.json
View file
Open in desktop
File renamed without changes.
0 ...pings/fixtures/jaeger-dependencies-8.json → ...pings/fixtures/jaeger-dependencies-8.json
View file
Open in desktop
File renamed without changes.
0 .../mappings/fixtures/jaeger-sampling-6.json → .../mappings/fixtures/jaeger-sampling-6.json
View file
Open in desktop
File renamed without changes.
0 .../mappings/fixtures/jaeger-sampling-7.json → .../mappings/fixtures/jaeger-sampling-7.json
View file
Open in desktop
File renamed without changes.
0 .../mappings/fixtures/jaeger-sampling-8.json → .../mappings/fixtures/jaeger-sampling-8.json
View file
Open in desktop
File renamed without changes.
0 ...s/mappings/fixtures/jaeger-service-6.json → ...h/mappings/fixtures/jaeger-service-6.json
View file
Open in desktop
File renamed without changes.
0 ...s/mappings/fixtures/jaeger-service-7.json → ...h/mappings/fixtures/jaeger-service-7.json
View file
Open in desktop
File renamed without changes.
0 ...s/mappings/fixtures/jaeger-service-8.json → ...h/mappings/fixtures/jaeger-service-8.json
View file
Open in desktop
File renamed without changes.
0 ...1/es/mappings/fixtures/jaeger-span-6.json → ...arch/mappings/fixtures/jaeger-span-6.json
View file
Open in desktop
File renamed without changes.
0 ...1/es/mappings/fixtures/jaeger-span-7.json → ...arch/mappings/fixtures/jaeger-span-7.json
View file
Open in desktop
File renamed without changes.
0 ...1/es/mappings/fixtures/jaeger-span-8.json → ...arch/mappings/fixtures/jaeger-span-8.json
View file
Open in desktop
File renamed without changes.
0 ...v1/es/mappings/jaeger-dependencies-6.json → ...earch/mappings/jaeger-dependencies-6.json
View file
Open in desktop
File renamed without changes.
0 ...v1/es/mappings/jaeger-dependencies-7.json → ...earch/mappings/jaeger-dependencies-7.json
View file
Open in desktop
File renamed without changes.
0 ...v1/es/mappings/jaeger-dependencies-8.json → ...earch/mappings/jaeger-dependencies-8.json
View file
Open in desktop
File renamed without changes.
0 ...age/v1/es/mappings/jaeger-sampling-6.json → ...ticsearch/mappings/jaeger-sampling-6.json
View file
Open in desktop
File renamed without changes.
0 ...age/v1/es/mappings/jaeger-sampling-7.json → ...ticsearch/mappings/jaeger-sampling-7.json
View file
Open in desktop
File renamed without changes.
0 ...age/v1/es/mappings/jaeger-sampling-8.json → ...ticsearch/mappings/jaeger-sampling-8.json
View file
Open in desktop
File renamed without changes.
0 ...rage/v1/es/mappings/jaeger-service-6.json → ...sticsearch/mappings/jaeger-service-6.json
View file
Open in desktop
File renamed without changes.
0 ...rage/v1/es/mappings/jaeger-service-7.json → ...sticsearch/mappings/jaeger-service-7.json
View file
Open in desktop
File renamed without changes.
0 ...rage/v1/es/mappings/jaeger-service-8.json → ...sticsearch/mappings/jaeger-service-8.json
View file
Open in desktop
File renamed without changes.
0 ...storage/v1/es/mappings/jaeger-span-6.json → ...elasticsearch/mappings/jaeger-span-6.json
View file
Open in desktop
File renamed without changes.
0 ...storage/v1/es/mappings/jaeger-span-7.json → ...elasticsearch/mappings/jaeger-span-7.json
View file
Open in desktop
File renamed without changes.
0 ...storage/v1/es/mappings/jaeger-span-8.json → ...elasticsearch/mappings/jaeger-span-8.json
View file
Open in desktop
File renamed without changes.
0 internal/storage/v1/es/mappings/mapping.go → ...rage/v1/elasticsearch/mappings/mapping.go
View file
Open in desktop
File renamed without changes.
0 ...al/storage/v1/es/mappings/mapping_test.go → ...v1/elasticsearch/mappings/mapping_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/storage/v1/es/options.go → internal/storage/v1/elasticsearch/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 2017 Uber Technologies, Inc.
// SPDX-License-Identifier: Apache-2.0

package es
package elasticsearch

import (
"flag"
Expand Down
2 changes: 1 addition & 1 deletion internal/storage/v1/es/options_test.go → .../storage/v1/elasticsearch/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Copyright (c) 2017 Uber Technologies, Inc.
// SPDX-License-Identifier: Apache-2.0

package es
package elasticsearch

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion internal/storage/v1/es/package_test.go → .../storage/v1/elasticsearch/package_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2023 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package es
package elasticsearch

import (
"testing"
Expand Down
0 .../v1/es/samplingstore/dbmodel/converter.go → ...search/samplingstore/dbmodel/converter.go
View file
Open in desktop
File renamed without changes.
0 ...s/samplingstore/dbmodel/converter_test.go → ...h/samplingstore/dbmodel/converter_test.go
View file
Open in desktop
File renamed without changes.
0 ...rage/v1/es/samplingstore/dbmodel/model.go → ...sticsearch/samplingstore/dbmodel/model.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...al/storage/v1/es/samplingstore/storage.go → ...v1/elasticsearch/samplingstore/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/storage/v1/api/samplingstore/model"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/samplingstore/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/samplingstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/pkg/es/config"
)
Expand Down
2 changes: 1 addition & 1 deletion ...orage/v1/es/samplingstore/storage_test.go → ...asticsearch/samplingstore/storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"go.uber.org/zap"

samplemodel "github.com/jaegertracing/jaeger/internal/storage/v1/api/samplingstore/model"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/samplingstore/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/samplingstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/pkg/es/config"
"github.com/jaegertracing/jaeger/pkg/es/mocks"
Expand Down
0 ...ge/v1/es/spanstore/fixtures/query_01.json → ...icsearch/spanstore/fixtures/query_01.json
View file
Open in desktop
File renamed without changes.
0 ...ge/v1/es/spanstore/fixtures/query_02.json → ...icsearch/spanstore/fixtures/query_02.json
View file
Open in desktop
File renamed without changes.
0 ...ge/v1/es/spanstore/fixtures/query_03.json → ...icsearch/spanstore/fixtures/query_03.json
View file
Open in desktop
File renamed without changes.
0 ...al/storage/v1/es/spanstore/index_utils.go → ...v1/elasticsearch/spanstore/index_utils.go
View file
Open in desktop
File renamed without changes.
0 .../internal/dbmodel/fixtures/domain_01.json → .../internal/dbmodel/fixtures/domain_01.json
View file
Open in desktop
File renamed without changes.
0 ...tore/internal/dbmodel/fixtures/es_01.json → ...tore/internal/dbmodel/fixtures/es_01.json
View file
Open in desktop
File renamed without changes.
0 ...spanstore/internal/dbmodel/from_domain.go → ...spanstore/internal/dbmodel/from_domain.go
View file
Open in desktop
File renamed without changes.
0 ...tore/internal/dbmodel/from_domain_test.go → ...tore/internal/dbmodel/from_domain_test.go
View file
Open in desktop
File renamed without changes.
0 ...nternal/dbmodel/json_span_compare_test.go → ...nternal/dbmodel/json_span_compare_test.go
View file
Open in desktop
File renamed without changes.
0 ...v1/es/spanstore/internal/dbmodel/model.go → ...earch/spanstore/internal/dbmodel/model.go
View file
Open in desktop
File renamed without changes.
0 ...panstore/internal/dbmodel/package_test.go → ...panstore/internal/dbmodel/package_test.go
View file
Open in desktop
File renamed without changes.
0 ...s/spanstore/internal/dbmodel/to_domain.go → ...h/spanstore/internal/dbmodel/to_domain.go
View file
Open in desktop
File renamed without changes.
0 ...nstore/internal/dbmodel/to_domain_test.go → ...nstore/internal/dbmodel/to_domain_test.go
View file
Open in desktop
File renamed without changes.
0 ...l/storage/v1/es/spanstore/package_test.go → ...1/elasticsearch/spanstore/package_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/storage/v1/es/spanstore/reader.go → ...rage/v1/elasticsearch/spanstore/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/pkg/es"
cfg "github.com/jaegertracing/jaeger/pkg/es/config"
)
Expand Down
2 changes: 1 addition & 1 deletion ...al/storage/v1/es/spanstore/reader_test.go → ...v1/elasticsearch/spanstore/reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/pkg/es/config"
"github.com/jaegertracing/jaeger/pkg/es/mocks"
Expand Down
2 changes: 1 addition & 1 deletion ...rage/v1/es/spanstore/service_operation.go → ...sticsearch/spanstore/service_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/olivere/elastic"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cache"
"github.com/jaegertracing/jaeger/pkg/es"
)
Expand Down
2 changes: 1 addition & 1 deletion ...v1/es/spanstore/service_operation_test.go → ...earch/spanstore/service_operation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/pkg/es/mocks"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/storage/v1/es/spanstore/writer.go → ...rage/v1/elasticsearch/spanstore/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore/spanstoremetrics"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cache"
"github.com/jaegertracing/jaeger/pkg/es"
cfg "github.com/jaegertracing/jaeger/pkg/es/config"
Expand Down
2 changes: 1 addition & 1 deletion ...al/storage/v1/es/spanstore/writer_test.go → ...v1/elasticsearch/spanstore/writer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/es/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch/spanstore/internal/dbmodel"
"github.com/jaegertracing/jaeger/pkg/es"
"github.com/jaegertracing/jaeger/pkg/es/config"
"github.com/jaegertracing/jaeger/pkg/es/mocks"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
"github.com/jaegertracing/jaeger/internal/storage/v1/blackhole"
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
"github.com/jaegertracing/jaeger/internal/storage/v1/es"
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/integration/elasticsearch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore"
"github.com/jaegertracing/jaeger/internal/storage/v1/es"
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/testutils"
Expand Down
6 changes: 3 additions & 3 deletions scripts/build/package-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ function stage-tool-platform-files {
local -r TOOLS_PACKAGE_STAGING_DIR=$2
local -r FILE_EXTENSION=${3:-}

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 "./internal/storage/v1/es/esmapping-generator-${PLATFORM}" "${TOOLS_PACKAGE_STAGING_DIR}/jaeger-esmapping-generator${FILE_EXTENSION}"
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 "./cmd/esmapping-generator/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).
Expand Down
Loading