Skip to content

Commit 4938d5e

Browse files
mahadzaryab1mahadzaryab1
authored
Merge branch 'main' into fix-archive-logs
2 parents 54cfbf4 + 619a9f7 commit 4938d5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+28
-28
lines changed

‎.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ updates:
4242
- /docker/base
4343
- /docker/debug
4444
- /examples/hotrod
45-
- /plugin/storage/cassandra
45+
- /internal/storage/v1/cassandra
4646
schedule:
4747
interval: daily
4848
- package-ecosystem: docker

‎Makefile.Docker.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ docker-images-anonymizer:
6060

6161
.PHONY: docker-images-cassandra
6262
docker-images-cassandra:
63-
docker build -t $(DOCKER_NAMESPACE)/jaeger-cassandra-schema:${DOCKER_TAG} plugin/storage/cassandra/
63+
docker build -t $(DOCKER_NAMESPACE)/jaeger-cassandra-schema:${DOCKER_TAG} internal/storage/v1/cassandra/
6464
@echo "Finished building jaeger-cassandra-schema =============="
6565

6666
.PHONY: docker-images-elastic

‎cmd/jaeger/internal/extension/jaegerstorage/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
"go.opentelemetry.io/collector/component"
1313
"go.opentelemetry.io/collector/confmap"
1414

15+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
1516
casCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
1617
esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
1718
promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
1819
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
1920
"github.com/jaegertracing/jaeger/plugin/storage/badger"
20-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
2121
"github.com/jaegertracing/jaeger/plugin/storage/es"
2222
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
2323
"github.com/jaegertracing/jaeger/plugin/storage/memory"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"go.opentelemetry.io/collector/component"
1313
"go.opentelemetry.io/collector/extension"
1414

15+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
1516
"github.com/jaegertracing/jaeger/pkg/metrics"
1617
"github.com/jaegertracing/jaeger/pkg/telemetry"
1718
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
1819
"github.com/jaegertracing/jaeger/plugin/storage/badger"
19-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
2020
"github.com/jaegertracing/jaeger/plugin/storage/es"
2121
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
2222
"github.com/jaegertracing/jaeger/plugin/storage/memory"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
nooptrace "go.opentelemetry.io/otel/trace/noop"
2222
"go.uber.org/zap"
2323

24+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
2425
esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
2526
"github.com/jaegertracing/jaeger/pkg/metrics"
2627
promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
2728
"github.com/jaegertracing/jaeger/plugin/storage/badger"
28-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
2929
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
3030
"github.com/jaegertracing/jaeger/plugin/storage/memory"
3131
"github.com/jaegertracing/jaeger/storage"

‎plugin/storage/cassandra/Dockerfile ‎internal/storage/v1/cassandra/Dockerfile

File renamed without changes.

‎plugin/storage/cassandra/dependencystore/bootstrap.go ‎internal/storage/v1/cassandra/dependencystore/bootstrap.go

File renamed without changes.

‎plugin/storage/cassandra/dependencystore/bootstrap_test.go ‎internal/storage/v1/cassandra/dependencystore/bootstrap_test.go

File renamed without changes.

‎plugin/storage/cassandra/dependencystore/model.go ‎internal/storage/v1/cassandra/dependencystore/model.go

File renamed without changes.

‎plugin/storage/cassandra/dependencystore/model_test.go ‎internal/storage/v1/cassandra/dependencystore/model_test.go

File renamed without changes.

‎plugin/storage/cassandra/dependencystore/package_test.go ‎internal/storage/v1/cassandra/dependencystore/package_test.go

File renamed without changes.

‎plugin/storage/cassandra/dependencystore/storage.go ‎internal/storage/v1/cassandra/dependencystore/storage.go

File renamed without changes.

‎plugin/storage/cassandra/dependencystore/storage_test.go ‎internal/storage/v1/cassandra/dependencystore/storage_test.go

File renamed without changes.

