[refactor] Move sampling strategy providers to internal/sampling/samp…

…lingstrategy (#6561) ## Which problem is this PR solving? - Resolves #6411 ## Description of the changes - Move sampling strategy providers from plugin/sampling/strategyprovider to internal/sampling/samplingstrategy ## How was this change tested? - Covered by existing ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` Signed-off-by: Aryan Goyal <[email protected]>
jaegertracing · Jan 17, 2025 · 74db9ce · 74db9ce
1 parent 7f16f49
commit 74db9ce
Show file tree

Hide file tree

Showing 56 changed files with 56 additions and 47 deletions.
diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
@@ -29,14 +29,14 @@ import (
 	queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
+	ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/version"
 	"github.com/jaegertracing/jaeger/plugin/metricstore"
-	ss "github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/storage_v2/depstore"

diff --git a/cmd/collector/main.go b/cmd/collector/main.go
@@ -22,12 +22,12 @@ import (
 	cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
 	"github.com/jaegertracing/jaeger/cmd/internal/printconfig"
 	"github.com/jaegertracing/jaeger/cmd/internal/status"
+	ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/version"
-	ss "github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"

diff --git a/cmd/internal/env/command.go b/cmd/internal/env/command.go
@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
+	ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
 	"github.com/jaegertracing/jaeger/plugin/metricstore"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 )
 
@@ -66,11 +66,11 @@ func Command() *cobra.Command {
 		"The type of backend used for service dependencies storage.",
 	)
 	fs.String(
-		strategyprovider.SamplingTypeEnvVar,
+		ss.SamplingTypeEnvVar,
 		"file",
 		fmt.Sprintf(
 			strings.ReplaceAll(samplingTypeDescription, "\n", " "),
-			strings.Join(strategyprovider.AllSamplingTypes, ", "),
+			strings.Join(ss.AllSamplingTypes, ", "),
 		),
 	)
 	fs.String(
@@ -79,7 +79,7 @@ func Command() *cobra.Command {
 		fmt.Sprintf(
 			strings.ReplaceAll(samplingStorageTypeDescription, "\n", " "),
 			strings.Join(storage.AllSamplingStorageTypes(), ", "),
-			strategyprovider.SamplingTypeEnvVar,
+			ss.SamplingTypeEnvVar,
 		),
 	)
 	fs.String(

diff --git a/cmd/jaeger/internal/extension/remotesampling/config.go b/cmd/jaeger/internal/extension/remotesampling/config.go
@@ -14,7 +14,7 @@ import (
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/featuregate"
 
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
 )
 
 var (

diff --git a/cmd/jaeger/internal/extension/remotesampling/extension.go b/cmd/jaeger/internal/extension/remotesampling/extension.go
@@ -25,9 +25,9 @@ import (
 	samplinggrpc "github.com/jaegertracing/jaeger/internal/sampling/grpc"
 	samplinghttp "github.com/jaegertracing/jaeger/internal/sampling/http"
 	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/file"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/static"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/samplingstore"
@@ -164,7 +164,7 @@ func (ext *rsExtension) Shutdown(ctx context.Context) error {
 }
 
 func (ext *rsExtension) startFileBasedStrategyProvider(_ context.Context) error {
-	opts := static.Options{
+	opts := file.Options{
 		StrategiesFile:             ext.cfg.File.Path,
 		ReloadInterval:             ext.cfg.File.ReloadInterval,
 		IncludeDefaultOpStrategies: includeDefaultOpStrategies.IsEnabled(),
@@ -173,7 +173,7 @@ func (ext *rsExtension) startFileBasedStrategyProvider(_ context.Context) error
 
 	// contextcheck linter complains about next line that context is not passed.
 	//nolint
-	provider, err := static.NewProvider(opts, ext.telemetry.Logger)
+	provider, err := file.NewProvider(opts, ext.telemetry.Logger)
 	if err != nil {
 		return fmt.Errorf("failed to create the local file strategy store: %w", err)
 	}

diff --git a/cmd/jaeger/internal/extension/remotesampling/extension_test.go b/cmd/jaeger/internal/extension/remotesampling/extension_test.go
@@ -28,7 +28,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )

diff --git a/cmd/jaeger/internal/extension/remotesampling/factory.go b/cmd/jaeger/internal/extension/remotesampling/factory.go
@@ -12,8 +12,8 @@ import (
 	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/extension"
 
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/static"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/file"
 	"github.com/jaegertracing/jaeger/ports"
 )
 
@@ -45,7 +45,7 @@ func createDefaultConfig() component.Config {
 		},
 		File: &FileConfig{
 			Path:                       "", // path needs to be specified
-			DefaultSamplingProbability: static.DefaultSamplingProbability,
+			DefaultSamplingProbability: file.DefaultSamplingProbability,
 		},
 		Adaptive: &AdaptiveConfig{
 			SamplingStore: "", // storage name needs to be specified

diff --git a/cmd/jaeger/internal/processors/adaptivesampling/processor.go b/cmd/jaeger/internal/processors/adaptivesampling/processor.go
@@ -13,7 +13,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/remotesampling"
 	"github.com/jaegertracing/jaeger/internal/metrics/otelmetrics"
 	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
 	"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
 )
 

diff --git a/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go b/cmd/jaeger/internal/processors/adaptivesampling/processor_test.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/remotesampling"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
 	"github.com/jaegertracing/jaeger/plugin/storage/memory"
 )
 

diff --git a/...pling/strategyprovider/adaptive/README.md → ...pling/samplingstrategy/adaptive/README.md b/...pling/strategyprovider/adaptive/README.md → ...pling/samplingstrategy/adaptive/README.md
diff --git a/...g/strategyprovider/adaptive/aggregator.go → ...g/samplingstrategy/adaptive/aggregator.go b/...g/strategyprovider/adaptive/aggregator.go → ...g/samplingstrategy/adaptive/aggregator.go
diff --git a/...ategyprovider/adaptive/aggregator_test.go → ...plingstrategy/adaptive/aggregator_test.go b/...ategyprovider/adaptive/aggregator_test.go → ...plingstrategy/adaptive/aggregator_test.go
diff --git a/...mpling/strategyprovider/adaptive/cache.go → ...mpling/samplingstrategy/adaptive/cache.go b/...mpling/strategyprovider/adaptive/cache.go → ...mpling/samplingstrategy/adaptive/cache.go
diff --git a/...g/strategyprovider/adaptive/cache_test.go → ...g/samplingstrategy/adaptive/cache_test.go b/...g/strategyprovider/adaptive/cache_test.go → ...g/samplingstrategy/adaptive/cache_test.go
diff --git a/...adaptive/calculationstrategy/interface.go → ...adaptive/calculationstrategy/interface.go b/...adaptive/calculationstrategy/interface.go → ...adaptive/calculationstrategy/interface.go
diff --git a/...ive/calculationstrategy/interface_test.go → ...ive/calculationstrategy/interface_test.go b/...ive/calculationstrategy/interface_test.go → ...ive/calculationstrategy/interface_test.go
diff --git a/...ptive/calculationstrategy/package_test.go → ...ptive/calculationstrategy/package_test.go b/...ptive/calculationstrategy/package_test.go → ...ptive/calculationstrategy/package_test.go
diff --git a/.../percentage_increase_capped_calculator.go → .../percentage_increase_capped_calculator.go b/.../percentage_increase_capped_calculator.go → .../percentage_increase_capped_calculator.go
diff --git a/...entage_increase_capped_calculator_test.go → ...entage_increase_capped_calculator_test.go b/...entage_increase_capped_calculator_test.go → ...entage_increase_capped_calculator_test.go
diff --git a/...ling/strategyprovider/adaptive/factory.go → ...ling/samplingstrategy/adaptive/factory.go b/...ling/strategyprovider/adaptive/factory.go → ...ling/samplingstrategy/adaptive/factory.go
diff --git a/...strategyprovider/adaptive/factory_test.go → ...samplingstrategy/adaptive/factory_test.go b/...strategyprovider/adaptive/factory_test.go → ...samplingstrategy/adaptive/factory_test.go
diff --git a/...g/strategyprovider/adaptive/floatutils.go → ...g/samplingstrategy/adaptive/floatutils.go b/...g/strategyprovider/adaptive/floatutils.go → ...g/samplingstrategy/adaptive/floatutils.go
diff --git a/...ategyprovider/adaptive/floatutils_test.go → ...plingstrategy/adaptive/floatutils_test.go b/...ategyprovider/adaptive/floatutils_test.go → ...plingstrategy/adaptive/floatutils_test.go
diff --git a/...ling/strategyprovider/adaptive/options.go → ...ling/samplingstrategy/adaptive/options.go b/...ling/strategyprovider/adaptive/options.go → ...ling/samplingstrategy/adaptive/options.go
diff --git a/...strategyprovider/adaptive/options_test.go → ...samplingstrategy/adaptive/options_test.go b/...strategyprovider/adaptive/options_test.go → ...samplingstrategy/adaptive/options_test.go
diff --git a/...strategyprovider/adaptive/package_test.go → ...samplingstrategy/adaptive/package_test.go b/...strategyprovider/adaptive/package_test.go → ...samplingstrategy/adaptive/package_test.go
diff --git a/...ategyprovider/adaptive/post_aggregator.go → ...plingstrategy/adaptive/post_aggregator.go b/...ategyprovider/adaptive/post_aggregator.go → ...plingstrategy/adaptive/post_aggregator.go
@@ -13,8 +13,8 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/internal/leaderelection"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive/calculationstrategy"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive/calculationstrategy"
 	"github.com/jaegertracing/jaeger/storage/samplingstore"
 	"github.com/jaegertracing/jaeger/storage/samplingstore/model"
 )

diff --git a/...provider/adaptive/post_aggregator_test.go → ...strategy/adaptive/post_aggregator_test.go b/...provider/adaptive/post_aggregator_test.go → ...strategy/adaptive/post_aggregator_test.go
@@ -16,9 +16,9 @@ import (
 
 	epmocks "github.com/jaegertracing/jaeger/internal/leaderelection/mocks"
 	"github.com/jaegertracing/jaeger/internal/metricstest"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive/calculationstrategy"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive/calculationstrategy"
 	smocks "github.com/jaegertracing/jaeger/storage/samplingstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/samplingstore/model"
 )

diff --git a/...ing/strategyprovider/adaptive/provider.go → ...ing/samplingstrategy/adaptive/provider.go b/...ing/strategyprovider/adaptive/provider.go → ...ing/samplingstrategy/adaptive/provider.go
diff --git a/...trategyprovider/adaptive/provider_test.go → ...amplingstrategy/adaptive/provider_test.go b/...trategyprovider/adaptive/provider_test.go → ...amplingstrategy/adaptive/provider_test.go
diff --git a/...egyprovider/adaptive/weightvectorcache.go → ...ingstrategy/adaptive/weightvectorcache.go b/...egyprovider/adaptive/weightvectorcache.go → ...ingstrategy/adaptive/weightvectorcache.go
diff --git a/...ovider/adaptive/weightvectorcache_test.go → ...rategy/adaptive/weightvectorcache_test.go b/...ovider/adaptive/weightvectorcache_test.go → ...rategy/adaptive/weightvectorcache_test.go
diff --git a/...al/sampling/samplingstrategy/interface.go → ...l/sampling/samplingstrategy/aggregator.go b/...al/sampling/samplingstrategy/interface.go → ...l/sampling/samplingstrategy/aggregator.go
@@ -4,24 +4,13 @@
 package samplingstrategy
 
 import (
-	"context"
 	"io"
 
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )
 
-// Provider keeps track of service specific sampling strategies.
-type Provider interface {
-	// Close() from io.Closer  stops the processor from calculating probabilities.
-	io.Closer
-
-	// GetSamplingStrategy retrieves the sampling strategy for the specified service.
-	GetSamplingStrategy(ctx context.Context, serviceName string) (*api_v2.SamplingStrategyResponse, error)
-}
-
 // Aggregator defines an interface used to aggregate operation throughput.
 type Aggregator interface {
 	// Close() from io.Closer stops the aggregator from aggregating throughput.

diff --git a/...ling/strategyprovider/static/constants.go → ...mpling/samplingstrategy/file/constants.go b/...ling/strategyprovider/static/constants.go → ...mpling/samplingstrategy/file/constants.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 import (
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"

diff --git a/...mpling/strategyprovider/static/factory.go → ...sampling/samplingstrategy/file/factory.go b/...mpling/strategyprovider/static/factory.go → ...sampling/samplingstrategy/file/factory.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 import (
 	"flag"

diff --git a/...g/strategyprovider/static/factory_test.go → ...ing/samplingstrategy/file/factory_test.go b/...g/strategyprovider/static/factory_test.go → ...ing/samplingstrategy/file/factory_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 import (
 	"testing"

diff --git a/...trategiesDeprecatedBehavior_ServiceA.json → ...trategiesDeprecatedBehavior_ServiceA.json b/...trategiesDeprecatedBehavior_ServiceA.json → ...trategiesDeprecatedBehavior_ServiceA.json
diff --git a/...trategiesDeprecatedBehavior_ServiceB.json → ...trategiesDeprecatedBehavior_ServiceB.json b/...trategiesDeprecatedBehavior_ServiceB.json → ...trategiesDeprecatedBehavior_ServiceB.json
diff --git a/...iceNoPerOperationStrategies_ServiceA.json → ...iceNoPerOperationStrategies_ServiceA.json b/...iceNoPerOperationStrategies_ServiceA.json → ...iceNoPerOperationStrategies_ServiceA.json
diff --git a/...iceNoPerOperationStrategies_ServiceB.json → ...iceNoPerOperationStrategies_ServiceB.json b/...iceNoPerOperationStrategies_ServiceB.json → ...iceNoPerOperationStrategies_ServiceB.json
diff --git a/...vider/static/fixtures/bad_strategies.json → ...trategy/file/fixtures/bad_strategies.json b/...vider/static/fixtures/bad_strategies.json → ...trategy/file/fixtures/bad_strategies.json
diff --git a/...tatic/fixtures/missing-service-types.json → .../file/fixtures/missing-service-types.json b/...tatic/fixtures/missing-service-types.json → .../file/fixtures/missing-service-types.json
diff --git a/...static/fixtures/operation_strategies.json → ...y/file/fixtures/operation_strategies.json b/...static/fixtures/operation_strategies.json → ...y/file/fixtures/operation_strategies.json
diff --git a/...ic/fixtures/service_no_per_operation.json → ...le/fixtures/service_no_per_operation.json b/...ic/fixtures/service_no_per_operation.json → ...le/fixtures/service_no_per_operation.json
diff --git a/...yprovider/static/fixtures/strategies.json → ...ingstrategy/file/fixtures/strategies.json b/...yprovider/static/fixtures/strategies.json → ...ingstrategy/file/fixtures/strategies.json
diff --git a/...mpling/strategyprovider/static/options.go → ...sampling/samplingstrategy/file/options.go b/...mpling/strategyprovider/static/options.go → ...sampling/samplingstrategy/file/options.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 import (
 	"flag"

diff --git a/...g/strategyprovider/static/package_test.go → ...ing/samplingstrategy/file/package_test.go b/...g/strategyprovider/static/package_test.go → ...ing/samplingstrategy/file/package_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 import (
 	"testing"

diff --git a/...pling/strategyprovider/static/provider.go → ...ampling/samplingstrategy/file/provider.go b/...pling/strategyprovider/static/provider.go → ...ampling/samplingstrategy/file/provider.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 import (
 	"bytes"

diff --git a/.../strategyprovider/static/provider_test.go → ...ng/samplingstrategy/file/provider_test.go b/.../strategyprovider/static/provider_test.go → ...ng/samplingstrategy/file/provider_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 import (
 	"context"
@@ -99,7 +99,7 @@ func TestStrategyStoreWithFile(t *testing.T) {
 
 	_, err = NewProvider(Options{StrategiesFile: "fixtures/bad_strategies.json", DefaultSamplingProbability: DefaultSamplingProbability}, zap.NewNop())
 	require.EqualError(t, err,
-		"failed to unmarshal strategies: json: cannot unmarshal string into Go value of type static.strategies")
+		"failed to unmarshal strategies: json: cannot unmarshal string into Go value of type file.strategies")
 
 	// Test default strategy
 	logger, buf := testutils.NewLogger()

diff --git a/...pling/strategyprovider/static/strategy.go → ...ampling/samplingstrategy/file/strategy.go b/...pling/strategyprovider/static/strategy.go → ...ampling/samplingstrategy/file/strategy.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package static
+package file
 
 // strategy defines a sampling strategy. Type can be "probabilistic" or "ratelimiting"
 // and Param will represent "sampling probability" and "max traces per second" respectively.

diff --git a/plugin/sampling/strategyprovider/factory.go → ...g/samplingstrategy/metafactory/factory.go b/plugin/sampling/strategyprovider/factory.go → ...g/samplingstrategy/metafactory/factory.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package strategyprovider
+package metafactory
 
 import (
 	"errors"
@@ -12,10 +12,10 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
+	"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/file"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/plugin"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/adaptive"
-	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider/static"
 	"github.com/jaegertracing/jaeger/storage"
 )
 
@@ -62,7 +62,7 @@ func NewFactory(config FactoryConfig) (*Factory, error) {
 func (*Factory) getFactoryOfType(factoryType Kind) (samplingstrategy.Factory, error) {
 	switch factoryType {
 	case samplingTypeFile:
-		return static.NewFactory(), nil
+		return file.NewFactory(), nil
 	case samplingTypeAdaptive:
 		return adaptive.NewFactory(), nil
 	default:

diff --git a/...mpling/strategyprovider/factory_config.go → ...ingstrategy/metafactory/factory_config.go b/...mpling/strategyprovider/factory_config.go → ...ingstrategy/metafactory/factory_config.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2018 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package strategyprovider
+package metafactory
 
 import (
 	"fmt"

diff --git a/...g/strategyprovider/factory_config_test.go → ...rategy/metafactory/factory_config_test.go b/...g/strategyprovider/factory_config_test.go → ...rategy/metafactory/factory_config_test.go
@@ -2,7 +2,7 @@
 // Copyright (c) 2018 Uber Technologies, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package strategyprovider
+package metafactory
 
 import (
 	"testing"

diff --git a/...sampling/strategyprovider/factory_test.go → ...plingstrategy/metafactory/factory_test.go b/...sampling/strategyprovider/factory_test.go → ...plingstrategy/metafactory/factory_test.go
@@ -2,7 +2,7 @@
 // Copyright (c) 2018 Uber Technologies, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package strategyprovider
+package metafactory
 
 import (
 	"errors"

diff --git a/...sampling/strategyprovider/package_test.go → ...plingstrategy/metafactory/package_test.go b/...sampling/strategyprovider/package_test.go → ...plingstrategy/metafactory/package_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package strategyprovider
+package metafactory
 
 import (
 	"testing"

diff --git a/internal/sampling/samplingstrategy/provider.go b/internal/sampling/samplingstrategy/provider.go
@@ -0,0 +1,20 @@
+// Copyright (c) 2018 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package samplingstrategy
+
+import (
+	"context"
+	"io"
+
+	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
+)
+
+// Provider keeps track of service specific sampling strategies.
+type Provider interface {
+	// Close() from io.Closer  stops the processor from calculating probabilities.
+	io.Closer
+
+	// GetSamplingStrategy retrieves the sampling strategy for the specified service.
+	GetSamplingStrategy(ctx context.Context, serviceName string) (*api_v2.SamplingStrategyResponse, error)
+}