diff --git a/commands/summary.go b/commands/summary.go index b354ad6f..a60b3545 100644 --- a/commands/summary.go +++ b/commands/summary.go @@ -153,9 +153,14 @@ func addClientData(ctx context.Context, zipW *zip.Writer) { } // addServerData adds logs.zip from PMM Server to zip file. -func addServerData(ctx context.Context, zipW *zip.Writer) { +func addServerData(ctx context.Context, zipW *zip.Writer, usePprof bool) { + var pprof int32 + if usePprof { + pprof = 1 + } + var buf bytes.Buffer - _, err := client.Default.Server.Logs(&server.LogsParams{Context: ctx}, &buf) + _, err := client.Default.Server.Logs(&server.LogsParams{Context: ctx, Pprof: &pprof, HTTPClient: nil}, &buf) if err != nil { logrus.Errorf("%s", err) return @@ -264,7 +269,6 @@ func addPprofData(ctx context.Context, zipW *zip.Writer, skipServer bool) { "client/pprof/pmm-agent": fmt.Sprintf("http://%s:%d/debug/pprof", agentlocal.Localhost, GlobalFlags.PMMAgentListenPort), } if !skipServer { - sources["server/pprof/pmm-managed"] = fmt.Sprintf("http://%s:7773/debug/pprof", agentlocal.Localhost) sources["server/pprof/qan-api2"] = fmt.Sprintf("http://%s:9933/debug/pprof", agentlocal.Localhost) } @@ -332,7 +336,7 @@ func (cmd *summaryCommand) makeArchive(ctx context.Context) (err error) { } if !cmd.SkipServer { - addServerData(ctx, zipW) + addServerData(ctx, zipW, cmd.Pprof) } return //nolint:nakedret diff --git a/go.mod b/go.mod index ed705566..772f5622 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/AlekSi/pointer v1.2.0 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d github.com/go-openapi/runtime v0.24.0 - github.com/percona/pmm v0.0.0-20220520150831-23069cdf1bb8 + github.com/percona/pmm v0.0.0-20220530213957-dc4793335a14 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.1 diff --git a/go.sum b/go.sum index d06ecef8..c94ac89c 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/percona/pmm v0.0.0-20220520150831-23069cdf1bb8 h1:P5iuV4GRUIviRg/5/FM6ZOKdiBPdwUPbrHld/epM3hk= -github.com/percona/pmm v0.0.0-20220520150831-23069cdf1bb8/go.mod h1:gr+WLd8clEAe2xMFgsGhpw9ziZc2UCWcfy6d3M6Aq00= +github.com/percona/pmm v0.0.0-20220530213957-dc4793335a14 h1:NvhRMv1rftqvSpzmFHQlmSPFIjsUxv7Ii4anCnV46Dk= +github.com/percona/pmm v0.0.0-20220530213957-dc4793335a14/go.mod h1:gr+WLd8clEAe2xMFgsGhpw9ziZc2UCWcfy6d3M6Aq00= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=