From e5d35160fd7ee588c7dd4c4d4b2e682c2d29806e Mon Sep 17 00:00:00 2001 From: Przemyslaw Kadej Date: Fri, 13 May 2022 23:05:29 +0200 Subject: [PATCH 1/2] PMM-5492 Added pprof query parameter to request in /logs.zip call. --- commands/summary.go | 12 ++++++++---- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/commands/summary.go b/commands/summary.go index b354ad6f..7b30fb72 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 = 0 + 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}, &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 58b189e1..d7dbd4b2 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,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-20220505164356-d8b4097358e1 + github.com/percona/pmm v0.0.0-20220513204626-f4c3b5528a2e 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 88b6de53..bd259ac9 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,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-20220505164356-d8b4097358e1 h1:Iil3UzE49DPn4keMZ4apU396bzRJRQZvNGJc8jWRp08= -github.com/percona/pmm v0.0.0-20220505164356-d8b4097358e1/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo= +github.com/percona/pmm v0.0.0-20220513204626-f4c3b5528a2e h1:Kar2MFskHJqXxY8C2fYw0JznEQu33H5c8bUszv2Fo4E= +github.com/percona/pmm v0.0.0-20220513204626-f4c3b5528a2e/go.mod h1:k7HS59HPX33tmrSZGiNzUTYuLr0+a49F3BEZ48MAbuo= 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= From bb83f212c147efef5a31da42a7a2ebf61b32a5ee Mon Sep 17 00:00:00 2001 From: Przemyslaw Kadej Date: Mon, 30 May 2022 23:50:22 +0200 Subject: [PATCH 2/2] PMM-5492 Linter fixes. --- commands/summary.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commands/summary.go b/commands/summary.go index 7b30fb72..a60b3545 100644 --- a/commands/summary.go +++ b/commands/summary.go @@ -154,13 +154,13 @@ 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, usePprof bool) { - var pprof int32 = 0 + var pprof int32 if usePprof { pprof = 1 } var buf bytes.Buffer - _, err := client.Default.Server.Logs(&server.LogsParams{Context: ctx, Pprof: &pprof}, &buf) + _, err := client.Default.Server.Logs(&server.LogsParams{Context: ctx, Pprof: &pprof, HTTPClient: nil}, &buf) if err != nil { logrus.Errorf("%s", err) return