[signal, management, client, cmd] Create shared pprof package and allow pprof port configuration through NB_PPROF_ADDR

client/cmd/root.go

@@ -23,6 +23,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/netbirdio/netbird/client/internal/profilemanager"
+	_ "github.com/netbirdio/netbird/util/pprof"
 )
 
 const (

management/cmd/root.go

@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	nbconfig "github.com/netbirdio/netbird/management/internals/server/config"
+	_ "github.com/netbirdio/netbird/util/pprof"
 	"github.com/netbirdio/netbird/version"
 )
 

management/main.go

@@ -1,19 +1,12 @@
 package main
 
 import (
-	"log"
-	"net/http"
-	// nolint:gosec
-	_ "net/http/pprof"
 	"os"
 
 	"github.com/netbirdio/netbird/management/cmd"
 )
 
 func main() {
-	go func() {
-		log.Println(http.ListenAndServe("localhost:6060", nil))
-	}()
 	if err := cmd.Execute(); err != nil {
 		os.Exit(1)
 	}

relay/cmd/root.go

@@ -23,6 +23,7 @@ import (
 	"github.com/netbirdio/netbird/shared/relay/auth"
 	"github.com/netbirdio/netbird/signal/metrics"
 	"github.com/netbirdio/netbird/util"
+	_ "github.com/netbirdio/netbird/util/pprof"
 )
 
 type Config struct {

signal/cmd/root.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	_ "github.com/netbirdio/netbird/util/pprof"
 	"github.com/netbirdio/netbird/version"
 )
 

signal/cmd/run.go

@@ -8,8 +8,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	// nolint:gosec
-	_ "net/http/pprof"
+
 	"time"
 
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
@@ -92,8 +91,6 @@ var (
 		RunE: func(cmd *cobra.Command, args []string) error {
 			flag.Parse()
 
-			startPprof()
-
 			opts, certManager, tlsConfig, err := getTLSConfigurations()
 			if err != nil {
 				return err
@@ -194,15 +191,6 @@ var (
 	}
 )
 
-func startPprof() {
-	go func() {
-		log.Debugf("Starting pprof server on 127.0.0.1:6060")
-		if err := http.ListenAndServe("127.0.0.1:6060", nil); err != nil {
-			log.Fatalf("pprof server failed: %v", err)
-		}
-	}()
-}
-
 func getTLSConfigurations() ([]grpc.ServerOption, *autocert.Manager, *tls.Config, error) {
 	var (
 		err         error

signal/main.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"github.com/netbirdio/netbird/signal/cmd"
 	"os"
+
+	"github.com/netbirdio/netbird/signal/cmd"
 )
 
 func main() {

client/cmd/pprof.go → util/pprof/pprof.go

@@ -1,7 +1,7 @@
 //go:build pprof
 // +build pprof
 
-package cmd
+package pprof
 
 import (
 	"net/http"
@@ -19,7 +19,7 @@ func init() {
 func pprofAddr() string {
 	listenAddr := os.Getenv("NB_PPROF_ADDR")
 	if listenAddr == "" {
-		return "localhost:6969"
+		return "localhost:6060"
 	}
 
 	return listenAddr

util/pprof/pprof_off.go

@@ -0,0 +1,8 @@
+//go:build !pprof
+
+package pprof
+
+/*
+Allow package build even without pprof tag.
+Otherwise, Go complains that "build constraints exlude all Go files"
+*/