feat: parametrize pprof server

Author: evgeniy-scherbina

boundary.go

@@ -21,6 +21,8 @@ type Config struct {
 	Logger     *slog.Logger
 	Jailer     jail.Jailer
 	ProxyPort  int
+	PprofEnabled bool
+	PprofPort    int
 }
 
 type Boundary struct {
@@ -35,11 +37,13 @@ type Boundary struct {
 func New(ctx context.Context, config Config) (*Boundary, error) {
 	// Create proxy server
 	proxyServer := proxy.NewProxyServer(proxy.Config{
-		HTTPPort:   config.ProxyPort,
-		RuleEngine: config.RuleEngine,
-		Auditor:    config.Auditor,
-		Logger:     config.Logger,
-		TLSConfig:  config.TLSConfig,
+		HTTPPort:     config.ProxyPort,
+		RuleEngine:   config.RuleEngine,
+		Auditor:      config.Auditor,
+		Logger:       config.Logger,
+		TLSConfig:    config.TLSConfig,
+		PprofEnabled: config.PprofEnabled,
+		PprofPort:    config.PprofPort,
 	})
 
 	// Create cancellable context for boundary

cli/cli.go

@@ -29,6 +29,8 @@ type Config struct {
 	LogDir       string
 	Unprivileged bool
 	ProxyPort    int64
+	PprofEnabled bool
+	PprofPort    int64
 }
 
 // NewCommand creates and returns the root serpent command
@@ -94,6 +96,19 @@ func BaseCommand() *serpent.Command {
 				Default:     "8080",
 				Value:       serpent.Int64Of(&config.ProxyPort),
 			},
+			{
+				Flag:        "pprof",
+				Env:         "BOUNDARY_PPROF",
+				Description: "Enable pprof profiling server.",
+				Value:       serpent.BoolOf(&config.PprofEnabled),
+			},
+			{
+				Flag:        "pprof-port",
+				Env:         "BOUNDARY_PPROF_PORT",
+				Description: "Set port for pprof profiling server.",
+				Default:     "6060",
+				Value:       serpent.Int64Of(&config.PprofPort),
+			},
 		},
 		Handler: func(inv *serpent.Invocation) error {
 			args := inv.Args
@@ -203,12 +218,14 @@ func Run(ctx context.Context, config Config, args []string) error {
 
 	// Create boundary instance
 	boundaryInstance, err := boundary.New(ctx, boundary.Config{
-		RuleEngine: ruleEngine,
-		Auditor:    auditor,
-		TLSConfig:  tlsConfig,
-		Logger:     logger,
-		Jailer:     jailer,
-		ProxyPort:  int(config.ProxyPort),
+		RuleEngine:   ruleEngine,
+		Auditor:      auditor,
+		TLSConfig:    tlsConfig,
+		Logger:       logger,
+		Jailer:       jailer,
+		ProxyPort:    int(config.ProxyPort),
+		PprofEnabled: config.PprofEnabled,
+		PprofPort:    int(config.PprofPort),
 	})
 	if err != nil {
 		return fmt.Errorf("failed to create boundary instance: %v", err)

proxy/proxy.go

@@ -33,15 +33,19 @@ type Server struct {
 
 	listener    net.Listener
 	pprofServer *http.Server
+	pprofEnabled bool
+	pprofPort    int
 }
 
 // Config holds configuration for the proxy server
 type Config struct {
-	HTTPPort   int
-	RuleEngine rules.Evaluator
-	Auditor    audit.Auditor
-	Logger     *slog.Logger
-	TLSConfig  *tls.Config
+	HTTPPort     int
+	RuleEngine   rules.Evaluator
+	Auditor      audit.Auditor
+	Logger       *slog.Logger
+	TLSConfig    *tls.Config
+	PprofEnabled bool
+	PprofPort    int
 }
 
 // NewProxyServer creates a new proxy server instance
@@ -52,6 +56,8 @@ func NewProxyServer(config Config) *Server {
 		logger:     config.Logger,
 		tlsConfig:  config.TLSConfig,
 		httpPort:   config.HTTPPort,
+		pprofEnabled: config.PprofEnabled,
+		pprofPort:    config.PprofPort,
 	}
 }
 
@@ -63,19 +69,20 @@ func (p *Server) Start() error {
 
 	p.logger.Info("Starting HTTP proxy with TLS termination", "port", p.httpPort)
 
-	p.pprofServer = &http.Server{
-		Addr:    ":6060", // pprof port
-		Handler: http.DefaultServeMux,
-	}
-
-	// Start pprof server on a different port
-	go func() {
-		p.logger.Info("Starting pprof server", "port", 6060)
-
-		if err := p.pprofServer.ListenAndServe(); err != nil && errors.Is(err, http.ErrServerClosed) {
-			p.logger.Error("pprof server error", "error", err)
+	// Start pprof server if enabled
+	if p.pprofEnabled {
+		p.pprofServer = &http.Server{
+			Addr:    fmt.Sprintf(":%d", p.pprofPort),
+			Handler: http.DefaultServeMux,
 		}
-	}()
+
+		go func() {
+			p.logger.Info("Starting pprof server", "port", p.pprofPort)
+			if err := p.pprofServer.ListenAndServe(); err != nil && errors.Is(err, http.ErrServerClosed) {
+				p.logger.Error("pprof server error", "error", err)
+			}
+		}()
+	}
 
 	var err error
 	p.listener, err = net.Listen("tcp", fmt.Sprintf(":%d", p.httpPort))