Skip to content

Move pkg/fswatcher to internal/fswatcher #6895

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

Merged
merged 3 commits into from
Mar 22, 2025
+3 −3
Merged

Move pkg/fswatcher to internal/fswatcher #6895

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c6ab8b
Move fswatcher to internal/
sAchin-680 Mar 22, 2025
19d0e0d
make fmt
yurishkuro Mar 22, 2025
3843d16
Merge branch 'main' into move-fswatcher-to-internal
yurishkuro Mar 22, 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 cmd/query/app/static_handler.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/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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/static_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
0 pkg/fswatcher/fswatcher.go → internal/fswatcher/fswatcher.go
View file
Open in desktop
File renamed without changes.
0 pkg/fswatcher/fswatcher_test.go → internal/fswatcher/fswatcher_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/storage/v1/elasticsearch/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"

Check failure on line 22 in internal/storage/v1/elasticsearch/factory.go

View workflow job for this annotation

GitHub Actions / lint 

File is not properly formatted (gofmt)
"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"
Expand All @@ -31,7 +31,7 @@
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"
)

Expand Down
Loading