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

fix: Update dynamic samplers to use GetSampleRateMulti #717

Merged
merged 1 commit into from
Jun 16, 2023
Merged

fix: Update dynamic samplers to use GetSampleRateMulti #717

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion sample/dynamic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ func (d *DynamicSampler) Start() error {

func (d *DynamicSampler) GetSampleRate(trace *types.Trace) (rate uint, keep bool, reason string, key string) {
key = d.key.build(trace)
rate = uint(d.dynsampler.GetSampleRate(key))
count := int(trace.DescendantCount())
rate = uint(d.dynsampler.GetSampleRateMulti(key, count))
if rate < 1 { // protect against dynsampler being broken even though it shouldn't be
rate = 1
}
Expand All @@ -75,6 +76,7 @@ func (d *DynamicSampler) GetSampleRate(trace *types.Trace) (rate uint, keep bool
"sample_rate": rate,
"sample_keep": shouldKeep,
"trace_id": trace.TraceID,
"span_count": count,
}).Logf("got sample rate and decision")
if shouldKeep {
d.Metrics.Increment(d.prefix + "num_kept")
Expand Down
4 changes: 3 additions & 1 deletion sample/dynamic_ema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ func (d *EMADynamicSampler) Start() error {

func (d *EMADynamicSampler) GetSampleRate(trace *types.Trace) (rate uint, keep bool, reason string, key string) {
key = d.key.build(trace)
rate = uint(d.dynsampler.GetSampleRate(key))
count := int(trace.DescendantCount())
rate = uint(d.dynsampler.GetSampleRateMulti(key, count))
if rate < 1 { // protect against dynsampler being broken even though it shouldn't be
rate = 1
}
Expand All @@ -83,6 +84,7 @@ func (d *EMADynamicSampler) GetSampleRate(trace *types.Trace) (rate uint, keep b
"sample_rate": rate,
"sample_keep": shouldKeep,
"trace_id": trace.TraceID,
"span_count": count,
}).Logf("got sample rate and decision")
if shouldKeep {
d.Metrics.Increment(d.prefix + "num_kept")
Expand Down
4 changes: 3 additions & 1 deletion sample/ema_throughput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ func (d *EMAThroughputSampler) Start() error {

func (d *EMAThroughputSampler) GetSampleRate(trace *types.Trace) (rate uint, keep bool, reason string, key string) {
key = d.key.build(trace)
rate = uint(d.dynsampler.GetSampleRate(key))
count := int(trace.DescendantCount())
rate = uint(d.dynsampler.GetSampleRateMulti(key, count))
if rate < 1 { // protect against dynsampler being broken even though it shouldn't be
rate = 1
}
Expand All @@ -87,6 +88,7 @@ func (d *EMAThroughputSampler) GetSampleRate(trace *types.Trace) (rate uint, kee
"sample_rate": rate,
"sample_keep": shouldKeep,
"trace_id": trace.TraceID,
"span_count": count,
}).Logf("got sample rate and decision")
if shouldKeep {
d.Metrics.Increment(d.prefix + "num_kept")
Expand Down
4 changes: 3 additions & 1 deletion sample/totalthroughput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ func (d *TotalThroughputSampler) Start() error {

func (d *TotalThroughputSampler) GetSampleRate(trace *types.Trace) (rate uint, keep bool, reason string, key string) {
key = d.key.build(trace)
rate = uint(d.dynsampler.GetSampleRate(key))
count := int(trace.DescendantCount())
rate = uint(d.dynsampler.GetSampleRateMulti(key, count))
if rate < 1 { // protect against dynsampler being broken even though it shouldn't be
rate = 1
}
Expand All @@ -79,6 +80,7 @@ func (d *TotalThroughputSampler) GetSampleRate(trace *types.Trace) (rate uint, k
"sample_rate": rate,
"sample_keep": shouldKeep,
"trace_id": trace.TraceID,
"span_count": count,
}).Logf("got sample rate and decision")
if shouldKeep {
d.Metrics.Increment(d.prefix + "num_kept")
Expand Down
10 changes: 9 additions & 1 deletion sample/windowed_throughput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,19 @@ func (d *WindowedThroughputSampler) Start() error {

func (d *WindowedThroughputSampler) GetSampleRate(trace *types.Trace) (rate uint, keep bool, reason string, key string) {
key = d.key.build(trace)
rate = uint(d.dynsampler.GetSampleRate(key))
count := int(trace.DescendantCount())
rate = uint(d.dynsampler.GetSampleRateMulti(key, count))
if rate < 1 { // protect against dynsampler being broken even though it shouldn't be
rate = 1
}
shouldKeep := rand.Intn(int(rate)) == 0
d.Logger.Debug().WithFields(map[string]interface{}{
"sample_key": key,
"sample_rate": rate,
"sample_keep": shouldKeep,
"trace_id": trace.TraceID,
"span_count": count,
}).Logf("got sample rate and decision")
if shouldKeep {
d.Metrics.Increment(d.prefix + "num_kept")
} else {
Expand Down