Skip to content

Brian/dynamic smapling #42157

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

Closed
gh123man wants to merge 8 commits into from
Closed

Brian/dynamic smapling #42157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
636eb03
prototype
gh123man Oct 20, 2025
ec35629
adjust defaults
gh123man Oct 20, 2025
fdb3381
add config bindings
gh123man Oct 20, 2025
ce4fbe9
update defualts
gh123man Oct 20, 2025
5ddebff
Add status tracking
gh123man Oct 21, 2025
2b9ee36
Add control to skip json logs
gh123man Oct 21, 2025
fd5d17f
make tokeinzer size configurable
gh123man Oct 21, 2025
bb975a7
Disbly noisly log line
gh123man Oct 21, 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
18 changes: 18 additions & 0 deletions pkg/config/setup/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1732,6 +1732,24 @@ func logsagent(config pkgconfigmodel.Setup) {
config.BindEnvAndSetDefault("logs_config.use_tcp", false)
config.BindEnvAndSetDefault("logs_config.force_use_tcp", false)

// Dynamic sampling configuration
config.BindEnvAndSetDefault("logs_config.dynamic_sampling_enabled", false)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.skip_json_logs", false)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.tokenizer_size", 10240)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.rate_ceiling", 1.0)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.fast_half_life_seconds", 2)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.slow_half_life_seconds", 60)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.rare_enter_share", 0.01)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.rare_exit_share", 0.02)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.hysteresis_seconds", 5)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.rare_burst_refill", 0.6)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.rare_burst_cap", 100.0)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.ceiling_cap", 2.0)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.global_rare_burst_refill", 150.0)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.global_rare_burst_cap", 2000.0)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.new_type_burst_bootstrap", 5.0)
config.BindEnvAndSetDefault("logs_config.dynamic_sampling.evict_after_minutes", 3)

// Transport protocol for log payloads
config.BindEnvAndSetDefault("logs_config.http_protocol", "auto")
config.BindEnvAndSetDefault("logs_config.http_timeout", 10)
Expand Down
13 changes: 12 additions & 1 deletion pkg/logs/internal/decoder/auto_multiline_detection/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package automultilinedetection
import (
"bytes"

pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
"github.com/DataDog/datadog-agent/pkg/logs/message"
"github.com/DataDog/datadog-agent/pkg/logs/metrics"
status "github.com/DataDog/datadog-agent/pkg/logs/status/utils"
Expand Down Expand Up @@ -110,6 +111,7 @@ type Aggregator struct {
maxContentSize int
multiLineMatchInfo *status.CountInfo
linesCombinedInfo *status.CountInfo
sampleAgg *SampleAggregator
}

// NewAggregator creates a new aggregator.
Expand All @@ -125,6 +127,7 @@ func NewAggregator(outputFn func(m *message.Message), maxContentSize int, tagTru
maxContentSize: maxContentSize,
multiLineMatchInfo: multiLineMatchInfo,
linesCombinedInfo: linesCombinedInfo,
sampleAgg: NewSampleAggregator(tailerInfo),
}
}

Expand Down Expand Up @@ -186,7 +189,15 @@ func (a *Aggregator) Flush() {
a.bucket.reset()
return
}
a.outputFn(a.bucket.flush())
msg := a.bucket.flush()
if pkgconfigsetup.Datadog().GetBool("logs_config.dynamic_sampling_enabled") {
msg = a.sampleAgg.Process(msg)
if msg != nil {
a.outputFn(msg)
}
} else {
a.outputFn(msg)
}
}

// IsEmpty returns true if the bucket is empty.
Expand Down
Loading
Loading