Skip to content

PMM-5492 Adding pprof query parameter to /logs.zip #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pkadej merged 20 commits into from
Jul 18, 2022
Merged

PMM-5492 Adding pprof query parameter to /logs.zip #893

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f4c3b55
PMM-5492 Adding pprof query parameter to /logs.zip
pkadej May 13, 2022
81558aa
Merge branch 'main' into PMM-5492-pprof-support
pkadej May 18, 2022
dc47933
Merge branch 'main' into PMM-5492-pprof-support
pkadej May 30, 2022
1f1d9b8
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jun 7, 2022
09f121d
PMM-5492 Adding pprof query parameter to /logs.zip
pkadej Jun 7, 2022
d62fa29
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jun 11, 2022
bdcc015
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jun 13, 2022
e9f17b0
PMM-5492 Code review adjustments.
pkadej Jun 13, 2022
2332eab
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jun 15, 2022
f0ab960
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jun 16, 2022
c8c6f84
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jul 3, 2022
4af4928
PMM-5492 Pprof tool implementation.
pkadej Jul 3, 2022
b461990
PMM-5492 Linter fixes.
pkadej Jul 3, 2022
a02a020
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jul 11, 2022
1231760
PMM-5492 Code review adjustments.
pkadej Jul 11, 2022
dade100
PMM-5492 Code review adjustments.
pkadej Jul 11, 2022
6dcedb2
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jul 11, 2022
05dfc04
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jul 12, 2022
dd9e92b
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jul 14, 2022
ec5ad60
Merge branch 'main' into PMM-5492-pprof-support
pkadej Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions admin/commands/summary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@ 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 buf bytes.Buffer
_, err := client.Default.Server.Logs(&server.LogsParams{Context: ctx}, &buf)
_, err := client.Default.Server.Logs(&server.LogsParams{Context: ctx, Pprof: &usePprof, HTTPClient: nil}, &buf)
Comment thread
artemgavrilov marked this conversation as resolved.
Outdated
if err != nil {
logrus.Errorf("%s", err)
return
Expand Down Expand Up @@ -272,7 +272,6 @@ func addPprofData(ctx context.Context, zipW *zip.Writer, skipServer bool) {
isRunOnPmmServer, _ := helpers.IsOnPmmServer()

if !skipServer && isRunOnPmmServer {
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)
}

Expand Down Expand Up @@ -340,7 +339,7 @@ func (cmd *summaryCommand) makeArchive(ctx context.Context) (err error) {
}

if !cmd.SkipServer {
addServerData(ctx, zipW)
addServerData(ctx, zipW, cmd.Pprof)
}

return //nolint:nakedret
Expand Down
30 changes: 30 additions & 0 deletions agent/client/mock_defaults_file_parser_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions api/serverpb/json/client/server/logs_parameters.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions api/serverpb/json/header.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
"description": "Returns the PMM Server logs.",
"summary": "Logs",
"operationId": "Logs",
"parameters": [
{
"type": "boolean",
"description": "Include performance profiling data,",
"name": "pprof",
"in": "query"
}
],
"produces": ["application/zip"],
"responses": {
"200": {
Expand Down
8 changes: 8 additions & 0 deletions api/serverpb/json/serverpb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
],
"summary": "Logs",
"operationId": "Logs",
"parameters": [
{
"type": "boolean",
"description": "Include performance profiling data,",
"name": "pprof",
"in": "query"
}
],
"responses": {
"200": {
"description": "A successful response.",
Expand Down
8 changes: 8 additions & 0 deletions api/swagger/swagger-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@
],
"summary": "Logs",
"operationId": "Logs",
"parameters": [
{
"type": "boolean",
"description": "Include performance profiling data,",
"name": "pprof",
"in": "query"
}
],
"responses": {
"200": {
"description": "A successful response.",
Expand Down
8 changes: 8 additions & 0 deletions api/swagger/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
],
"summary": "Logs",
"operationId": "Logs",
"parameters": [
{
"type": "boolean",
"description": "Include performance profiling data,",
"name": "pprof",
"in": "query"
}
],
"responses": {
"200": {
"description": "A successful response.",
Expand Down