config: mark DD_CONNECTION_LIMIT as deprecated (#469)

DataDog · Sep 11, 2018 · 2baa5f1 · 2baa5f1
1 parent cf995d1
commit 2baa5f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/config/agent.go b/config/agent.go
@@ -74,7 +74,7 @@ type AgentConfig struct {
 	// watchdog
 	MaxMemory        float64       // MaxMemory is the threshold (bytes allocated) above which program panics and exits, to be restarted
 	MaxCPU           float64       // MaxCPU is the max UserAvg CPU the program should consume
-	MaxConnections   int           // MaxConnections is the threshold (opened TCP connections) above which program panics and exits, to be restarted
+	MaxConnections   int           // (deprecated) MaxConnections is the threshold (opened TCP connections) above which program panics and exits, to be restarted
 	WatchdogInterval time.Duration // WatchdogInterval is the delay between 2 watchdog checks
 
 	// http/s proxying

diff --git a/config/merge_env.go b/config/merge_env.go
@@ -14,7 +14,7 @@ const (
 	envAPIKey          = "DD_API_KEY"               // API KEY
 	envAPMEnabled      = "DD_APM_ENABLED"           // APM enabled
 	envURL             = "DD_APM_DD_URL"            // APM URL
-	envProxyDeprecated = "HTTPS_PROXY"              // proxy URL (deprecated)
+	envProxyDeprecated = "HTTPS_PROXY"              // (deprecated) proxy URL
 	envProxy           = "DD_PROXY_HTTPS"           // proxy URL (overrides deprecated)
 	envHostname        = "DD_HOSTNAME"              // agent hostname
 	envBindHost        = "DD_BIND_HOST"             // statsd & receiver hostname
@@ -24,7 +24,7 @@ const (
 	envIgnoreResources = "DD_IGNORE_RESOURCE"       // ignored resources
 	envLogLevel        = "DD_LOG_LEVEL"             // logging level
 	envAnalyzedSpans   = "DD_APM_ANALYZED_SPANS"    // spans to analyze for transactions
-	envConnectionLimit = "DD_CONNECTION_LIMIT"      // limit of unique connections
+	envConnectionLimit = "DD_CONNECTION_LIMIT"      // (deprecated) limit of unique connections
 )
 
 // loadEnv applies overrides from environment variables to the trace agent configuration

diff --git a/datadog.example.yaml b/datadog.example.yaml
@@ -85,10 +85,6 @@ apm_config:
 #   # Maximum CPU percentage allowed to be occupied by the trace agent
 #   # The agent will be killed if this number is surpassed.
 #   max_cpu_percent: 0.5
-# 
-#   # Maximum number of simultaenous connections allowed by the agent.
-#   # The agent will be killed if this number is surpassed.
-#   max_connection: 200
 #
 #   # Defines obfuscation rules for sensitive data. Disabled by default.
 #   obfuscation: