Merge branch 'master' of github.com:httprunner/httprunner

2026-07-07 07:21:23 +08:00 · 2022-05-24 14:07:03 +08:00
parent d0b2568797 7c85630c3d
commit 682f1ecb94
43 changed files with 649 additions and 121 deletions
--- a/hrp/cmd/boom.go
+++ b/hrp/cmd/boom.go
@@ -1,12 +1,15 @@
 package cmd

 import (
+	"os"
 	"time"

+	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

 	"github.com/httprunner/httprunner/v4/hrp"
 	"github.com/httprunner/httprunner/v4/hrp/internal/boomer"
+	"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
 )

 // boomCmd represents the boom command
@@ -28,57 +31,70 @@ var boomCmd = &cobra.Command{
 			path := hrp.TestCasePath(arg)
 			paths = append(paths, &path)
 		}
-		hrpBoomer := hrp.NewBoomer(spawnCount, spawnRate)
-		hrpBoomer.SetRateLimiter(maxRPS, requestIncreaseRate)
-		if loopCount > 0 {
-			hrpBoomer.SetLoopCount(loopCount)
+		// if set profile, the priority is higher than the other commands
+		if boomArgs.profile != "" {
+			err := builtin.LoadFile(boomArgs.profile, &boomArgs)
+			if err != nil {
+				log.Error().Err(err).Msg("failed to load profile")
+				os.Exit(1)
+			}
 		}
-		if !disableConsoleOutput {
+
+		hrpBoomer := hrp.NewBoomer(boomArgs.SpawnCount, boomArgs.SpawnRate)
+		hrpBoomer.SetRateLimiter(boomArgs.MaxRPS, boomArgs.RequestIncreaseRate)
+		if boomArgs.LoopCount > 0 {
+			hrpBoomer.SetLoopCount(boomArgs.LoopCount)
+		}
+		if !boomArgs.DisableConsoleOutput {
 			hrpBoomer.AddOutput(boomer.NewConsoleOutput())
 		}
-		if prometheusPushgatewayURL != "" {
-			hrpBoomer.AddOutput(boomer.NewPrometheusPusherOutput(prometheusPushgatewayURL, "hrp", hrpBoomer.GetMode()))
+		if boomArgs.PrometheusPushgatewayURL != "" {
+			hrpBoomer.AddOutput(boomer.NewPrometheusPusherOutput(boomArgs.PrometheusPushgatewayURL, "hrp", hrpBoomer.GetMode()))
 		}
-		hrpBoomer.SetDisableKeepAlive(disableKeepalive)
-		hrpBoomer.SetDisableCompression(disableCompression)
+		hrpBoomer.SetDisableKeepAlive(boomArgs.DisableKeepalive)
+		hrpBoomer.SetDisableCompression(boomArgs.DisableCompression)
 		hrpBoomer.SetClientTransport()
-		hrpBoomer.EnableCPUProfile(cpuProfile, cpuProfileDuration)
-		hrpBoomer.EnableMemoryProfile(memoryProfile, memoryProfileDuration)
+		hrpBoomer.EnableCPUProfile(boomArgs.CPUProfile, boomArgs.CPUProfileDuration)
+		hrpBoomer.EnableMemoryProfile(boomArgs.MemoryProfile, boomArgs.MemoryProfileDuration)
 		hrpBoomer.EnableGracefulQuit()
 		hrpBoomer.Run(paths...)
 	},
 }

-var (
-	spawnCount               int
-	spawnRate                float64
-	maxRPS                   int64
-	loopCount                int64
-	requestIncreaseRate      string
-	memoryProfile            string
-	memoryProfileDuration    time.Duration
-	cpuProfile               string
-	cpuProfileDuration       time.Duration
-	prometheusPushgatewayURL string
-	disableConsoleOutput     bool
-	disableCompression       bool
-	disableKeepalive         bool
-)
+type BoomArgs struct {
+	SpawnCount               int           `json:"spawn-count,omitempty" yaml:"spawn-count,omitempty"`
+	SpawnRate                float64       `json:"spawn-rate,omitempty" yaml:"spawn-rate,omitempty"`
+	MaxRPS                   int64         `json:"max-rps,omitempty" yaml:"max-rps,omitempty"`
+	LoopCount                int64         `json:"loop-count,omitempty" yaml:"loop-count,omitempty"`
+	RequestIncreaseRate      string        `json:"request-increase-rate,omitempty" yaml:"request-increase-rate,omitempty"`
+	MemoryProfile            string        `json:"memory-profile,omitempty" yaml:"memory-profile,omitempty"`
+	MemoryProfileDuration    time.Duration `json:"memory-profile-duration" yaml:"memory-profile-duration"`
+	CPUProfile               string        `json:"cpu-profile,omitempty" yaml:"cpu-profile,omitempty"`
+	CPUProfileDuration       time.Duration `json:"cpu-profile-duration,omitempty" yaml:"cpu-profile-duration,omitempty"`
+	PrometheusPushgatewayURL string        `json:"prometheus-gateway,omitempty" yaml:"prometheus-gateway,omitempty"`
+	DisableConsoleOutput     bool          `json:"disable-console-output,omitempty" yaml:"disable-console-output,omitempty"`
+	DisableCompression       bool          `json:"disable-compression,omitempty" yaml:"disable-compression,omitempty"`
+	DisableKeepalive         bool          `json:"disable-keepalive,omitempty" yaml:"disable-keepalive,omitempty"`
+	profile                  string
+}
+
+var boomArgs BoomArgs

 func init() {
 	rootCmd.AddCommand(boomCmd)

-	boomCmd.Flags().Int64Var(&maxRPS, "max-rps", 0, "Max RPS that boomer can generate, disabled by default.")
-	boomCmd.Flags().StringVar(&requestIncreaseRate, "request-increase-rate", "-1", "Request increase rate, disabled by default.")
-	boomCmd.Flags().IntVar(&spawnCount, "spawn-count", 1, "The number of users to spawn for load testing")
-	boomCmd.Flags().Float64Var(&spawnRate, "spawn-rate", 1, "The rate for spawning users")
-	boomCmd.Flags().Int64Var(&loopCount, "loop-count", -1, "The specify running cycles for load testing")
-	boomCmd.Flags().StringVar(&memoryProfile, "mem-profile", "", "Enable memory profiling.")
-	boomCmd.Flags().DurationVar(&memoryProfileDuration, "mem-profile-duration", 30*time.Second, "Memory profile duration.")
-	boomCmd.Flags().StringVar(&cpuProfile, "cpu-profile", "", "Enable CPU profiling.")
-	boomCmd.Flags().DurationVar(&cpuProfileDuration, "cpu-profile-duration", 30*time.Second, "CPU profile duration.")
-	boomCmd.Flags().StringVar(&prometheusPushgatewayURL, "prometheus-gateway", "", "Prometheus Pushgateway url.")
-	boomCmd.Flags().BoolVar(&disableConsoleOutput, "disable-console-output", false, "Disable console output.")
-	boomCmd.Flags().BoolVar(&disableCompression, "disable-compression", false, "Disable compression")
-	boomCmd.Flags().BoolVar(&disableKeepalive, "disable-keepalive", false, "Disable keepalive")
+	boomCmd.Flags().Int64Var(&boomArgs.MaxRPS, "max-rps", 0, "Max RPS that boomer can generate, disabled by default.")
+	boomCmd.Flags().StringVar(&boomArgs.RequestIncreaseRate, "request-increase-rate", "-1", "Request increase rate, disabled by default.")
+	boomCmd.Flags().IntVar(&boomArgs.SpawnCount, "spawn-count", 1, "The number of users to spawn for load testing")
+	boomCmd.Flags().Float64Var(&boomArgs.SpawnRate, "spawn-rate", 1, "The rate for spawning users")
+	boomCmd.Flags().Int64Var(&boomArgs.LoopCount, "loop-count", -1, "The specify running cycles for load testing")
+	boomCmd.Flags().StringVar(&boomArgs.MemoryProfile, "mem-profile", "", "Enable memory profiling.")
+	boomCmd.Flags().DurationVar(&boomArgs.MemoryProfileDuration, "mem-profile-duration", 30*time.Second, "Memory profile duration.")
+	boomCmd.Flags().StringVar(&boomArgs.CPUProfile, "cpu-profile", "", "Enable CPU profiling.")
+	boomCmd.Flags().DurationVar(&boomArgs.CPUProfileDuration, "cpu-profile-duration", 30*time.Second, "CPU profile duration.")
+	boomCmd.Flags().StringVar(&boomArgs.PrometheusPushgatewayURL, "prometheus-gateway", "", "Prometheus Pushgateway url.")
+	boomCmd.Flags().BoolVar(&boomArgs.DisableConsoleOutput, "disable-console-output", false, "Disable console output.")
+	boomCmd.Flags().BoolVar(&boomArgs.DisableCompression, "disable-compression", false, "Disable compression")
+	boomCmd.Flags().BoolVar(&boomArgs.DisableKeepalive, "disable-keepalive", false, "Disable keepalive")
+	boomCmd.Flags().StringVar(&boomArgs.profile, "profile", "", "profile for load testing")
 }
--- a/hrp/cmd/scaffold.go
+++ b/hrp/cmd/scaffold.go
@@ -11,9 +11,10 @@ import (
 )

 var scaffoldCmd = &cobra.Command{
-	Use:   "startproject $project_name",
-	Short: "create a scaffold project",
-	Args:  cobra.ExactValidArgs(1),
+	Use:     "startproject $project_name",
+	Aliases: []string{"scaffold"},
+	Short:   "create a scaffold project",
+	Args:    cobra.ExactValidArgs(1),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		setLogLevel(logLevel)
 	},
--- a/hrp/cmd/wiki.go
+++ b/hrp/cmd/wiki.go
@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/httprunner/httprunner/v4/hrp/internal/wiki"
+)
+
+var wikiCmd = &cobra.Command{
+	Use:     "wiki",
+	Aliases: []string{"info", "docs", "doc"},
+	Short:   "visit https://httprunner.com",
+	PreRun: func(cmd *cobra.Command, args []string) {
+		setLogLevel(logLevel)
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return wiki.OpenWiki()
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(wikiCmd)
+}