‎plugin/storage/cassandra/factory.go ‎internal/storage/v1/cassandra/factory.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ import (
1515
"go.opentelemetry.io/otel/trace"
1616
"go.uber.org/zap"
1717

18+
cDepStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/dependencystore"
19+
cSamplingStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/samplingstore"
20+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/schema"
21+
cSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore"
22+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
1823
"github.com/jaegertracing/jaeger/pkg/cassandra"
1924
"github.com/jaegertracing/jaeger/pkg/cassandra/config"
2025
gocqlw "github.com/jaegertracing/jaeger/pkg/cassandra/gocql"
@@ -23,11 +28,6 @@ import (
2328
"github.com/jaegertracing/jaeger/pkg/metrics"
2429
"github.com/jaegertracing/jaeger/plugin"
2530
cLock "github.com/jaegertracing/jaeger/plugin/pkg/distributedlock/cassandra"
26-
cDepStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/dependencystore"
27-
cSamplingStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/samplingstore"
28-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/schema"
29-
cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
30-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
3131
"github.com/jaegertracing/jaeger/storage"
3232
"github.com/jaegertracing/jaeger/storage/dependencystore"
3333
"github.com/jaegertracing/jaeger/storage/samplingstore"

‎plugin/storage/cassandra/factory_test.go ‎internal/storage/v1/cassandra/factory_test.go

File renamed without changes.

‎plugin/storage/cassandra/options.go ‎internal/storage/v1/cassandra/options.go

File renamed without changes.

‎plugin/storage/cassandra/options_test.go ‎internal/storage/v1/cassandra/options_test.go

File renamed without changes.

‎plugin/storage/cassandra/package_test.go ‎internal/storage/v1/cassandra/package_test.go

File renamed without changes.

‎plugin/storage/cassandra/samplingstore/storage.go ‎internal/storage/v1/cassandra/samplingstore/storage.go

File renamed without changes.

‎plugin/storage/cassandra/samplingstore/storage_test.go ‎internal/storage/v1/cassandra/samplingstore/storage_test.go

File renamed without changes.

‎plugin/storage/cassandra/savetracetest/main.go ‎internal/storage/v1/cassandra/savetracetest/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"go.uber.org/zap"
1212

1313
"github.com/jaegertracing/jaeger-idl/model/v1"
14+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
15+
cSpanStore "github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore"
1416
cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
1517
"github.com/jaegertracing/jaeger/pkg/jtracer"
1618
"github.com/jaegertracing/jaeger/pkg/metrics"
17-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
18-
cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
1919
"github.com/jaegertracing/jaeger/storage/spanstore"
2020
)
2121

‎plugin/storage/cassandra/schema/README.md ‎internal/storage/v1/cassandra/schema/README.md

‎plugin/storage/cassandra/schema/create.sh ‎internal/storage/v1/cassandra/schema/create.sh

File renamed without changes.

‎plugin/storage/cassandra/schema/create.test.sh ‎internal/storage/v1/cassandra/schema/create.test.sh

File renamed without changes.

‎plugin/storage/cassandra/schema/docker.sh ‎internal/storage/v1/cassandra/schema/docker.sh

File renamed without changes.

‎plugin/storage/cassandra/schema/migration/V002toV003.sh ‎internal/storage/v1/cassandra/schema/migration/V002toV003.sh

File renamed without changes.

‎plugin/storage/cassandra/schema/migration/v001tov002part1.sh ‎internal/storage/v1/cassandra/schema/migration/v001tov002part1.sh

File renamed without changes.

‎plugin/storage/cassandra/schema/migration/v001tov002part2.sh ‎internal/storage/v1/cassandra/schema/migration/v001tov002part2.sh

File renamed without changes.

‎plugin/storage/cassandra/schema/package_test.go ‎internal/storage/v1/cassandra/schema/package_test.go

File renamed without changes.

‎plugin/storage/cassandra/schema/schema.go ‎internal/storage/v1/cassandra/schema/schema.go

File renamed without changes.

‎plugin/storage/cassandra/schema/schema_test.go ‎internal/storage/v1/cassandra/schema/schema_test.go

File renamed without changes.

‎plugin/storage/cassandra/schema/v001.cql.tmpl ‎internal/storage/v1/cassandra/schema/v001.cql.tmpl

File renamed without changes.

‎plugin/storage/cassandra/schema/v002.cql.tmpl ‎internal/storage/v1/cassandra/schema/v002.cql.tmpl

File renamed without changes.

‎plugin/storage/cassandra/schema/v003.cql.tmpl ‎internal/storage/v1/cassandra/schema/v003.cql.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ CREATE TABLE IF NOT EXISTS ${keyspace}.dependencies_v2 (
204204
AND default_time_to_live = ${dependencies_ttl};
205205

206206
-- adaptive sampling tables
207-
-- ./plugin/storage/cassandra/samplingstore/storage.go
207+
-- ./internal/storage/v1/cassandra/samplingstore/storage.go
208208
CREATE TABLE IF NOT EXISTS ${keyspace}.operation_throughput (
209209
bucket int,
210210
ts timeuuid,

‎plugin/storage/cassandra/schema/v004-go-tmpl.cql.tmpl ‎internal/storage/v1/cassandra/schema/v004-go-tmpl.cql.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ CREATE TABLE IF NOT EXISTS {{.Keyspace}}.dependencies_v2 (
175175
AND default_time_to_live = {{.DependenciesTTLInSeconds}};
176176

177177
-- adaptive sampling tables
178-
-- ./plugin/storage/cassandra/samplingstore/storage.go
178+
-- ./internal/storage/v1/cassandra/samplingstore/storage.go
179179
CREATE TABLE IF NOT EXISTS {{.Keyspace}}.operation_throughput (
180180
bucket int,
181181
ts timeuuid,

‎plugin/storage/cassandra/schema/v004.cql.tmpl ‎internal/storage/v1/cassandra/schema/v004.cql.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ CREATE TABLE IF NOT EXISTS ${keyspace}.dependencies_v2 (
197197
AND default_time_to_live = ${dependencies_ttl};
198198

199199
-- adaptive sampling tables
200-
-- ./plugin/storage/cassandra/samplingstore/storage.go
200+
-- ./internal/storage/v1/cassandra/samplingstore/storage.go
201201
CREATE TABLE IF NOT EXISTS ${keyspace}.operation_throughput (
202202
bucket int,
203203
ts timeuuid,

‎plugin/storage/cassandra/spanstore/dbmodel/converter.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/converter.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/converter_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/converter_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/cql_udt.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/cql_udt.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/cql_udt_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/cql_udt_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/index_filter.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/index_filter.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/index_filter_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/index_filter_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/model.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/model.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/model_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/model_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/operation.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/operation.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/package_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/package_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/tag_filter.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/tag_filter_drop_all.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_drop_all.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/tag_filter_drop_all_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_drop_all_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/tag_filter_exact_match.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_exact_match.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/tag_filter_exact_match_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_exact_match_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/tag_filter_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/tag_filter_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/unique_ids.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/unique_ids.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/unique_ids_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/unique_ids_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/unique_tags.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/unique_tags.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/dbmodel/unique_tags_test.go ‎internal/storage/v1/cassandra/spanstore/dbmodel/unique_tags_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/matchers_test.go ‎internal/storage/v1/cassandra/spanstore/matchers_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/operation_names.go ‎internal/storage/v1/cassandra/spanstore/operation_names.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010

1111
"go.uber.org/zap"
1212

13+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
1314
"github.com/jaegertracing/jaeger/pkg/cache"
1415
"github.com/jaegertracing/jaeger/pkg/cassandra"
1516
casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
1617
"github.com/jaegertracing/jaeger/pkg/metrics"
17-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
1818
"github.com/jaegertracing/jaeger/storage/spanstore"
1919
)
2020

‎plugin/storage/cassandra/spanstore/operation_names_test.go ‎internal/storage/v1/cassandra/spanstore/operation_names_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"go.uber.org/zap"
1717

1818
"github.com/jaegertracing/jaeger/internal/metricstest"
19+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
1920
"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
2021
"github.com/jaegertracing/jaeger/pkg/testutils"
21-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
2222
"github.com/jaegertracing/jaeger/storage/spanstore"
2323
)
2424

‎plugin/storage/cassandra/spanstore/package_test.go ‎internal/storage/v1/cassandra/spanstore/package_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/reader.go ‎internal/storage/v1/cassandra/spanstore/reader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"go.uber.org/zap"
1717

1818
"github.com/jaegertracing/jaeger-idl/model/v1"
19+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
1920
"github.com/jaegertracing/jaeger/pkg/cassandra"
2021
casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
2122
"github.com/jaegertracing/jaeger/pkg/metrics"
2223
"github.com/jaegertracing/jaeger/pkg/otelsemconv"
23-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
2424
"github.com/jaegertracing/jaeger/storage/spanstore"
2525
)
2626

‎plugin/storage/cassandra/spanstore/reader_test.go ‎internal/storage/v1/cassandra/spanstore/reader_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121

2222
"github.com/jaegertracing/jaeger-idl/model/v1"
2323
"github.com/jaegertracing/jaeger/internal/metricstest"
24+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
2425
"github.com/jaegertracing/jaeger/pkg/cassandra"
2526
"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
2627
"github.com/jaegertracing/jaeger/pkg/testutils"
27-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
2828
"github.com/jaegertracing/jaeger/storage/spanstore"
2929
)
3030

‎plugin/storage/cassandra/spanstore/service_names.go ‎internal/storage/v1/cassandra/spanstore/service_names.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/service_names_test.go ‎internal/storage/v1/cassandra/spanstore/service_names_test.go

File renamed without changes.

‎plugin/storage/cassandra/spanstore/writer.go ‎internal/storage/v1/cassandra/spanstore/writer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"go.uber.org/zap"
1616

1717
"github.com/jaegertracing/jaeger-idl/model/v1"
18+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
1819
"github.com/jaegertracing/jaeger/pkg/cassandra"
1920
casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
2021
"github.com/jaegertracing/jaeger/pkg/metrics"
21-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
2222
)
2323

2424
const (

‎plugin/storage/cassandra/spanstore/writer_options.go ‎internal/storage/v1/cassandra/spanstore/writer_options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package spanstore
66

77
import (
8-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
8+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
99
)
1010

1111
// Option is a function that sets some option on the writer.

‎plugin/storage/cassandra/spanstore/writer_options_test.go ‎internal/storage/v1/cassandra/spanstore/writer_options_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/stretchr/testify/assert"
1111

12-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
12+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
1313
)
1414

1515
func TestWriterOptions(t *testing.T) {

‎plugin/storage/cassandra/spanstore/writer_test.go ‎internal/storage/v1/cassandra/spanstore/writer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020

2121
"github.com/jaegertracing/jaeger-idl/model/v1"
2222
"github.com/jaegertracing/jaeger/internal/metricstest"
23+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra/spanstore/dbmodel"
2324
"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
2425
"github.com/jaegertracing/jaeger/pkg/testutils"
25-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
2626
"github.com/jaegertracing/jaeger/storage/spanstore"
2727
)
2828

‎plugin/storage/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
"go.uber.org/zap"
1515

1616
"github.com/jaegertracing/jaeger/internal/safeexpvar"
17+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
1718
"github.com/jaegertracing/jaeger/pkg/metrics"
1819
"github.com/jaegertracing/jaeger/plugin"
1920
"github.com/jaegertracing/jaeger/plugin/storage/badger"
2021
"github.com/jaegertracing/jaeger/plugin/storage/blackhole"
21-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
2222
"github.com/jaegertracing/jaeger/plugin/storage/es"
2323
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
2424
"github.com/jaegertracing/jaeger/plugin/storage/kafka"

‎plugin/storage/integration/cassandra_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"go.uber.org/zap"
1515
"go.uber.org/zap/zaptest"
1616

17+
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
1718
"github.com/jaegertracing/jaeger/pkg/config"
1819
"github.com/jaegertracing/jaeger/pkg/metrics"
1920
"github.com/jaegertracing/jaeger/pkg/testutils"
20-
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
2121
"github.com/jaegertracing/jaeger/storage/dependencystore"
2222
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
2323
)

‎scripts/build/build-upload-docker-images.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ done
7474

7575
bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -b -c jaeger-es-index-cleaner -d cmd/es-index-cleaner -p "${platforms}" -t release
7676
bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -b -c jaeger-es-rollover -d cmd/es-rollover -p "${platforms}" -t release
77-
bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -c jaeger-cassandra-schema -d plugin/storage/cassandra/ -p "${platforms}"
77+
bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -c jaeger-cassandra-schema -d internal/storage/v1/cassandra/ -p "${platforms}"
7878

7979
# build/upload images for jaeger-tracegen and jaeger-anonymizer
8080
for component in tracegen anonymizer

‎scripts/e2e/cassandra.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ teardown_cassandra() {
6868

6969
apply_schema() {
7070
local image=cassandra-schema
71-
local schema_dir=plugin/storage/cassandra/
71+
local schema_dir=internal/storage/v1/cassandra/
7272
local schema_version=$1
7373
local keyspace=$2
7474
local params=(

‎scripts/utils/run-tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ REPO_ROOT="$UTILS_DIR/../.."
1010
# Define list of test files explicitly here , to be dynamic to the location of the test file
1111
TEST_FILES=(
1212
"$UTILS_DIR/compute-tags.test.sh"
13-
"$REPO_ROOT/plugin/storage/cassandra/schema/create.test.sh"
13+
"$REPO_ROOT/internal/storage/v1/cassandra/schema/create.test.sh"
1414
)
1515

1616
run_test_file() {

0 commit comments

Comments
 (0)