Skip to content
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

Set lock_wait_timeout option only if positive #896

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Set lock_wait_timeout option only if positive #896

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c41224a
Set lock_wait_timeout option only if positive
Nov 21, 2024
141cba1
Fix CI test failures
Nov 21, 2024
3ced62e
Fix CI test failures
Nov 21, 2024
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
9 changes: 7 additions & 2 deletions collector/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,13 @@ type Exporter struct {

// New returns a new MySQL exporter for the provided DSN.
func New(ctx context.Context, dsn string, scrapers []Scraper, logger *slog.Logger) *Exporter {
// Setup extra params for the DSN, default to having a lock timeout.
dsnParams := []string{fmt.Sprintf(timeoutParam, *exporterLockTimeout)}
// Setup extra params for the DSN
dsnParams := []string{}

// Only set lock_wait_timeout if it is positive
if *exporterLockTimeout >= 0 {
dsnParams = append(dsnParams, fmt.Sprintf(timeoutParam, *exporterLockTimeout))
}

if *slowLogFilter {
dsnParams = append(dsnParams, sessionSettingsParam)
Expand Down