Skip to content

Commit 1817415

Browse files
hush-hushhush-hush
authored
Fix cosmetic difference (#54288)
### What does this PR do? This fixes the differences between the existing code and the generated version that will replace it. Having both as close as possible makes testing script and QA easier Co-authored-by: maxime.mouial <maxime.mouial@datadoghq.com>
1 parent e147206 commit 1817415

9 files changed

Lines changed: 97 additions & 69 deletions

File tree

‎pkg/config/schema/yaml/apm_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ properties:
11681168
default: false
11691169
env_vars:
11701170
- DD_APM_DISABLE_RARE_SAMPLER
1171-
comment: Deprecated
1171+
comment: deprecated
11721172
enable_container_tags_buffer:
11731173
node_type: setting
11741174
type: boolean

‎pkg/config/setup/apm_settings.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ import (
1010
pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model"
1111
)
1212

13-
// Traces specifies the data type used for Vector override. See https://vector.dev/docs/reference/configuration/sources/datadog_agent/ for additional details.
14-
const Traces string = "traces"
15-
1613
func setupAPM(config pkgconfigmodel.Setup) {
1714
config.BindEnvAndSetDefault("apm_config.socket_activation.enabled", true, "DD_APM_SOCKET_ACTIVATION_ENABLED")
1815
config.BindEnvAndSetDefault("apm_config.socket_activation.handle_tcp_probe", true, "DD_APM_SOCKET_ACTIVATION_HANDLE_TCP_PROBE")
@@ -102,11 +99,13 @@ func setupAPM(config pkgconfigmodel.Setup) {
10299
config.BindEnvAndSetDefault("apm_config.decoder_timeout", 1000, "DD_APM_DECODER_TIMEOUT")
103100
config.BindEnvAndSetDefault("apm_config.log_file", "", "DD_APM_LOG_FILE")
104101
config.BindEnvAndSetDefault("apm_config.max_events_per_second", float64(200), "DD_APM_MAX_EPS", "DD_MAX_EPS")
105-
config.BindEnvAndSetDefault("apm_config.max_traces_per_second", float64(10), "DD_APM_MAX_TPS", "DD_MAX_TPS") // deprecated
102+
// deprecated
103+
config.BindEnvAndSetDefault("apm_config.max_traces_per_second", float64(10), "DD_APM_MAX_TPS", "DD_MAX_TPS")
106104
config.BindEnvAndSetDefault("apm_config.target_traces_per_second", float64(10), "DD_APM_TARGET_TPS")
107105
config.BindEnvAndSetDefault("apm_config.errors_per_second", float64(10), "DD_APM_ERROR_TPS")
108106
config.BindEnvAndSetDefault("apm_config.enable_rare_sampler", false, "DD_APM_ENABLE_RARE_SAMPLER")
109-
config.BindEnvAndSetDefault("apm_config.disable_rare_sampler", false, "DD_APM_DISABLE_RARE_SAMPLER") // Deprecated
107+
// deprecated
108+
config.BindEnvAndSetDefault("apm_config.disable_rare_sampler", false, "DD_APM_DISABLE_RARE_SAMPLER")
110109
config.BindEnvAndSetDefault("apm_config.max_remote_traces_per_second", float64(100), "DD_APM_MAX_REMOTE_TPS")
111110
config.BindEnvAndSetDefault("apm_config.probabilistic_sampler.enabled", false, "DD_APM_PROBABILISTIC_SAMPLER_ENABLED")
112111
config.BindEnvAndSetDefault("apm_config.probabilistic_sampler.sampling_percentage", float64(0), "DD_APM_PROBABILISTIC_SAMPLER_SAMPLING_PERCENTAGE")

‎pkg/config/setup/common_settings.go‎

Lines changed: 72 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
3333

3434
config.BindEnvAndSetDefault("metric_lookback.enabled", false)
3535
config.BindEnvAndSetDefault("metric_lookback.enabled_checks", []string{})
36-
config.BindEnvAndSetDefault("metric_lookback.collection_interval", time.Second)
36+
config.BindEnvAndSetDefault("metric_lookback.collection_interval", 1*time.Second)
3737
config.BindEnvAndSetDefault("metric_lookback.capacity", 262144)
3838
config.BindEnvAndSetDefault("metric_lookback.shard_count", 16)
3939
config.BindEnvAndSetDefault("metric_lookback.dogstatsd.metric_names", []string{})
@@ -42,7 +42,7 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
4242
config.BindEnvAndSetDefault("metric_lookback.monitor.evaluation_interval", 30*time.Second)
4343
config.BindEnvAndSetDefault("metric_lookback.monitor.range_epsilon", float64(0))
4444
config.BindEnvAndSetDefault("metric_lookback.monitor.partition_tags", []string{})
45-
config.BindEnvAndSetDefault("metric_lookback.egress.pre_trigger_window", 0*time.Second)
45+
config.BindEnvAndSetDefault("metric_lookback.egress.pre_trigger_window", time.Duration(0))
4646
config.BindEnvAndSetDefault("metric_lookback.egress.post_recovery_window", 30*time.Second)
4747

4848
config.BindEnvAndSetDefault("host_aliases", []string{})
@@ -146,7 +146,7 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
146146
config.BindEnvAndSetDefault("flare.profile_overhead_runtime", 10*time.Second)
147147
config.BindEnvAndSetDefault("flare.rc_profiling.blocking_rate", 0)
148148
config.BindEnvAndSetDefault("flare.rc_profiling.mutex_fraction", 0)
149-
config.BindEnvAndSetDefault("flare.rc_streamlogs.duration", 60*time.Second)
149+
config.BindEnvAndSetDefault("flare.rc_streamlogs.duration", 1*time.Minute)
150150

151151
config.BindEnvAndSetDefault("docker_query_timeout", int64(5))
152152
config.BindEnvAndSetDefault("kubernetes_node_annotations_as_host_aliases", []string{"cluster.k8s.io/machine"})
@@ -435,7 +435,7 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
435435
// value in milliseconds
436436
config.BindEnvAndSetDefault("ecs_metadata_timeout", 1000)
437437
config.BindEnvAndSetDefault("ecs_metadata_retry_initial_interval", 100*time.Millisecond)
438-
config.BindEnvAndSetDefault("ecs_metadata_retry_max_elapsed_time", 3000*time.Millisecond)
438+
config.BindEnvAndSetDefault("ecs_metadata_retry_max_elapsed_time", 3*time.Second)
439439
config.BindEnvAndSetDefault("ecs_metadata_retry_timeout_factor", 3)
440440
config.BindEnvAndSetDefault("ecs_task_collection_enabled", true)
441441
config.BindEnvAndSetDefault("ecs_task_cache_ttl", 3*time.Minute)
@@ -445,11 +445,30 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
445445

446446
config.BindEnvAndSetDefault("collect_gce_tags", true)
447447
config.BindEnvAndSetDefault("exclude_gce_tags", []string{
448-
"bosh_settings", "cli-cert", "common-psm1", "configure-sh", "containerd-configure-sh",
449-
"disable-address-manager", "disable-legacy-endpoints", "enable-oslogin", "gce-container-declaration",
450-
"google-container-manifest", "ipsec-cert", "k8s-node-setup-psm1", "kube-env", "kubeconfig",
451-
"kubelet-config", "serial-port-logging-enable", "shutdown-script", "ssh-keys", "sshKeys", "ssl-cert",
452-
"startup-script", "user-data", "windows-keys", "windows-startup-script-ps1",
448+
"bosh_settings",
449+
"cli-cert",
450+
"common-psm1",
451+
"configure-sh",
452+
"containerd-configure-sh",
453+
"disable-address-manager",
454+
"disable-legacy-endpoints",
455+
"enable-oslogin",
456+
"gce-container-declaration",
457+
"google-container-manifest",
458+
"ipsec-cert",
459+
"k8s-node-setup-psm1",
460+
"kube-env",
461+
"kubeconfig",
462+
"kubelet-config",
463+
"serial-port-logging-enable",
464+
"shutdown-script",
465+
"ssh-keys",
466+
"sshKeys",
467+
"ssl-cert",
468+
"startup-script",
469+
"user-data",
470+
"windows-keys",
471+
"windows-startup-script-ps1",
453472
})
454473
config.BindEnvAndSetDefault("gce_send_project_id_tag", false)
455474
// value in milliseconds
@@ -904,7 +923,16 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
904923
config.BindEnvAndSetDefault("otelcollector.submit_dummy_metadata", false)
905924
config.BindEnvAndSetDefault("otelcollector.converter.enabled", true)
906925
config.BindEnvAndSetDefault("otelcollector.flare.timeout", 60)
907-
config.BindEnvAndSetDefault("otelcollector.converter.features", []string{"infraattributes", "prometheus", "pprof", "zpages", "health_check", "ddflare", "datadog", "cumulativetodelta"})
926+
config.BindEnvAndSetDefault("otelcollector.converter.features", []string{
927+
"infraattributes",
928+
"prometheus",
929+
"pprof",
930+
"zpages",
931+
"health_check",
932+
"ddflare",
933+
"datadog",
934+
"cumulativetodelta",
935+
})
908936
pkgconfighelper.ParseEnvSplitCommaAndSpace("otelcollector.converter.features", config)
909937
config.BindEnvAndSetDefault("otelcollector.gateway.mode", false)
910938
config.BindEnvAndSetDefault("otelcollector.installation_method", "")
@@ -1029,8 +1057,8 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
10291057
config.BindEnvAndSetDefault("installer.registry.auth", "")
10301058
config.BindEnvAndSetDefault("installer.registry.username", "")
10311059
config.BindEnvAndSetDefault("installer.registry.password", "")
1032-
config.BindEnvAndSetDefault("installer.refresh_interval", time.Duration(30*time.Second))
1033-
config.BindEnvAndSetDefault("installer.gc_interval", time.Duration(time.Hour))
1060+
config.BindEnvAndSetDefault("installer.refresh_interval", 30*time.Second)
1061+
config.BindEnvAndSetDefault("installer.gc_interval", 1*time.Hour)
10341062

10351063
// Legacy installer configuration
10361064
config.SetDefault("remote_policies", false)
@@ -1058,9 +1086,9 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) {
10581086
config.BindEnvAndSetDefault("reverse_dns_enrichment.rate_limiter.recovery_intervals", 5)
10591087

10601088
config.BindEnvAndSetDefault("remote_agent.registry.enabled", true)
1061-
config.BindEnvAndSetDefault("remote_agent.registry.idle_timeout", time.Duration(30*time.Second))
1062-
config.BindEnvAndSetDefault("remote_agent.registry.query_timeout", time.Duration(3*time.Second))
1063-
config.BindEnvAndSetDefault("remote_agent.registry.recommended_refresh_interval", time.Duration(10*time.Second))
1089+
config.BindEnvAndSetDefault("remote_agent.registry.idle_timeout", 30*time.Second)
1090+
config.BindEnvAndSetDefault("remote_agent.registry.query_timeout", 3*time.Second)
1091+
config.BindEnvAndSetDefault("remote_agent.registry.recommended_refresh_interval", 10*time.Second)
10641092
config.BindEnvAndSetDefault("remote_agent.configstream.sleep_interval", 10*time.Second)
10651093
config.BindEnvAndSetDefault("remote_agent.configstream.consumer.enabled", false)
10661094

@@ -1201,12 +1229,12 @@ func agent(config pkgconfigmodel.Setup) {
12011229
config.BindEnvAndSetDefault("check_runners", int64(4))
12021230
config.BindEnvAndSetDefault("check_cancel_timeout", 500*time.Millisecond)
12031231
config.BindEnvAndSetDefault("check_runner_utilization_threshold", float64(0.95))
1204-
config.BindEnvAndSetDefault("check_runner_utilization_monitor_interval", 60*time.Second)
1232+
config.BindEnvAndSetDefault("check_runner_utilization_monitor_interval", 1*time.Minute)
12051233
config.BindEnvAndSetDefault("check_runner_utilization_warning_cooldown", 10*time.Minute)
12061234
config.BindEnvAndSetDefault("check_system_probe_startup_time", 5*time.Minute)
1207-
config.BindEnvAndSetDefault("check_system_probe_timeout", 60*time.Second)
1235+
config.BindEnvAndSetDefault("check_system_probe_timeout", 1*time.Minute)
12081236
// If not zero, the agent will log a warning if a check is running for longer than this timeout
1209-
config.BindEnvAndSetDefault("check_watchdog_warning_timeout", 0*time.Second)
1237+
config.BindEnvAndSetDefault("check_watchdog_warning_timeout", time.Duration(0))
12101238
config.BindEnvAndSetDefault("auth_token_file_path", "")
12111239
// used to override the path where the IPC cert/key files are stored/retrieved
12121240
config.BindEnvAndSetDefault("ipc_cert_file_path", "")
@@ -1304,9 +1332,9 @@ func agent(config pkgconfigmodel.Setup) {
13041332
config.BindEnvAndSetDefault("expected_tags_duration", time.Duration(0))
13051333

13061334
// Agent GUI access host
1307-
// 'http://localhost' is preferred over 'http://127.0.0.1' due to Internet Explorer behavior.
1308-
// Internet Explorer High Security Level does not support setting cookies via HTTP Header response.
1309-
// By default, 'http://localhost' is categorized as an "intranet" website, which is considered safer and allowed to use cookies. This is not the case for 'http://127.0.0.1'.
1335+
// 'http://localhost' is preferred over 'http://127.0.0.1' due to Internet Explorer behavior.
1336+
// Internet Explorer High Security Level does not support setting cookies via HTTP Header response.
1337+
// By default, 'http://localhost' is categorized as an "intranet" website, which is considered safer and allowed to use cookies. This is not the case for 'http://127.0.0.1'.
13101338
config.BindEnvAndSetDefault("GUI_host", "localhost")
13111339
// Agent GUI access port
13121340
config.BindEnvAndSetDefault("GUI_port", getPlatformDefault(map[string]interface{}{
@@ -1323,7 +1351,7 @@ func agent(config pkgconfigmodel.Setup) {
13231351
bindEnvAndSetLogsConfigKeys(config, "config_files_discovery.forwarder.")
13241352
config.BindEnvAndSetDefault("config_files_discovery.heartbeat_interval", time.Hour)
13251353
config.BindEnvAndSetDefault("config_files_discovery.heartbeat_jitter", 10*time.Minute)
1326-
config.BindEnvAndSetDefault("config_files_discovery.startup_jitter", time.Minute)
1354+
config.BindEnvAndSetDefault("config_files_discovery.startup_jitter", 1*time.Minute)
13271355

13281356
config.BindEnvAndSetDefault("software_inventory.enabled", false)
13291357
config.BindEnvAndSetDefault("software_inventory.jitter", 60)
@@ -1372,19 +1400,19 @@ func agent(config pkgconfigmodel.Setup) {
13721400
// it maps group resources to labels as tags maps
13731401
// a group resource has the format `{resource}.{group}`, or simply `{resource}` if it belongs to the empty group
13741402
// examples of group resources:
1375-
// - `deployments.apps`
1376-
// - `statefulsets.apps`
1377-
// - `pods`
1378-
// - `nodes`
1403+
// - `deployments.apps`
1404+
// - `statefulsets.apps`
1405+
// - `pods`
1406+
// - `nodes`
13791407
config.BindEnvAndSetDefault("kubernetes_resources_labels_as_tags", "{}")
13801408
// kubernetes_resources_annotations_as_tags should be parseable as map[string]map[string]string
13811409
// it maps group resources to annotations as tags maps
13821410
// a group resource has the format `{resource}.{group}`, or simply `{resource}` if it belongs to the empty group
13831411
// examples of group resources:
1384-
// - `deployments.apps`
1385-
// - `statefulsets.apps`
1386-
// - `pods`
1387-
// - `nodes`
1412+
// - `deployments.apps`
1413+
// - `statefulsets.apps`
1414+
// - `pods`
1415+
// - `nodes`
13881416
config.BindEnvAndSetDefault("kubernetes_resources_annotations_as_tags", "{}")
13891417
config.BindEnvAndSetDefault("provider_kind", "")
13901418

@@ -1659,7 +1687,7 @@ func forwarder(config pkgconfigmodel.Setup) {
16591687
// 0 means disabled. This is a BETA feature.
16601688
config.BindEnvAndSetDefault("forwarder_storage_max_size_in_bytes", 0)
16611689
// Do not store transactions on disk when the disk usage exceeds 80% of the disk capacity. Use 80% as some applications do not behave well when the disk space is very small.
1662-
config.BindEnvAndSetDefault("forwarder_storage_max_disk_ratio", float64(0.80))
1690+
config.BindEnvAndSetDefault("forwarder_storage_max_disk_ratio", float64(0.8))
16631691
// 15 mins
16641692
config.BindEnvAndSetDefault("forwarder_retry_queue_capacity_time_interval_sec", 900)
16651693

@@ -1863,11 +1891,10 @@ func logsagent(config pkgconfigmodel.Setup) {
18631891
//
18641892
// There is no effective limit for windows due to use of CreateFile win32 API
18651893
// The OS default for most linux distributions is 1024
1866-
config.BindEnvAndSetDefault("logs_config.open_files_limit",
1867-
getPlatformDefault(map[string]interface{}{
1868-
"darwin": 200,
1869-
"other": 500,
1870-
}))
1894+
config.BindEnvAndSetDefault("logs_config.open_files_limit", getPlatformDefault(map[string]interface{}{
1895+
"darwin": 200,
1896+
"other": 500,
1897+
}))
18711898
// add global processing rules that are applied on all logs
18721899
config.BindEnvAndSetDefault("logs_config.processing_rules", []interface{}{})
18731900
// enforce the agent to use files to collect container logs on kubernetes environment
@@ -2069,18 +2096,16 @@ func logsagent(config pkgconfigmodel.Setup) {
20692096
// Max disk usage in MB all integrations logs files are allowed to use in total
20702097
config.BindEnvAndSetDefault("logs_config.integrations_logs_total_usage", 100)
20712098
// Do not store logs on disk when the disk usage exceeds 80% of the disk capacity.
2072-
config.BindEnvAndSetDefault("logs_config.integrations_logs_disk_ratio", float64(0.80))
2099+
config.BindEnvAndSetDefault("logs_config.integrations_logs_disk_ratio", float64(0.8))
20732100

20742101
// Control how the stream-logs log file is managed
20752102
config.BindEnvAndSetDefault("logs_config.streaming.streamlogs_log_file", "${log_path}/streamlogs_info/streamlogs.log")
20762103

20772104
// If true, then the registry file will be written atomically. This behavior is not supported on ECS Fargate.
2078-
config.BindEnvAndSetDefault("logs_config.atomic_registry_write",
2079-
getPlatformDefault(map[string]interface{}{
2080-
"fargate": false,
2081-
"other": true,
2082-
}),
2083-
)
2105+
config.BindEnvAndSetDefault("logs_config.atomic_registry_write", getPlatformDefault(map[string]interface{}{
2106+
"fargate": false,
2107+
"other": true,
2108+
}))
20842109

20852110
// If true, exclude agent processes from process log collection
20862111
config.BindEnvAndSetDefault("logs_config.process_exclude_agent", false)
@@ -2090,7 +2115,6 @@ func logsagent(config pkgconfigmodel.Setup) {
20902115
config.BindEnvAndSetDefault("logs_config.pipeline_failover.router_channel_size", 5)
20912116
}
20922117

2093-
// vector integration
20942118
func vector(config pkgconfigmodel.Setup) {
20952119
config.BindEnvAndSetDefault("observability_pipelines_worker.metrics.enabled", false)
20962120
config.BindEnvAndSetDefault("observability_pipelines_worker.metrics.url", "")
@@ -2290,18 +2314,18 @@ func anomalyDetection(config pkgconfigmodel.Setup) {
22902314
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.saturation_k", float64(5))
22912315
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.window", 15*time.Second)
22922316
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.low_threshold", float64(0.15))
2293-
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.high_threshold", float64(0.40))
2294-
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.margin_pct", float64(0.20))
2317+
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.high_threshold", float64(0.4))
2318+
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.margin_pct", float64(0.2))
22952319
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.output.correlation_events", false)
22962320
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.output.correlation_event_threshold", "high")
22972321
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.output.logs", false)
2298-
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.output.cooldown", 300*time.Second)
2322+
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.output.cooldown", 5*time.Minute)
22992323
config.BindEnvAndSetDefault("anomaly_detection.anomaly_scorer.output.max_anomalies", 50)
23002324

23012325
// Storage tuning. See storageConfig in the observer component.
23022326
config.BindEnvAndSetDefault("anomaly_detection.storage.max_series", 50000)
23032327
config.BindEnvAndSetDefault("anomaly_detection.storage.eviction_floor_ratio", float64(0.5))
2304-
config.BindEnvAndSetDefault("anomaly_detection.storage.point_retention", 120*time.Second)
2328+
config.BindEnvAndSetDefault("anomaly_detection.storage.point_retention", 2*time.Minute)
23052329

23062330
// Baseline analysis window.
23072331
config.BindEnvAndSetDefault("anomaly_detection.baseline_analysis.enabled", true)

‎pkg/config/setup/config.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ const (
4343

4444
// maxExternalMetricsProviderChunkSize ensures batch queries are limited in size.
4545
maxExternalMetricsProviderChunkSize = 35
46+
47+
// Traces specifies the data type used for Vector override. See https://vector.dev/docs/reference/configuration/sources/datadog_agent/ for additional details.
48+
Traces string = "traces"
4649
)
4750

4851
var (

‎pkg/config/setup/generated.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,26 @@ type delegatedAuthConfig struct {
2020
// delegatedAuthKeys list all the "delegated_auth" configuration section.
2121
// This list is used to fully initialize authentication through cloud provider instead of API key
2222
var delegatedAuthKeys = []delegatedAuthConfig{
23-
2423
{
2524
apiKeyPath: "remote_configuration.api_key",
2625
delegatedAuthPath: "remote_configuration.delegated_auth",
2726
description: "remote_configuration",
2827
},
29-
3028
{
3129
apiKeyPath: "logs_config.api_key",
3230
delegatedAuthPath: "logs_config.delegated_auth",
3331
description: "logs_config",
3432
},
35-
3633
{
3734
apiKeyPath: "api_key",
3835
delegatedAuthPath: "delegated_auth",
3936
description: "global",
4037
},
41-
4238
{
4339
apiKeyPath: "evp_proxy_config.api_key",
4440
delegatedAuthPath: "evp_proxy_config.delegated_auth",
4541
description: "evp_proxy_config",
4642
},
47-
4843
{
4944
apiKeyPath: "ol_proxy_config.api_key",
5045
delegatedAuthPath: "ol_proxy_config.delegated_auth",

0 commit comments

Comments
 (0)