Chore: Improve grafana-server profiling and tracing (#20593)
Profiling and tracing can now be enabled/disabled separately. Adds argument for trace file path. Support overriding profiling and tracing argument using environment variables. Update docs. Fixes #20576
This commit is contained in:
committed by
Marcus Efraimsson
parent
b7a3758799
commit
b16cb92b32
@@ -0,0 +1,78 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
const (
|
||||
profilingEnabledEnvName = "GF_DIAGNOSTICS_PROFILING_ENABLED"
|
||||
profilingPortEnvName = "GF_DIAGNOSTICS_PROFILING_PORT"
|
||||
tracingEnabledEnvName = "GF_DIAGNOSTICS_TRACING_ENABLED"
|
||||
tracingFileEnvName = "GF_DIAGNOSTICS_TRACING_FILE"
|
||||
)
|
||||
|
||||
type profilingDiagnostics struct {
|
||||
enabled bool
|
||||
port uint
|
||||
}
|
||||
|
||||
func newProfilingDiagnostics(enabled bool, port uint) *profilingDiagnostics {
|
||||
return &profilingDiagnostics{
|
||||
enabled: enabled,
|
||||
port: port,
|
||||
}
|
||||
}
|
||||
|
||||
func (pd *profilingDiagnostics) overrideWithEnv() error {
|
||||
enabledEnv := os.Getenv(profilingEnabledEnvName)
|
||||
if enabledEnv != "" {
|
||||
enabled, err := strconv.ParseBool(enabledEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Failed to parse %s environment variable as bool", profilingEnabledEnvName)
|
||||
}
|
||||
pd.enabled = enabled
|
||||
}
|
||||
|
||||
portEnv := os.Getenv(profilingPortEnvName)
|
||||
if portEnv != "" {
|
||||
port, parseErr := strconv.ParseUint(portEnv, 0, 64)
|
||||
if parseErr != nil {
|
||||
return fmt.Errorf("Failed to parse %s enviroment variable to unsigned integer", profilingPortEnvName)
|
||||
}
|
||||
pd.port = uint(port)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type tracingDiagnostics struct {
|
||||
enabled bool
|
||||
file string
|
||||
}
|
||||
|
||||
func newTracingDiagnostics(enabled bool, file string) *tracingDiagnostics {
|
||||
return &tracingDiagnostics{
|
||||
enabled: enabled,
|
||||
file: file,
|
||||
}
|
||||
}
|
||||
|
||||
func (td *tracingDiagnostics) overrideWithEnv() error {
|
||||
enabledEnv := os.Getenv(tracingEnabledEnvName)
|
||||
if enabledEnv != "" {
|
||||
enabled, err := strconv.ParseBool(enabledEnv)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Failed to parse %s environment variable as bool", tracingEnabledEnvName)
|
||||
}
|
||||
td.enabled = enabled
|
||||
}
|
||||
|
||||
fileEnv := os.Getenv(tracingFileEnvName)
|
||||
if fileEnv != "" {
|
||||
td.file = fileEnv
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestProfilingDiagnostics(t *testing.T) {
|
||||
tcs := []struct {
|
||||
defaults *profilingDiagnostics
|
||||
enabledEnv string
|
||||
portEnv string
|
||||
expected *profilingDiagnostics
|
||||
}{
|
||||
{defaults: newProfilingDiagnostics(false, 6060), enabledEnv: "", portEnv: "", expected: newProfilingDiagnostics(false, 6060)},
|
||||
{defaults: newProfilingDiagnostics(true, 8080), enabledEnv: "", portEnv: "", expected: newProfilingDiagnostics(true, 8080)},
|
||||
{defaults: newProfilingDiagnostics(false, 6060), enabledEnv: "false", portEnv: "8080", expected: newProfilingDiagnostics(false, 8080)},
|
||||
{defaults: newProfilingDiagnostics(false, 6060), enabledEnv: "true", portEnv: "8080", expected: newProfilingDiagnostics(true, 8080)},
|
||||
{defaults: newProfilingDiagnostics(false, 6060), enabledEnv: "true", portEnv: "", expected: newProfilingDiagnostics(true, 6060)},
|
||||
}
|
||||
|
||||
for i, tc := range tcs {
|
||||
t.Run(fmt.Sprintf("testcase %d", i), func(t *testing.T) {
|
||||
os.Clearenv()
|
||||
if tc.enabledEnv != "" {
|
||||
err := os.Setenv(profilingEnabledEnvName, tc.enabledEnv)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
if tc.portEnv != "" {
|
||||
err := os.Setenv(profilingPortEnvName, tc.portEnv)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
err := tc.defaults.overrideWithEnv()
|
||||
assert.NoError(t, err)
|
||||
assert.Exactly(t, tc.expected, tc.defaults)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestTracingDiagnostics(t *testing.T) {
|
||||
tcs := []struct {
|
||||
defaults *tracingDiagnostics
|
||||
enabledEnv string
|
||||
fileEnv string
|
||||
expected *tracingDiagnostics
|
||||
}{
|
||||
{defaults: newTracingDiagnostics(false, "trace.out"), enabledEnv: "", fileEnv: "", expected: newTracingDiagnostics(false, "trace.out")},
|
||||
{defaults: newTracingDiagnostics(true, "/tmp/trace.out"), enabledEnv: "", fileEnv: "", expected: newTracingDiagnostics(true, "/tmp/trace.out")},
|
||||
{defaults: newTracingDiagnostics(false, "trace.out"), enabledEnv: "false", fileEnv: "/tmp/trace.out", expected: newTracingDiagnostics(false, "/tmp/trace.out")},
|
||||
{defaults: newTracingDiagnostics(false, "trace.out"), enabledEnv: "true", fileEnv: "/tmp/trace.out", expected: newTracingDiagnostics(true, "/tmp/trace.out")},
|
||||
{defaults: newTracingDiagnostics(false, "trace.out"), enabledEnv: "true", fileEnv: "", expected: newTracingDiagnostics(true, "trace.out")},
|
||||
}
|
||||
|
||||
for i, tc := range tcs {
|
||||
t.Run(fmt.Sprintf("testcase %d", i), func(t *testing.T) {
|
||||
os.Clearenv()
|
||||
if tc.enabledEnv != "" {
|
||||
err := os.Setenv(tracingEnabledEnvName, tc.enabledEnv)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
if tc.fileEnv != "" {
|
||||
err := os.Setenv(tracingFileEnvName, tc.fileEnv)
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
err := tc.defaults.overrideWithEnv()
|
||||
assert.NoError(t, err)
|
||||
assert.Exactly(t, tc.expected, tc.defaults)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,9 @@ func main() {
|
||||
|
||||
v = flag.Bool("v", false, "prints current version and exits")
|
||||
profile = flag.Bool("profile", false, "Turn on pprof profiling")
|
||||
profilePort = flag.Int("profile-port", 6060, "Define custom port for profiling")
|
||||
profilePort = flag.Uint("profile-port", 6060, "Define custom port for profiling")
|
||||
tracing = flag.Bool("tracing", false, "Turn on tracing")
|
||||
tracingFile = flag.String("tracing-file", "trace.out", "Define tracing output file")
|
||||
)
|
||||
|
||||
flag.Parse()
|
||||
@@ -56,16 +58,32 @@ func main() {
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
if *profile {
|
||||
profileDiagnostics := newProfilingDiagnostics(*profile, *profilePort)
|
||||
if err := profileDiagnostics.overrideWithEnv(); err != nil {
|
||||
fmt.Fprintln(os.Stderr, err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
traceDiagnostics := newTracingDiagnostics(*tracing, *tracingFile)
|
||||
if err := traceDiagnostics.overrideWithEnv(); err != nil {
|
||||
fmt.Fprintln(os.Stderr, err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if profileDiagnostics.enabled {
|
||||
fmt.Println("diagnostics: pprof profiling enabled", "port", profileDiagnostics.port)
|
||||
runtime.SetBlockProfileRate(1)
|
||||
go func() {
|
||||
err := http.ListenAndServe(fmt.Sprintf("localhost:%d", *profilePort), nil)
|
||||
err := http.ListenAndServe(fmt.Sprintf("localhost:%d", profileDiagnostics.port), nil)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
f, err := os.Create("trace.out")
|
||||
if traceDiagnostics.enabled {
|
||||
fmt.Println("diagnostics: tracing enabled", "file", traceDiagnostics.file)
|
||||
f, err := os.Create(traceDiagnostics.file)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user