Revert "config: set proper default value for aggregator_buffer_size…

… and `dogstatsd_string_interner_size` (#4893)" This reverts commit d454524.
DataDog · Mar 6, 2020 · 74a2caa · 74a2caa
1 parent 6a85b78
commit 74a2caa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pkg/aggregator/aggregator.go b/pkg/aggregator/aggregator.go
@@ -207,7 +207,11 @@ type BufferedAggregator struct {
 
 // NewBufferedAggregator instantiates a BufferedAggregator
 func NewBufferedAggregator(s serializer.MetricSerializer, metricPool *metrics.MetricSamplePool, hostname, agentName string, flushInterval time.Duration) *BufferedAggregator {
+
  bufferSize := config.Datadog.GetInt("aggregator_buffer_size")
+ if bufferSize == 0 {
+ bufferSize = 100
+ }
 
  aggregator := &BufferedAggregator{
  metricPool: metricPool,

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -238,7 +238,6 @@ func initConfig(config Config) {
  config.BindEnvAndSetDefault("histogram_aggregates", []string{"max", "median", "avg", "count"})
  config.BindEnvAndSetDefault("histogram_percentiles", []string{"0.95"})
  config.BindEnvAndSetDefault("aggregator_stop_timeout", 2)
- config.BindEnvAndSetDefault("aggregator_buffer_size", 100)
  // Serializer
  config.BindEnvAndSetDefault("enable_stream_payload_serialization", true)
  config.BindEnvAndSetDefault("enable_service_checks_stream_payload_serialization", true)
@@ -295,7 +294,6 @@ func initConfig(config Config) {
  config.BindEnvAndSetDefault("dogstatsd_metrics_stats_enable", false)
  config.BindEnvAndSetDefault("dogstatsd_tags", []string{})
  config.BindEnvAndSetDefault("dogstatsd_mapper_cache_size", 1000)
- config.BindEnvAndSetDefault("dogstatsd_string_interner_size", 4096)
  // Enable check for Entity-ID presence when enriching Dogstatsd metrics with tags
  config.BindEnvAndSetDefault("dogstatsd_entity_id_precedence", false)
  config.SetKnown("dogstatsd_mapper_profiles")

diff --git a/pkg/dogstatsd/parse.go b/pkg/dogstatsd/parse.go
@@ -33,6 +33,9 @@ type parser struct {
 
 func newParser() *parser {
  stringInternerCacheSize := config.Datadog.GetInt("dogstatsd_string_interner_size")
+ if stringInternerCacheSize == 0 {
+ stringInternerCacheSize = 4096
+ }
 
  return &parser{
  interner: newStringInterner(stringInternerCacheSize),