From 6c6ab8b6ee444ba7eea0ee88f15f8cd0030ba830 Mon Sep 17 00:00:00 2001 From: sAchin-680 Date: Sat, 22 Mar 2025 08:41:55 +0000 Subject: [PATCH 1/2] Move fswatcher to internal/ Signed-off-by: sAchin-680 --- cmd/query/app/static_handler.go | 2 +- cmd/query/app/static_handler_test.go | 2 +- {pkg => internal}/fswatcher/fswatcher.go | 0 {pkg => internal}/fswatcher/fswatcher_test.go | 0 internal/storage/v1/elasticsearch/factory.go | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename {pkg => internal}/fswatcher/fswatcher.go (100%) rename {pkg => internal}/fswatcher/fswatcher_test.go (100%) diff --git a/cmd/query/app/static_handler.go b/cmd/query/app/static_handler.go index 2fde0eebe3f..52ad48dd2b1 100644 --- a/cmd/query/app/static_handler.go +++ b/cmd/query/app/static_handler.go @@ -21,7 +21,7 @@ import ( "github.com/jaegertracing/jaeger/cmd/query/app/querysvc" "github.com/jaegertracing/jaeger/cmd/query/app/ui" - "github.com/jaegertracing/jaeger/pkg/fswatcher" + "github.com/jaegertracing/jaeger/internal/fswatcher" "github.com/jaegertracing/jaeger/pkg/version" ) diff --git a/cmd/query/app/static_handler_test.go b/cmd/query/app/static_handler_test.go index 3a5ef930c62..e67c642865c 100644 --- a/cmd/query/app/static_handler_test.go +++ b/cmd/query/app/static_handler_test.go @@ -27,7 +27,7 @@ import ( "github.com/jaegertracing/jaeger/internal/testutils" ) -//go:generate mockery -all -dir ../../../pkg/fswatcher +//go:generate mockery -all -dir ../../../internal/fswatcher func TestNotExistingUiConfig(t *testing.T) { handler, err := NewStaticAssetsHandler("/foo/bar", StaticAssetsHandlerOptions{ diff --git a/pkg/fswatcher/fswatcher.go b/internal/fswatcher/fswatcher.go similarity index 100% rename from pkg/fswatcher/fswatcher.go rename to internal/fswatcher/fswatcher.go diff --git a/pkg/fswatcher/fswatcher_test.go b/internal/fswatcher/fswatcher_test.go similarity index 100% rename from pkg/fswatcher/fswatcher_test.go rename to internal/fswatcher/fswatcher_test.go diff --git a/internal/storage/v1/elasticsearch/factory.go b/internal/storage/v1/elasticsearch/factory.go index 615424255cc..94db3201a66 100644 --- a/internal/storage/v1/elasticsearch/factory.go +++ b/internal/storage/v1/elasticsearch/factory.go @@ -31,7 +31,7 @@ import ( 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" + "github.com/jaegertracing/jaeger/internal/fswatcher" "github.com/jaegertracing/jaeger/pkg/metrics" ) From 19d0e0d5e8caf7cd99534e394a066f4357463af4 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sat, 22 Mar 2025 13:21:41 -0400 Subject: [PATCH 2/2] make fmt Signed-off-by: Yuri Shkuro --- internal/storage/v1/elasticsearch/factory.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/storage/v1/elasticsearch/factory.go b/internal/storage/v1/elasticsearch/factory.go index 94db3201a66..b70988ff17e 100644 --- a/internal/storage/v1/elasticsearch/factory.go +++ b/internal/storage/v1/elasticsearch/factory.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" + "github.com/jaegertracing/jaeger/internal/fswatcher" "github.com/jaegertracing/jaeger/internal/storage/v1" "github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore" "github.com/jaegertracing/jaeger/internal/storage/v1/api/samplingstore" @@ -31,7 +32,6 @@ import ( 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/internal/fswatcher" "github.com/jaegertracing/jaeger/pkg/metrics" )