Make --request-info an argument (#2)

* Make phpspy --requestinfo an (optional) argument to phpScope

* Fix PhpspyRequestInfo arg

* Fix --requestinfo arg

Author: beertje44

collector/phpspy.go

@@ -25,11 +25,12 @@ func New(cfg *config.Config) *PhpSpy {
 // Returns a channel that will receive parsed traces and any error that occurred
 func (ps *PhpSpy) Start() (<-chan *Trace, error) {
 	// Construct phpspy command with configuration parameters
-	cmd := exec.Command("sh", "-c", fmt.Sprintf("phpspy --rate-hz=%d --pgrep='-x \"(php-fpm.*|^php$)\"' --buffer-size=%d --max-depth=%d --threads=%d --request-info=qcup",
+	cmd := exec.Command("sh", "-c", fmt.Sprintf("phpspy --rate-hz=%d --pgrep='-x \"(php-fpm.*|^php$)\"' --buffer-size=%d --max-depth=%d --threads=%d --request-info=%s",
 		ps.config.RateHz,
 		ps.config.PhpspyBufferSize,
 		ps.config.PhpspyMaxDepth,
-		ps.config.PhpspyThreads))
+		ps.config.PhpspyThreads,
+		ps.config.PhpspyRequestInfo))
 
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {

config/config.go

@@ -8,29 +8,31 @@ type Config struct {
 	AppName      string
 	Tags         map[string]string
 	Debug        bool
-	
+
 	// Profiling settings
 	RateHz          int
 	Interval        float64
 	BatchLimit      int
 	ConcurrentLimit int
 	ExcludePattern  string
-	
+
 	// PHP-specific settings
-	PhpspyBufferSize int
-	PhpspyMaxDepth   int
-	PhpspyThreads    int
+	PhpspyBufferSize  int
+	PhpspyMaxDepth    int
+	PhpspyThreads     int
+	PhpspyRequestInfo string
 }
 
 // NewDefault returns a new default config
 func NewDefault() *Config {
 	return &Config{
-		RateHz:           400,
-		Interval:         0.1,
-		BatchLimit:       50000,
-		ConcurrentLimit:  1,
-		PhpspyBufferSize: 131072,
-		PhpspyMaxDepth:   -1,
-		PhpspyThreads:    64,
+		RateHz:            400,
+		Interval:          0.1,
+		BatchLimit:        50000,
+		ConcurrentLimit:   1,
+		PhpspyBufferSize:  131072,
+		PhpspyMaxDepth:    -1,
+		PhpspyThreads:     64,
+		PhpspyRequestInfo: "qcup",
 	}
-}
+}

main.go

@@ -71,6 +71,7 @@ func main() {
 	flag.IntVar(&cfg.PhpspyBufferSize, "phpspyBufferSize", cfg.PhpspyBufferSize, "Size of phpspy's internal buffer")
 	flag.IntVar(&cfg.PhpspyMaxDepth, "phpspyMaxDepth", cfg.PhpspyMaxDepth, "Maximum stack trace depth")
 	flag.IntVar(&cfg.PhpspyThreads, "phpspyThreads", cfg.PhpspyThreads, "Number of phpspy worker threads")
+	flag.StringVar(&cfg.PhpspyRequestInfo, "phpspyRequestInfo", cfg.PhpspyRequestInfo, "Request info to include in traces")
 
 	flag.BoolVar(&cfg.Debug, "debug", false, "Enable debug logging")