Skip to content

release-26.1: sql: attach opName string as pprof label for internal queries #160034

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
yuzefovich merged 1 commit into from
Dec 23, 2025
Merged

release-26.1: sql: attach opName string as pprof label for internal queries #160034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions pkg/sql/conn_executor_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4456,15 +4456,25 @@ func (ex *connExecutor) execWithProfiling(
}
// Compute fingerprint ID here since ih.Setup hasn't been called yet.
fingerprintID := appstatspb.ConstructStatementFingerprintID(
stmtNoConstants, ex.implicitTxn(), ex.sessionData().Database)
pprofutil.Do(ctx, func(ctx context.Context) {
err = op(ctx)
},
stmtNoConstants, ex.implicitTxn(), ex.sessionData().Database,
)
labels := make([]string, 0, 12)
labels = append(labels, []string{
workloadid.ProfileTag, sqlstatsutil.EncodeStmtFingerprintIDToString(fingerprintID),
"appname", ex.sessionData().ApplicationName,
"addr", remoteAddr,
"stmt.tag", ast.StatementTag(),
"stmt.no.constants", stmtNoConstants,
}...)
if opName, ok := GetInternalOpName(ctx); ok {
labels = append(labels, "opname", opName)
Copy link
Collaborator

@mgartner mgartner Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realized we can pre-allocate and extra slot in the []string to avoid the extra allocation on append, but probably not worth it given that is is within the profiling code path only.

Copy link
Member Author

@yuzefovich yuzefovich Dec 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I also thought about this initially and had the same reasoning (slow path anyway) for not doing that. But given you mentioned it too and it's easy enough to avoid, done.

}
pprofutil.Do(
ctx,
func(ctx context.Context) {
err = op(ctx)
},
labels...,
)
} else {
err = op(ctx)
Expand Down
Loading