remove commented out code

Signed-off-by: Yuri Shkuro <github@ysh.us>
jaegertracing · Mar 30, 2024 · 5eadac5 · 5eadac5
1 parent 62b7b08
commit 5eadac5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/plugin/sampling/strategystore/static/strategy_store.go b/plugin/sampling/strategystore/static/strategy_store.go
@@ -216,12 +216,6 @@ func (h *strategyStore) parseStrategies(strategies *strategies) {
 		newStore.defaultStrategy = h.parseServiceStrategies(strategies.DefaultStrategy)
 	}
 
-	// merge := true
-	// if newStore.defaultStrategy.OperationSampling == nil ||
-	// 	newStore.defaultStrategy.OperationSampling.PerOperationStrategies == nil {
-	// 	merge = false
-	// }
-
 	for _, s := range strategies.ServiceStrategies {
 		newStore.serviceStrategies[s.Service] = h.parseServiceStrategies(s)
 

diff --git a/plugin/sampling/strategystore/static/strategy_store_test.go b/plugin/sampling/strategystore/static/strategy_store_test.go
@@ -36,9 +36,7 @@ import (
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )
 
-const (
-	snapshotLocation = "./fixtures/"
-)
+const snapshotLocation = "./fixtures/"
 
 // Snapshots can be regenerated via:
 //
@@ -51,20 +49,20 @@ func strategiesJSON(probability float32) string {
 	strategy := fmt.Sprintf(`
 		{
 			"default_strategy": {
-			"type": "probabilistic",
-			"param": 0.5
-			},
-			"service_strategies": [
-			{
-				"service": "foo",
 				"type": "probabilistic",
-				"param": %.1f
+				"param": 0.5
 			},
-			{
-				"service": "bar",
-				"type": "ratelimiting",
-				"param": 5
-			}
+			"service_strategies": [
+				{
+					"service": "foo",
+					"type": "probabilistic",
+					"param": %.1f
+				},
+				{
+					"service": "bar",
+					"type": "ratelimiting",
+					"param": 5
+				}
 			]
 		}
 		`,