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] Move cassandra implementation to internal package #6639

Merged
merged 7 commits into from
Jan 31, 2025
+28 −28
Merged

[refactor] Move cassandra implementation to internal package #6639

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4832c8
Move Cassandra To Internal Directory
mahadzaryab1 Jan 31, 2025
28f731e
Fix Callsites
mahadzaryab1 Jan 31, 2025
3f2c1ee
Remove v1 Directory
mahadzaryab1 Jan 31, 2025
67890f4
Fix References To Old Directory
mahadzaryab1 Jan 31, 2025
8db58f2
Fix Makefile
mahadzaryab1 Jan 31, 2025
fa2be01
Move To v1 Directory
mahadzaryab1 Jan 31, 2025
84572a9
Add Remainder of Files
mahadzaryab1 Jan 31, 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
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ updates:
- /docker/base
- /docker/debug
- /examples/hotrod
- /plugin/storage/cassandra
- /internal/storage/cassandra
yurishkuro marked this conversation as resolved.
Show resolved Hide resolved
mahadzaryab1 marked this conversation as resolved.
Show resolved Hide resolved
schedule:
interval: daily
- package-ecosystem: docker
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 @@ -12,12 +12,12 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap"

"github.com/jaegertracing/jaeger/internal/storage/cassandra"
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/badger"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
"github.com/jaegertracing/jaeger/plugin/storage/es"
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
"github.com/jaegertracing/jaeger/plugin/storage/memory"
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 @@ -12,11 +12,11 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/extension"

