diff --git a/plugin/sampling/strategystore/static/fixtures/5504_strategies.json b/plugin/sampling/strategystore/static/fixtures/5504_strategies.json deleted file mode 100644 index 66f59562a5f0..000000000000 --- a/plugin/sampling/strategystore/static/fixtures/5504_strategies.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "default_strategy": { - "type": "probabilistic", - "param": 0.2, - "operation_strategies": [ - { - "operation": "metrics", - "type": "probabilistic", - "param": 0.1 - } - ] - }, - "service_strategies": [ - { - "service": "foobar", - "type": "ratelimiting", - "param": 2 - } - ] -} - -// func Test5504SamplingStrategies(t *testing.T) { -// logger, _ := testutils.NewLogger() -// store, err := NewStrategyStore(Options{StrategiesFile: "fixtures/5504_strategies.json"}, logger) -// require.NoError(t, err) - -// expected := makeResponse(api_v2.SamplingStrategyType_RATE_LIMITING, 2) - -// s, err := store.GetSamplingStrategy(context.Background(), "foobar") -// require.NoError(t, err) -// assert.Equal(t, api_v2.SamplingStrategyType_RATE_LIMITING, s.StrategyType) -// assert.Equal(t, *expected.RateLimitingSampling, *s.RateLimitingSampling) - -// require.NotNil(t, s.OperationSampling) -// os := s.OperationSampling -// assert.EqualValues(t, 0.8, os.DefaultSamplingProbability) -// require.Len(t, os.PerOperationStrategies, 1) - -// expected = makeResponse(api_v2.SamplingStrategyType_PROBABILISTIC, 0.2) - -// d, err := store.GetSamplingStrategy(context.Background(), "default_service") -// require.NoError(t, err) -// assert.Equal(t, api_v2.SamplingStrategyType_PROBABILISTIC, d.StrategyType) -// assert.Equal(t, *expected.ProbabilisticSampling, *d.ProbabilisticSampling) - -// require.NotNil(t, s.OperationSampling) -// os = s.OperationSampling -// assert.EqualValues(t, 0.8, os.DefaultSamplingProbability) -// require.Len(t, os.PerOperationStrategies, 1) - -// assert.Equal(t, "metrics", os.PerOperationStrategies[0].Operation) -// assert.EqualValues(t, 0.1, os.PerOperationStrategies[0].ProbabilisticSampling.SamplingRate) -// } diff --git a/plugin/sampling/strategystore/static/strategy_store_test.go b/plugin/sampling/strategystore/static/strategy_store_test.go index 3d51a1e810cd..bdf49516dbf0 100644 --- a/plugin/sampling/strategystore/static/strategy_store_test.go +++ b/plugin/sampling/strategystore/static/strategy_store_test.go @@ -470,15 +470,24 @@ func TestServiceNoPerOperationStrategies(t *testing.T) { s, err := store.GetSamplingStrategy(context.Background(), "ServiceA") require.NoError(t, err) - assert.Equal(t, 1.0, s.OperationSampling.DefaultSamplingProbability) - assert.Len(t, s.OperationSampling.PerOperationStrategies, 1) + require.NotNil(t, s.OperationSampling) + os := s.OperationSampling + assert.EqualValues(t, 1, os.DefaultSamplingProbability) + require.Len(t, os.PerOperationStrategies, 1) + assert.Equal(t, "/health", os.PerOperationStrategies[0].Operation) + assert.EqualValues(t, 0.0, os.PerOperationStrategies[0].ProbabilisticSampling.SamplingRate) + expected := makeResponse(api_v2.SamplingStrategyType_PROBABILISTIC, 1.0) + assert.Equal(t, *expected.ProbabilisticSampling, *s.ProbabilisticSampling) s, err = store.GetSamplingStrategy(context.Background(), "ServiceB") require.NoError(t, err) - assert.Equal(t, 0.2, s.OperationSampling.DefaultSamplingProbability) - assert.Len(t, s.OperationSampling.PerOperationStrategies, 1) - - expected := makeResponse(api_v2.SamplingStrategyType_RATE_LIMITING, 3) + require.NotNil(t, s.OperationSampling) + os = s.OperationSampling + assert.EqualValues(t, 0.2, os.DefaultSamplingProbability) + require.Len(t, os.PerOperationStrategies, 1) + assert.Equal(t, "/health", os.PerOperationStrategies[0].Operation) + assert.EqualValues(t, 0.0, os.PerOperationStrategies[0].ProbabilisticSampling.SamplingRate) + expected = makeResponse(api_v2.SamplingStrategyType_RATE_LIMITING, 3) assert.Equal(t, *expected.RateLimitingSampling, *s.RateLimitingSampling) }