Fix profiles settings structure (#17)

stevenlanders · web-flow · commit 4beeef78ecec · 2025-08-27T14:27:24.000-04:00
- settings required a nesting structure
- profile jsons didn't align with that
diff --git a/config/config.go b/config/config.go
@@ -1,7 +1,10 @@
 package config
 
 import (
+	"encoding/json"
+	"fmt"
 	"math/big"
+	"time"
 )
 
 // LoadConfig stores the configuration for load-related settings.
@@ -16,6 +19,33 @@ type LoadConfig struct {
 	Settings   *Settings      `json:"settings,omitempty"`
 }
 
+// Duration wraps time.Duration to provide JSON unmarshaling support
+type Duration time.Duration
+
+// UnmarshalJSON implements json.Unmarshaler for Duration
+func (d *Duration) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err != nil {
+		return err
+	}
+	parsed, err := time.ParseDuration(s)
+	if err != nil {
+		return fmt.Errorf("invalid duration format: %w", err)
+	}
+	*d = Duration(parsed)
+	return nil
+}
+
+// ToDuration converts Duration back to time.Duration
+func (d Duration) ToDuration() time.Duration {
+	return time.Duration(d)
+}
+
+// MarshalJSON implements json.Marshaler for Duration
+func (d Duration) MarshalJSON() ([]byte, error) {
+	return json.Marshal(time.Duration(d).String())
+}
+
 // GetChainID returns the chain ID as a big.Int.
 func (c *LoadConfig) GetChainID() *big.Int {
 	return big.NewInt(c.ChainID)
diff --git a/config/settings.go b/config/settings.go
@@ -12,7 +12,7 @@ import (
 type Settings struct {
 	Workers          int           `json:"workers"`
 	TPS              float64       `json:"tps"`
-	StatsInterval    time.Duration `json:"statsInterval"`
+	StatsInterval    Duration `json:"statsInterval"`
 	BufferSize       int           `json:"bufferSize"`
 	DryRun           bool          `json:"dryRun"`
 	Debug            bool          `json:"debug"`
@@ -28,7 +28,7 @@ func DefaultSettings() Settings {
 	return Settings{
 		Workers:          1,
 		TPS:              0.0,
-		StatsInterval:    10 * time.Second,
+		StatsInterval:    Duration(10 * time.Second),
 		BufferSize:       1000,
 		DryRun:           false,
 		Debug:            false,
@@ -65,7 +65,7 @@ func InitializeViper(cmd *cobra.Command) error {
 
 	// Set defaults in Viper
 	defaults := DefaultSettings()
-	viper.SetDefault("statsInterval", defaults.StatsInterval)
+	viper.SetDefault("statsInterval", defaults.StatsInterval.ToDuration())
 	viper.SetDefault("bufferSize", defaults.BufferSize)
 	viper.SetDefault("tps", defaults.TPS)
 	viper.SetDefault("dryRun", defaults.DryRun)
@@ -98,7 +98,7 @@ func ResolveSettings() Settings {
 	return Settings{
 		Workers:          viper.GetInt("workers"),
 		TPS:              viper.GetFloat64("tps"),
-		StatsInterval:    viper.GetDuration("statsInterval"),
+		StatsInterval:    Duration(viper.GetDuration("statsInterval")),
 		BufferSize:       viper.GetInt("bufferSize"),
 		DryRun:           viper.GetBool("dryRun"),
 		Debug:            viper.GetBool("debug"),
diff --git a/config/settings_test.go b/config/settings_test.go
@@ -108,7 +108,7 @@ func TestArgumentPrecedence(t *testing.T) {
 			settings := ResolveSettings()
 
 			// Verify expectations
-			require.Equal(t, tt.expectedStats, settings.StatsInterval, "StatsInterval: expected %v, got %v", tt.expectedStats, settings.StatsInterval)
+			require.Equal(t, tt.expectedStats, settings.StatsInterval.ToDuration(), "StatsInterval: expected %v, got %v", tt.expectedStats, settings.StatsInterval.ToDuration())
 			require.Equal(t, tt.expectedWorkers, settings.Workers, "Workers: expected %d, got %d", tt.expectedWorkers, settings.Workers)
 			require.Equal(t, tt.expectedTPS, settings.TPS, "TPS: expected %f, got %f", tt.expectedTPS, settings.TPS)
 		})
@@ -121,7 +121,7 @@ func TestDefaultSettings(t *testing.T) {
 	expected := Settings{
 		Workers:          1,
 		TPS:              0.0,
-		StatsInterval:    10 * time.Second,
+		StatsInterval:    Duration(10 * time.Second),
 		BufferSize:       1000,
 		DryRun:           false,
 		Debug:            false,
diff --git a/main.go b/main.go
@@ -113,7 +113,7 @@ func runLoadTest(ctx context.Context, cmd *cobra.Command, args []string) error {
 	log.Printf("👥 Workers per endpoint: %d", settings.Workers)
 	log.Printf("🔧 Total workers: %d", len(cfg.Endpoints)*settings.Workers)
 	log.Printf("📊 Scenarios: %d", len(cfg.Scenarios))
-	log.Printf("⏱️  Stats interval: %v", settings.StatsInterval)
+	log.Printf("⏱️  Stats interval: %v", settings.StatsInterval.ToDuration())
 	log.Printf("📦 Buffer size per worker: %d", settings.BufferSize)
 	if settings.TPS > 0 {
 		log.Printf("📈 Transactions per second: %.2f", settings.TPS)
@@ -148,7 +148,7 @@ func runLoadTest(ctx context.Context, cmd *cobra.Command, args []string) error {
 
 	// Create statistics collector and logger
 	collector := stats.NewCollector()
-	logger := stats.NewLogger(collector, settings.StatsInterval, settings.Debug)
+	logger := stats.NewLogger(collector, settings.StatsInterval.ToDuration(), settings.Debug)
 	var ramper *sender.Ramper
 
 	err = service.Run(ctx, func(ctx context.Context, s service.Scope) error {
@@ -200,7 +200,7 @@ func runLoadTest(ctx context.Context, cmd *cobra.Command, args []string) error {
 
 		// Create and start user latency tracker if endpoints are available
 		if len(cfg.Endpoints) > 0 && settings.TrackUserLatency {
-			userLatencyTracker := stats.NewUserLatencyTracker(settings.StatsInterval)
+			userLatencyTracker := stats.NewUserLatencyTracker(settings.StatsInterval.ToDuration())
 			s.SpawnBgNamed("user latency tracker", func() error {
 				return userLatencyTracker.Run(ctx, cfg.Endpoints[0])
 			})
@@ -261,7 +261,7 @@ func runLoadTest(ctx context.Context, cmd *cobra.Command, args []string) error {
 		sigChan := make(chan os.Signal, 1)
 		signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 
-		log.Printf("📈 Logging statistics every %v (Press Ctrl+C to stop)", settings.StatsInterval)
+		log.Printf("📈 Logging statistics every %v (Press Ctrl+C to stop)", settings.StatsInterval.ToDuration())
 		if settings.DryRun {
 			log.Printf("📝 Dry-run mode: Simulating requests without sending")
 		}
diff --git a/profiles/evm_transfer.json b/profiles/evm_transfer.json
@@ -14,14 +14,17 @@
         "weight": 1
       }
     ],
-    "workers": 1,
-    "tps": 0,
-    "statsInterval": "5s",
-    "bufferSize": 1000,
-    "dryRun": false,
-    "debug": false,
-    "trackReceipts": false,
-    "trackBlocks": false,
-    "trackUserLatency": false,
-    "prewarm": false
+    "settings": {
+      "workers": 1,
+      "tps": 0,
+      "statsInterval": "5s",
+      "bufferSize": 1000,
+      "dryRun": false,
+      "debug": false,
+      "trackReceipts": false,
+      "trackBlocks": false,
+      "trackUserLatency": false,
+      "prewarm": false,
+      "rampUp": false
+    }
   }
diff --git a/profiles/loadtest_default.json b/profiles/loadtest_default.json
@@ -30,14 +30,17 @@
         "weight": 1
       }
     ],
-    "workers": 1,
-    "tps": 0,
-    "statsInterval": "5s",
-    "bufferSize": 1000,
-    "dryRun": false,
-    "debug": false,
-    "trackReceipts": false,
-    "trackBlocks": false,
-    "trackUserLatency": false,
-    "prewarm": false
+    "settings": {
+      "workers": 1,
+      "tps": 0,
+      "statsInterval": "5s",
+      "bufferSize": 1000,
+      "dryRun": false,
+      "debug": false,
+      "trackReceipts": false,
+      "trackBlocks": false,
+      "trackUserLatency": false,
+      "prewarm": false,
+      "rampUp": false
+    }
   }
diff --git a/profiles/local.json b/profiles/local.json
@@ -30,14 +30,17 @@
       "weight": 1
     }
   ],
-  "workers": 1,
-  "tps": 0,
-  "statsInterval": "5s",
-  "bufferSize": 1000,
-  "dryRun": false,
-  "debug": false,
-  "trackReceipts": false,
-  "trackBlocks": false,
-  "trackUserLatency": false,
-  "prewarm": false
+  "settings": {
+    "workers": 1,
+    "tps": 0,
+    "statsInterval": "5s",
+    "bufferSize": 1000,
+    "dryRun": false,
+    "debug": false,
+    "trackReceipts": false,
+    "trackBlocks": false,
+    "trackUserLatency": false,
+    "prewarm": false,
+    "rampUp": false
+  }
 }
diff --git a/profiles/local_docker.json b/profiles/local_docker.json
@@ -17,14 +17,17 @@
       "weight": 1
     }
   ],
-  "workers": 1,
-  "tps": 0,
-  "statsInterval": "5s",
-  "bufferSize": 1000,
-  "dryRun": false,
-  "debug": false,
-  "trackReceipts": false,
-  "trackBlocks": false,
-  "trackUserLatency": false,
-  "prewarm": false
+  "settings": {
+    "workers": 1,
+    "tps": 0,
+    "statsInterval": "5s",
+    "bufferSize": 1000,
+    "dryRun": false,
+    "debug": false,
+    "trackReceipts": false,
+    "trackBlocks": false,
+    "trackUserLatency": false,
+    "prewarm": false,
+    "rampUp": false
+  }
 }
diff --git a/profiles/profiles_test.go b/profiles/profiles_test.go
