Skip to content

[extension/jaegerremotesampling] fix: wait for autoUpdateStrategies in Close function #37289

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
songy23 merged 4 commits into from
Jan 21, 2025
Merged

[extension/jaegerremotesampling] fix: wait for autoUpdateStrategies in Close function #37289

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fa6bf5
[extension/jaegerremotesampling] fix: wait for autoUpdateStrategies i…
ary82 Jan 17, 2025
6e6a3be
Merge branch 'main' into fix-wait-for-autoupdatestrategies
ary82 Jan 17, 2025
c48dc0a
fix
ary82 Jan 17, 2025
6d80fb6
Merge branch 'main' into fix-wait-for-autoupdatestrategies
yurishkuro Jan 17, 2025
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
6 changes: 6 additions & 0 deletions extension/jaegerremotesampling/internal/source/filesource/filesource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"net/url"
"os"
"path/filepath"
"sync"
"sync/atomic"
"time"

Expand All @@ -34,6 +35,8 @@ type samplingProvider struct {
cancelFunc context.CancelFunc

options Options

wg sync.WaitGroup
}

type storedStrategies struct {
Expand Down Expand Up @@ -77,6 +80,7 @@ func NewFileSource(options Options, logger *zap.Logger) (source.Source, error) {
}

if options.ReloadInterval > 0 {
h.wg.Add(1)
go h.autoUpdateStrategies(ctx, options.ReloadInterval, loadFn)
}
return h, nil
Expand All @@ -96,6 +100,7 @@ func (h *samplingProvider) GetSamplingStrategy(_ context.Context, serviceName st
// Close stops updating the strategies
func (h *samplingProvider) Close() error {
h.cancelFunc()
h.wg.Wait()
return nil
}

Expand Down Expand Up @@ -156,6 +161,7 @@ func (h *samplingProvider) samplingStrategyLoader(strategiesFile string) strateg
}

func (h *samplingProvider) autoUpdateStrategies(ctx context.Context, interval time.Duration, loader strategyLoader) {
defer h.wg.Done()
lastValue := string(nullJSON)
ticker := time.NewTicker(interval)
defer ticker.Stop()
Expand Down