"github.com/jaegertracing/jaeger/internal/storage/cassandra"
"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/badger"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
"github.com/jaegertracing/jaeger/plugin/storage/es"
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
"github.com/jaegertracing/jaeger/plugin/storage/memory"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/jaegerstorage/extension_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/storage/cassandra"
esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
"github.com/jaegertracing/jaeger/pkg/metrics"
promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
"github.com/jaegertracing/jaeger/plugin/storage/badger"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
"github.com/jaegertracing/jaeger/plugin/storage/memory"
"github.com/jaegertracing/jaeger/storage"
Expand Down
0 plugin/storage/cassandra/Dockerfile → internal/storage/cassandra/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...ge/cassandra/dependencystore/bootstrap.go → ...ge/cassandra/dependencystore/bootstrap.go
View file
Open in desktop
File renamed without changes.
0 ...ssandra/dependencystore/bootstrap_test.go → ...ssandra/dependencystore/bootstrap_test.go
View file
Open in desktop
File renamed without changes.
0 ...torage/cassandra/dependencystore/model.go → ...torage/cassandra/dependencystore/model.go
View file
Open in desktop
File renamed without changes.
0 ...e/cassandra/dependencystore/model_test.go → ...e/cassandra/dependencystore/model_test.go
View file
Open in desktop
File renamed without changes.
0 ...cassandra/dependencystore/package_test.go → ...cassandra/dependencystore/package_test.go
View file
Open in desktop
File renamed without changes.
0 ...rage/cassandra/dependencystore/storage.go → ...rage/cassandra/dependencystore/storage.go
View file
Open in desktop
File renamed without changes.
0 ...cassandra/dependencystore/storage_test.go → ...cassandra/dependencystore/storage_test.go
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions plugin/storage/cassandra/factory.go → internal/storage/cassandra/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ import (
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"

cDepStore "github.com/jaegertracing/jaeger/internal/storage/cassandra/dependencystore"
cSamplingStore "github.com/jaegertracing/jaeger/internal/storage/cassandra/samplingstore"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/schema"
cSpanStore "github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cassandra"
"github.com/jaegertracing/jaeger/pkg/cassandra/config"
gocqlw "github.com/jaegertracing/jaeger/pkg/cassandra/gocql"
Expand All @@ -23,11 +28,6 @@ import (
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin"
cLock "github.com/jaegertracing/jaeger/plugin/pkg/distributedlock/cassandra"
cDepStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/dependencystore"
cSamplingStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/samplingstore"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/schema"
cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/storage"
"github.com/jaegertracing/jaeger/storage/dependencystore"
"github.com/jaegertracing/jaeger/storage/samplingstore"
Expand Down
0 plugin/storage/cassandra/factory_test.go → internal/storage/cassandra/factory_test.go
View file
Open in desktop
File renamed without changes.
0 plugin/storage/cassandra/options.go → internal/storage/cassandra/options.go
View file
Open in desktop
File renamed without changes.
0 plugin/storage/cassandra/options_test.go → internal/storage/cassandra/options_test.go
View file
Open in desktop
File renamed without changes.
0 plugin/storage/cassandra/package_test.go → internal/storage/cassandra/package_test.go
View file
Open in desktop
File renamed without changes.
0 ...torage/cassandra/samplingstore/storage.go → ...torage/cassandra/samplingstore/storage.go
View file
Open in desktop
File renamed without changes.
0 ...e/cassandra/samplingstore/storage_test.go → ...e/cassandra/samplingstore/storage_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...n/storage/cassandra/savetracetest/main.go → ...l/storage/cassandra/savetracetest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/cassandra"
cSpanStore "github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore"
cascfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
"github.com/jaegertracing/jaeger/pkg/jtracer"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
cSpanStore "github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
0 plugin/storage/cassandra/schema/README.md → internal/storage/cassandra/schema/README.md
View file
Open in desktop
File renamed without changes.
0 plugin/storage/cassandra/schema/create.sh → internal/storage/cassandra/schema/create.sh
View file
Open in desktop
File renamed without changes.
0 ...n/storage/cassandra/schema/create.test.sh → ...l/storage/cassandra/schema/create.test.sh
View file
Open in desktop
File renamed without changes.
0 plugin/storage/cassandra/schema/docker.sh → internal/storage/cassandra/schema/docker.sh
View file
Open in desktop
File renamed without changes.
0 .../cassandra/schema/migration/V002toV003.sh → .../cassandra/schema/migration/V002toV003.sh
View file
Open in desktop
File renamed without changes.
0 ...andra/schema/migration/v001tov002part1.sh → ...andra/schema/migration/v001tov002part1.sh
View file
Open in desktop
File renamed without changes.
0 ...andra/schema/migration/v001tov002part2.sh → ...andra/schema/migration/v001tov002part2.sh
View file
Open in desktop
File renamed without changes.
0 .../storage/cassandra/schema/package_test.go → .../storage/cassandra/schema/package_test.go
View file
Open in desktop
File renamed without changes.
0 plugin/storage/cassandra/schema/schema.go → internal/storage/cassandra/schema/schema.go
View file
Open in desktop
File renamed without changes.
0 ...n/storage/cassandra/schema/schema_test.go → ...l/storage/cassandra/schema/schema_test.go
View file
Open in desktop
File renamed without changes.
0 ...in/storage/cassandra/schema/v001.cql.tmpl → ...al/storage/cassandra/schema/v001.cql.tmpl
View file
Open in desktop
File renamed without changes.
0 ...in/storage/cassandra/schema/v002.cql.tmpl → ...al/storage/cassandra/schema/v002.cql.tmpl
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...in/storage/cassandra/schema/v003.cql.tmpl → ...al/storage/cassandra/schema/v003.cql.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ CREATE TABLE IF NOT EXISTS ${keyspace}.dependencies_v2 (
AND default_time_to_live = ${dependencies_ttl};

-- adaptive sampling tables
-- ./plugin/storage/cassandra/samplingstore/storage.go
-- ./internal/storage/cassandra/samplingstore/storage.go
CREATE TABLE IF NOT EXISTS ${keyspace}.operation_throughput (
bucket int,
ts timeuuid,
Expand Down
2 changes: 1 addition & 1 deletion ...ge/cassandra/schema/v004-go-tmpl.cql.tmpl → ...ge/cassandra/schema/v004-go-tmpl.cql.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ CREATE TABLE IF NOT EXISTS {{.Keyspace}}.dependencies_v2 (
AND default_time_to_live = {{.DependenciesTTLInSeconds}};

-- adaptive sampling tables
-- ./plugin/storage/cassandra/samplingstore/storage.go
-- ./internal/storage/cassandra/samplingstore/storage.go
CREATE TABLE IF NOT EXISTS {{.Keyspace}}.operation_throughput (
bucket int,
ts timeuuid,
Expand Down
2 changes: 1 addition & 1 deletion ...in/storage/cassandra/schema/v004.cql.tmpl → ...al/storage/cassandra/schema/v004.cql.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ CREATE TABLE IF NOT EXISTS ${keyspace}.dependencies_v2 (
AND default_time_to_live = ${dependencies_ttl};

-- adaptive sampling tables
-- ./plugin/storage/cassandra/samplingstore/storage.go
-- ./internal/storage/cassandra/samplingstore/storage.go
CREATE TABLE IF NOT EXISTS ${keyspace}.operation_throughput (
bucket int,
ts timeuuid,
Expand Down
0 .../cassandra/spanstore/dbmodel/converter.go → .../cassandra/spanstore/dbmodel/converter.go
View file
Open in desktop
File renamed without changes.
0 ...andra/spanstore/dbmodel/converter_test.go → ...andra/spanstore/dbmodel/converter_test.go
View file
Open in desktop
File renamed without changes.
0 ...ge/cassandra/spanstore/dbmodel/cql_udt.go → ...ge/cassandra/spanstore/dbmodel/cql_udt.go
View file
Open in desktop
File renamed without changes.
0 ...ssandra/spanstore/dbmodel/cql_udt_test.go → ...ssandra/spanstore/dbmodel/cql_udt_test.go
View file
Open in desktop
File renamed without changes.
0 ...ssandra/spanstore/dbmodel/index_filter.go → ...ssandra/spanstore/dbmodel/index_filter.go
View file
Open in desktop
File renamed without changes.
0 ...ra/spanstore/dbmodel/index_filter_test.go → ...ra/spanstore/dbmodel/index_filter_test.go
View file
Open in desktop
File renamed without changes.
0 ...rage/cassandra/spanstore/dbmodel/model.go → ...rage/cassandra/spanstore/dbmodel/model.go
View file
Open in desktop
File renamed without changes.
0 ...cassandra/spanstore/dbmodel/model_test.go → ...cassandra/spanstore/dbmodel/model_test.go
View file
Open in desktop
File renamed without changes.
0 .../cassandra/spanstore/dbmodel/operation.go → .../cassandra/spanstore/dbmodel/operation.go
View file
Open in desktop
File renamed without changes.
0 ...ssandra/spanstore/dbmodel/package_test.go → ...ssandra/spanstore/dbmodel/package_test.go
View file
Open in desktop
File renamed without changes.
0 ...cassandra/spanstore/dbmodel/tag_filter.go → ...cassandra/spanstore/dbmodel/tag_filter.go
View file
Open in desktop
File renamed without changes.
0 .../spanstore/dbmodel/tag_filter_drop_all.go → .../spanstore/dbmodel/tag_filter_drop_all.go
View file
Open in desktop
File renamed without changes.
0 ...store/dbmodel/tag_filter_drop_all_test.go → ...store/dbmodel/tag_filter_drop_all_test.go
View file
Open in desktop
File renamed without changes.
0 ...anstore/dbmodel/tag_filter_exact_match.go → ...anstore/dbmodel/tag_filter_exact_match.go
View file
Open in desktop
File renamed without changes.
0 ...re/dbmodel/tag_filter_exact_match_test.go → ...re/dbmodel/tag_filter_exact_match_test.go
View file
Open in desktop
File renamed without changes.
0 ...ndra/spanstore/dbmodel/tag_filter_test.go → ...ndra/spanstore/dbmodel/tag_filter_test.go
View file
Open in desktop
File renamed without changes.
0 ...cassandra/spanstore/dbmodel/unique_ids.go → ...cassandra/spanstore/dbmodel/unique_ids.go
View file
Open in desktop
File renamed without changes.
0 ...ndra/spanstore/dbmodel/unique_ids_test.go → ...ndra/spanstore/dbmodel/unique_ids_test.go
View file
Open in desktop
File renamed without changes.
0 ...assandra/spanstore/dbmodel/unique_tags.go → ...assandra/spanstore/dbmodel/unique_tags.go
View file
Open in desktop
File renamed without changes.
0 ...dra/spanstore/dbmodel/unique_tags_test.go → ...dra/spanstore/dbmodel/unique_tags_test.go
View file
Open in desktop
File renamed without changes.
0 ...rage/cassandra/spanstore/matchers_test.go → ...rage/cassandra/spanstore/matchers_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ge/cassandra/spanstore/operation_names.go → ...ge/cassandra/spanstore/operation_names.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (

"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cache"
"github.com/jaegertracing/jaeger/pkg/cassandra"
casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
2 changes: 1 addition & 1 deletion ...ssandra/spanstore/operation_names_test.go → ...ssandra/spanstore/operation_names_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
0 ...orage/cassandra/spanstore/package_test.go → ...orage/cassandra/spanstore/package_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion plugin/storage/cassandra/spanstore/reader.go → ...nal/storage/cassandra/spanstore/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cassandra"
casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/otelsemconv"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
2 changes: 1 addition & 1 deletion ...torage/cassandra/spanstore/reader_test.go → ...torage/cassandra/spanstore/reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cassandra"
"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
0 ...rage/cassandra/spanstore/service_names.go → ...rage/cassandra/spanstore/service_names.go
View file
Open in desktop
File renamed without changes.
0 ...cassandra/spanstore/service_names_test.go → ...cassandra/spanstore/service_names_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion plugin/storage/cassandra/spanstore/writer.go → ...nal/storage/cassandra/spanstore/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cassandra"
casMetrics "github.com/jaegertracing/jaeger/pkg/cassandra/metrics"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...age/cassandra/spanstore/writer_options.go → ...age/cassandra/spanstore/writer_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package spanstore

import (
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
)

// Option is a function that sets some option on the writer.
Expand Down
2 changes: 1 addition & 1 deletion ...assandra/spanstore/writer_options_test.go → ...assandra/spanstore/writer_options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
)

func TestWriterOptions(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion ...torage/cassandra/spanstore/writer_test.go → ...torage/cassandra/spanstore/writer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/internal/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/pkg/cassandra/mocks"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra/spanstore/dbmodel"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

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 @@ -14,11 +14,11 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/safeexpvar"
"github.com/jaegertracing/jaeger/internal/storage/cassandra"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin"
"github.com/jaegertracing/jaeger/plugin/storage/badger"
"github.com/jaegertracing/jaeger/plugin/storage/blackhole"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
"github.com/jaegertracing/jaeger/plugin/storage/es"
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/integration/cassandra_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zaptest"

"github.com/jaegertracing/jaeger/internal/storage/cassandra"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
"github.com/jaegertracing/jaeger/storage/dependencystore"
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
)
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/build-upload-docker-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ done

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
bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -b -c jaeger-es-rollover -d cmd/es-rollover -p "${platforms}" -t release
bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -c jaeger-cassandra-schema -d plugin/storage/cassandra/ -p "${platforms}"
bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -c jaeger-cassandra-schema -d internal/storage/cassandra/ -p "${platforms}"

# build/upload images for jaeger-tracegen and jaeger-anonymizer
for component in tracegen anonymizer
Expand Down
2 changes: 1 addition & 1 deletion scripts/e2e/cassandra.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ teardown_cassandra() {

apply_schema() {
local image=cassandra-schema
local schema_dir=plugin/storage/cassandra/
local schema_dir=internal/storage/cassandra/
local schema_version=$1
local keyspace=$2
local params=(
Expand Down
2 changes: 1 addition & 1 deletion scripts/utils/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ REPO_ROOT="$UTILS_DIR/../.."
# Define list of test files explicitly here , to be dynamic to the location of the test file
TEST_FILES=(
"$UTILS_DIR/compute-tags.test.sh"
"$REPO_ROOT/plugin/storage/cassandra/schema/create.test.sh"
"$REPO_ROOT/internal/storage/cassandra/schema/create.test.sh"
)

run_test_file() {
Expand Down
Loading