DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config: use *float32 with nil instead of float32 with sentinel value

Browse source
This commit is contained in:
David Goffredo 2023-06-27 22:45:50 +00:00 committed by k8s-infra-cherrypick-robot
parent 059f6262fe
commit fb1dcff2f3
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
internal/ingress/controller/config/config.go
View file

@ -87,11 +87,6 @@ const (
// Parameters for a shared memory zone that will keep states for various keys. // Parameters for a shared memory zone that will keep states for various keys.
// http://nginx.org/en/docs/http/ngx_http_limit_conn_module.html#limit_conn_zone // http://nginx.org/en/docs/http/ngx_http_limit_conn_module.html#limit_conn_zone
defaultLimitConnZoneVariable = "$binary_remote_addr" defaultLimitConnZoneVariable = "$binary_remote_addr"
// Default sentinel value for Configuration.DatadogSampleRate, indicating
// that the Datadog tracer should consult the Datadog Agent for sampling
// rates rather than use a configured value.
DatadogDynamicSampleRate = -1.0
) )
// Configuration represents the content of nginx.conf file // Configuration represents the content of nginx.conf file
@ -713,7 +708,7 @@ type Configuration struct {
// DatadogSampleRate specifies sample rate for any traces created. // DatadogSampleRate specifies sample rate for any traces created.
// Default: use a dynamic rate instead // Default: use a dynamic rate instead
DatadogSampleRate float32 `json:"datadog-sample-rate"` DatadogSampleRate *float32 `json:"datadog-sample-rate",omitempty`
// MainSnippet adds custom configuration to the main section of the nginx configuration // MainSnippet adds custom configuration to the main section of the nginx configuration
MainSnippet string `json:"main-snippet"` MainSnippet string `json:"main-snippet"`
@ -999,7 +994,7 @@ func NewDefault() Configuration {
DatadogEnvironment: "prod", DatadogEnvironment: "prod",
DatadogCollectorPort: 8126, DatadogCollectorPort: 8126,
DatadogOperationNameOverride: "nginx.handle", DatadogOperationNameOverride: "nginx.handle",
DatadogSampleRate: DatadogDynamicSampleRate, DatadogSampleRate: nil,
LimitReqStatusCode: 503, LimitReqStatusCode: 503,
LimitConnStatusCode: 503, LimitConnStatusCode: 503,
SyslogPort: 514, SyslogPort: 514,

7
internal/ingress/controller/nginx.go
View file

@ -1083,12 +1083,11 @@ func datadogOpentracingCfg(cfg ngx_config.Configuration) (string, error) {
"operation_name_override": cfg.DatadogOperationNameOverride, "operation_name_override": cfg.DatadogOperationNameOverride,
} }
// Omit "sample_rate" if the configuration's sample rate is set to the // Omit "sample_rate" if the configuration's sample rate is unset (nil).
// default sentinel value DatadogDynamicSampleRate (-1).
// Omitting "sample_rate" from the plugin JSON indicates to the tracer that // Omitting "sample_rate" from the plugin JSON indicates to the tracer that
// it should use dynamic rates instead of a configured rate. // it should use dynamic rates instead of a configured rate.
if cfg.DatadogSampleRate != ngx_config.DatadogDynamicSampleRate { if cfg.DatadogSampleRate != nil {
jsn["sample_rate"] = cfg.DatadogSampleRate jsn["sample_rate"] = *cfg.DatadogSampleRate
} }
jsnBytes, err := json.Marshal(jsn) jsnBytes, err := json.Marshal(jsn)