From 0421e8ff271d55087547e0157326b214d3ef16ad Mon Sep 17 00:00:00 2001 From: Gabriel Aszalos Date: Thu, 11 Feb 2021 15:01:33 +0200 Subject: [PATCH] Undo unneeded changes --- pkg/trace/config/config.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/trace/config/config.go b/pkg/trace/config/config.go index bd853ed42b009..a559abc60196e 100644 --- a/pkg/trace/config/config.go +++ b/pkg/trace/config/config.go @@ -58,7 +58,7 @@ type AgentConfig struct { // will be uploaded to. The first endpoint is the main configuration endpoint; // any following ones are read from the 'additional_endpoints' parts of the // configuration file, if present. - Endpoints []*Endpoint `json:",omitempty"` + Endpoints []*Endpoint // Concentrator BucketInterval time.Duration // the size of our pre-aggregation per bucket @@ -78,8 +78,8 @@ type AgentConfig struct { MaxRequestBytes int64 // specifies the maximum allowed request size for incoming trace payloads // Writers - StatsWriter *WriterConfig `json:",omitempty"` - TraceWriter *WriterConfig `json:",omitempty"` + StatsWriter *WriterConfig + TraceWriter *WriterConfig ConnectionResetInterval time.Duration // frequency at which outgoing connections are reset. 0 means no reset is performed // internal telemetry @@ -97,7 +97,7 @@ type AgentConfig struct { WatchdogInterval time.Duration // WatchdogInterval is the delay between 2 watchdog checks // http/s proxying - ProxyURL *url.URL `json:"-"` + ProxyURL *url.URL SkipSSLValidation bool // filtering @@ -105,7 +105,7 @@ type AgentConfig struct { // ReplaceTags is used to filter out sensitive information from tag values. // It maps tag keys to a set of replacements. Only supported in A6. - ReplaceTags []*ReplaceRule `json:",omitempty"` + ReplaceTags []*ReplaceRule // transaction analytics AnalyzedRateByServiceLegacy map[string]float64 @@ -115,7 +115,7 @@ type AgentConfig struct { DDAgentBin string // Obfuscation holds sensitive data obufscator's configuration. - Obfuscation *ObfuscationConfig `json:",omitempty"` + Obfuscation *ObfuscationConfig } // New returns a configuration with the default values.