Skip to content

fix(database_observability): Solve test flakiness in MySQL and Postgres sample collectors #5130

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
cristiangreco merged 2 commits into from
Mar 16, 2026
Merged

fix(database_observability): Solve test flakiness in MySQL and Postgres sample collectors #5130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ffb67
fix: prevent goroutine leak in query_samples collectors
gaantunes Feb 20, 2026
2eeeb44
Merge branch 'main' into gaanunes/fix-flaky-tests
cristiangreco Mar 16, 2026
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
19 changes: 14 additions & 5 deletions internal/component/database_observability/mysql/collector/query_samples.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"database/sql"
"fmt"
"sync"
"time"

"github.com/blang/semver/v4"
Expand Down Expand Up @@ -112,6 +113,7 @@ type QuerySamples struct {
running *atomic.Bool
ctx context.Context
cancel context.CancelFunc
wg sync.WaitGroup

timerBookmark float64
lastUptime float64
Expand Down Expand Up @@ -158,16 +160,17 @@ func (c *QuerySamples) Start(ctx context.Context) error {

// Start setup_consumers check goroutine if enabled
if c.autoEnableSetupConsumers {
c.wg.Add(1)
go c.runSetupConsumersCheck()
}

c.wg.Add(1)
go func() {
defer func() {
c.Stop()
c.running.Store(false)
}()
defer c.wg.Done()
defer c.running.Store(false)

ticker := time.NewTicker(c.collectInterval)
defer ticker.Stop()

for {
if err := c.fetchQuerySamples(c.ctx); err != nil {
Expand All @@ -192,11 +195,17 @@ func (c *QuerySamples) Stopped() bool {

// Stop should be kept idempotent
func (c *QuerySamples) Stop() {
c.cancel()
if c.cancel != nil {
c.cancel()
}
c.wg.Wait()
}

func (c *QuerySamples) runSetupConsumersCheck() {
defer c.wg.Done()

ticker := time.NewTicker(c.setupConsumersCheckInterval)
defer ticker.Stop()

for {
if err := c.updateSetupConsumersSettings(c.ctx); err != nil {
Expand Down
17 changes: 11 additions & 6 deletions internal/component/database_observability/postgres/collector/query_samples.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"database/sql"
"fmt"
"slices"
"sync"
"time"

"github.com/go-kit/log"
Expand Down Expand Up @@ -123,6 +124,7 @@ type QuerySamples struct {
running *atomic.Bool
ctx context.Context
cancel context.CancelFunc
wg sync.WaitGroup

// in-memory state of running samples
samples map[SampleKey]*SampleState
Expand Down Expand Up @@ -249,13 +251,13 @@ func (c *QuerySamples) Start(ctx context.Context) error {
c.ctx = ctx
c.cancel = cancel

c.wg.Add(1)
go func() {
defer func() {
c.Stop()
c.running.Store(false)
}()
defer c.wg.Done()
defer c.running.Store(false)

ticker := time.NewTicker(c.collectInterval)
defer ticker.Stop()

for {
if err := c.fetchQuerySample(c.ctx); err != nil {
Expand All @@ -280,7 +282,10 @@ func (c *QuerySamples) Stopped() bool {

// Stop should be kept idempotent
func (c *QuerySamples) Stop() {
c.cancel()
if c.cancel != nil {
c.cancel()
}
c.wg.Wait()
}

func (c *QuerySamples) fetchQuerySample(ctx context.Context) error {
Expand Down Expand Up @@ -396,7 +401,7 @@ func (c *QuerySamples) processRow(sample QuerySamplesInfo) (SampleKey, error) {
return key, nil
}

func (c QuerySamples) validateQuerySample(sample QuerySamplesInfo) error {
func (c *QuerySamples) validateQuerySample(sample QuerySamplesInfo) error {
if c.disableQueryRedaction {
if sample.Query.Valid && sample.Query.String == "<insufficient privilege>" {
return fmt.Errorf("insufficient privilege to access query sample set: %+v", sample)
Expand Down
Loading