Skip to content

chore: Rename strategyProvider field to provider #7983

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

Open
kyyril wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: Rename strategyProvider field to provider #7983

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
7289523
chore: Rename strategyProvider field to provider
kyyril Feb 5, 2026
e6b600a
Merge branch 'main' into chore/rename-strategy-provider
kyyril Feb 5, 2026
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
14 changes: 7 additions & 7 deletions cmd/jaeger/internal/extension/remotesampling/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ type rsExtension struct {
telemetry component.TelemetrySettings
httpServer *http.Server
grpcServer *grpc.Server
strategyProvider samplingstrategy.Provider // TODO we should rename this to Provider, not "store"
provider samplingstrategy.Provider
adaptiveStore samplingstore.Store
distLock *leaderelection.DistributedElectionParticipant
shutdownWG sync.WaitGroup
Expand Down Expand Up @@ -153,8 +153,8 @@ func (ext *rsExtension) Shutdown(ctx context.Context) error {
errs = append(errs, ext.distLock.Close())
}

if ext.strategyProvider != nil {
errs = append(errs, ext.strategyProvider.Close())
if ext.provider != nil {
errs = append(errs, ext.provider.Close())
}
return errors.Join(errs...)
}
Expand All @@ -173,7 +173,7 @@ func (ext *rsExtension) startFileBasedStrategyProvider(_ context.Context) error
return fmt.Errorf("failed to create the local file strategy store: %w", err)
}

ext.strategyProvider = provider
ext.provider = provider
return nil
}

Expand Down Expand Up @@ -214,7 +214,7 @@ func (ext *rsExtension) startAdaptiveStrategyProvider(host component.Host) error
if err := provider.Start(); err != nil {
return fmt.Errorf("failed to start the adaptive strategy store: %w", err)
}
ext.strategyProvider = provider
ext.provider = provider
return nil
}

Expand All @@ -223,7 +223,7 @@ func (ext *rsExtension) startHTTPServer(ctx context.Context, host component.Host
mf = mf.Namespace(metrics.NSOptions{Name: "jaeger_remote_sampling"})
handler := samplinghttp.NewHandler(samplinghttp.HandlerParams{
ConfigManager: &samplinghttp.ConfigManager{
SamplingProvider: ext.strategyProvider,
SamplingProvider: ext.provider,
},
MetricsFactory: mf,

Expand Down Expand Up @@ -270,7 +270,7 @@ func (ext *rsExtension) startGRPCServer(ctx context.Context, host component.Host
return err
}

api_v2.RegisterSamplingManagerServer(ext.grpcServer, samplinggrpc.NewHandler(ext.strategyProvider))
api_v2.RegisterSamplingManagerServer(ext.grpcServer, samplinggrpc.NewHandler(ext.provider))

healthServer := health.NewServer() // support health checks on the gRPC server
healthServer.SetServingStatus("jaeger.api_v2.SamplingManager", grpc_health_v1.HealthCheckResponse_SERVING)
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/remotesampling/extension_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ func TestShutdownWithProviderError(t *testing.T) {
telemetry: componenttest.NewNopTelemetrySettings(),
}

ext.strategyProvider = &mockFailingProvider{}
ext.provider = &mockFailingProvider{}

err := ext.Shutdown(context.Background())
require.Error(t, err)
Expand Down