8000 fix config edit when there is no EOL by clarkb7 · Pull Request #38054 · DataDog/datadog-agent · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix config edit when there is no EOL #38054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 12 commits into from
Jun 20, 2025
Merged

fix config edit when there is no EOL #38054

merged 12 commits into from
Jun 20, 2025

Conversation

clarkb7
Copy link
Contributor
@clarkb7 clarkb7 commented Jun 18, 2025

What does this PR do?

Fix how Install-Datadog.ps1 modifies datadog.yaml when it does not end with a newline character.

Motivation

https://datadoghq.atlassian.net/browse/WINA-1561
causes an invalid configuration which causes the Agent to fail to start

Describe how you validated your changes

add unit tests

Possible Drawbacks / Trade-offs

We want to consolidate the config edit behavior into the Go code and when that's done we'll remove all of this PowerShell code. But since it's a critical issue we're fixing it in the PowerShell anyway.

Additional Notes

@clarkb7 clarkb7 requested review from a team as code owners June 18, 2025 17:44
@github-actions github-actions bot added team/windows-agent medium review PR review might take time labels Jun 18, 2025
@clarkb7 clarkb7 added the qa/done QA done before merge and regressions are covered by tests label Jun 18, 2025
@cit-pr-commenter cit-pr-commenter
Copy link
cit-pr-commenter bot commented Jun 18, 2025 •
edited
Loading

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 743ec0bf-533b-4831-be7e-6485edf694af

Baseline: ceb5d8c
Comparison: c71df05
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
➖ docker_containers_memory memory utilization +1.13 [+1.06, +1.21] 1 Logs
➖ tcp_syslog_to_blackhole ingress throughput +0.89 [+0.83, +0.95] 1 Logs
➖ uds_dogstatsd_to_api_cpu % cpu utilization +0.56 [-0.35, +1.48] 1 Logs
➖ file_to_blackhole_0ms_latency egress throughput +0.08 [-0.50, +0.66] 1 Logs
➖ file_to_blackhole_100ms_latency egress throughput +0.07 [-0.49, +0.64] 1 Logs
➖ quality_gate_logs % cpu utilization +0.07 [-2.68, +2.83] 1 Logs bounds checks dashboard
➖ file_to_blackhole_500ms_latency egress throughput +0.04 [-0.56, +0.64] 1 Logs
➖ file_to_blackhole_1000ms_latency_linear_load egress throughput +0.03 [-0.20, +0.27] 1 Logs
➖ file_to_blackhole_300ms_latency egress throughput +0.03 [-0.57, +0.63] 1 Logs
➖ uds_dogstatsd_to_api ingress throughput +0.00 [-0.26, +0.26] 1 Logs
➖ tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.02, +0.02] 1 Logs
➖ file_to_blackhole_1000ms_latency egress throughput -0.02 [-0.61, +0.57] 1 Logs
➖ file_to_blackhole_0ms_latency_http2 egress throughput -0.06 [-0.61, +0.49] 1 Logs
➖ otlp_ingest_logs memory utilization -0.14 [-0.27, -0.01] 1 Logs
➖ file_to_blackhole_0ms_latency_http1 egress throughput -0.16 [-0.77, +0.44] 1 Logs
➖ file_tree memory utilization -0.18 [-0.38, +0.02] 1 Logs
➖ uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.25 [-0.30, -0.21] 1 Logs
➖ ddot_logs memory utilization -0.26 [-0.38, -0.15] 1 Logs
➖ ddot_metrics memory utilization -0.38 [-0.49, -0.26] 1 Logs
➖ otlp_ingest_metrics memory utilization -0.48 [-0.64, -0.32] 1 Logs
➖ quality_gate_idle memory utilization -0.69 [-0.76, -0.63] 1 Logs bounds checks dashboard
➖ quality_gate_idle_all_features memory utilization -1.17 [-1.29, -1.05] 1 Logs bounds checks dashboard
➖ docker_containers_cpu % cpu utilization -3.46 [-6.39, -0.54] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
✅ docker_containers_cpu simple_check_run 10/10
✅ docker_containers_memory memory_usage 10/10
✅ docker_containers_memory simple_check_run 10/10
✅ file_to_blackhole_0ms_latency lost_bytes 10/10
✅ file_to_blackhole_0ms_latency memory_usage 10/10
✅ file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
✅ file_to_blackhole_0ms_latency_http1 memory_usage 10/10
✅ file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
✅ file_to_blackhole_0ms_latency_http2 memory_usage 10/10
✅ file_to_blackhole_1000ms_latency memory_usage 10/10
✅ file_to_blackhole_1000ms_latency_linear_load memory_usage 10/10
✅ file_to_blackhole_100ms_latency lost_bytes 10/10
✅ file_to_blackhole_100ms_latency memory_usage 10/10
✅ file_to_blackhole_300ms_latency lost_bytes 10/10
✅ file_to_blackhole_300ms_latency memory_usage 10/10
✅ file_to_blackhole_500ms_latency lost_bytes 10/10
✅ file_to_blackhole_500ms_latency memory_usage 10/10
✅ quality_gate_idle intake_connections 10/10 bounds checks dashboard
✅ quality_gate_idle memory_usage 10/10 bounds checks dashboard
✅ quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
✅ quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
✅ quality_gate_logs intake_connections 10/10 bounds checks dashboard
✅ quality_gate_logs lost_bytes 10/10 bounds checks dashboard
✅ quality_gate_logs memory_usage 10/10 bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

✅ Passed. All Quality Gates passed.

  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor
agent-platform-auto-pr bot commented Jun 18, 2025 •
edited
Loading

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor ceb5d8c

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
✅ agent_deb_amd64 $${+0}$$ $${697.02}$$ < $${697.37}$$ $${+0.01}$$ $${176.07}$$ < $${177.03}$$
✅ agent_deb_amd64_fips $${+0}$$ $${695.32}$$ < $${695.59}$$ $${+0.01}$$ $${175.57}$$ < $${176.51}$$
✅ agent_heroku_amd64 $${0}$$ $${358.68}$$ < $${359.67}$$ $${+0}$$ $${96.53}$$ < $${97.47}$$
✅ agent_msi $${0}$$ $${958.84}$$ < $${959.86}$$ $${+0.02}$$ $${146.3}$$ < $${147.27}$$
✅ agent_rpm_amd64 $${+0}$$ $${697.01}$$ < $${697.36}$$ $${-0.05}$$ $${177.66}$$ < $${178.56}$$
✅ agent_rpm_amd64_fips $${+0}$$ $${695.31}$$ < $${695.58}$$ $${-0.04}$$ $${177.52}$$ < $${178.43}$$
✅ agent_rpm_arm64 $${+0}$$ $${687.03}$$ < $${687.37}$$ $${-0.05}$$ $${161.08}$$ < $${161.99}$$
✅ agent_rpm_arm64_fips $${+0}$$ $${685.44}$$ < $${685.72}$$ $${+0.02}$$ $${160.27}$$ < $${161.11}$$
✅ agent_suse_amd64 $${+0}$$ $${697.01}$$ < $${697.36}$$ $${-0.05}$$ $${177.66}$$ < $${178.56}$$
✅ agent_suse_amd64_fips $${+0}$$ $${695.31}$$ < $${695.58}$$ $${-0.04}$$ $${177.52}$$ < $${178.43}$$
✅ agent_suse_arm64 $${+0}$$ $${687.03}$$ < $${687.37}$$ $${-0.05}$$ $${161.08}$$ < $${161.99}$$
✅ agent_suse_arm64_fips $${+0}$$ $${685.44}$$ < $${685.72}$$ $${+0.02}$$ $${160.27}$$ < $${161.11}$$
✅ docker_agent_amd64 $${+0.01}$$ $${780.82}$$ < $${781.16}$$ $${+0}$$ $${268.8}$$ < $${269.63}$$
✅ docker_agent_arm64 $${+0.01}$$ $${794.29}$$ < $${794.62}$$ $${+0.01}$$ $${256.14}$$ < $${257.0}$$
✅ docker_agent_jmx_amd64 $${+0.01}$$ $${972.02}$$ < $${972.35}$$ $${-0.01}$$ $${337.75}$$ < $${338.6}$$
✅ docker_agent_jmx_arm64 $${+0.01}$$ $${974.08}$$ < $${974.41}$$ $${-0}$$ $${321.09}$$ < $${321.97}$$
✅ docker_agent_windows1809 $${+0}$$ $${1486.98}$$ < $${1488.0}$$ $${-0.03}$$ $${488.01}$$ < $${488.95}$$
✅ docker_agent_windows1809_core $${+0}$$ $${6216.94}$$ < $${6218.0}$$ $${0}$$ $${2048.0}$$ < $${2049.0}$$
✅ docker_agent_windows1809_core_jmx $${+22.26}$$ $${6360.77}$$ < $${6361.0}$$ $${0}$$ $${2048.0}$$ < $${2049.0}$$
✅ docker_agent_windows1809_jmx $${-0}$$ $${1608.62}$$ < $${1609.5}$$ $${+0.06}$$ $${530.38}$$ < $${531.32}$$
✅ docker_agent_windows2022 $${-0.12}$$ $${1506.14}$$ < $${1507.0}$$ $${+0}$$ $${500.75}$$ < $${501.7}$$
✅ docker_agent_windows2022_core $${-0}$$ $${6190.07}$$ < $${6311.0}$$ $${0}$$ $${2048.0}$$ < $${2049.0}$$
✅ docker_agent_windows2022_core_jmx $${-0.09}$$ $${6311.83}$$ < $${6313.0}$$ $${0}$$ $${2048.0}$$ < $${2049.0}$$
✅ docker_agent_windows2022_jmx $${+0.04}$$ $${1627.73}$$ < $${1628.16}$$ $${-0}$$ $${543.03}$$ < $${543.98}$$
✅ docker_cluster_agent_amd64 $${+0.01}$$ $${212.85}$$ < $${213.79}$$ $${+0.01}$$ $${72.39}$$ < $${73.33}$$
✅ docker_cluster_agent_arm64 $${+0.01}$$ $${228.69}$$ < $${229.64}$$ $${+0.01}$$ $${68.65}$$ < $${69.6}$$
✅ docker_cws_instrumentation_amd64 $${0}$$ $${7.08}$$ < $${7.12}$$ $${+0}$$ $${2.95}$$ < $${3.29}$$
✅ docker_cws_instrumentation_arm64 $${0}$$ $${6.69}$$ < $${6.92}$$ $${+0}$$ $${2.7}$$ < $${3.07}$$
✅ docker_dogstatsd_amd64 $${+0}$$ $${39.22}$$ < $${39.57}$$ $${-0}$$ $${15.12}$$ < $${15.76}$$
✅ docker_dogstatsd_arm64 $${-0}$$ $${37.88}$$ < $${38.2}$$ $${+0}$$ $${14.53}$$ < $${14.83}$$
✅ dogstatsd_deb_amd64 $${0}$$ $${30.45}$$ < $${31.4}$$ $${+0}$$ $${8.0}$$ < $${8.95}$$
✅ dogstatsd_deb_arm64 $${0}$$ $${29.02}$$ < $${29.97}$$ $${+0}$$ $${6.94}$$ < $${7.89}$$
✅ dogstatsd_rpm_amd64 $${0}$$ $${30.45}$$ < $${31.4}$$ $${+0}$$ $${8.01}$$ < $${8.96}$$
✅ dogstatsd_suse_amd64 $${0}$$ $${30.45}$$ < $${31.4}$$ $${+0}$$ $${8.01}$$ < $${8.96}$$
✅ iot_agent_deb_amd64 $${0}$$ $${50.44}$$ < $${51.38}$$ $${+0}$$ $${12.85}$$ < $${13.79}$$
✅ iot_agent_deb_arm64 $${0}$$ $${47.91}$$ < $${48.85}$$ $${-0}$$ $${11.14}$$ < $${12.09}$$
✅ iot_agent_deb_armhf $${0}$$ $${47.48}$$ < $${48.42}$$ $${-0.01}$$ $${11.2}$$ < $${12.16}$$
✅ iot_agent_rpm_amd64 $${0}$$ $${50.44}$$ < $${51.38}$$ $${-0}$$ $${12.86}$$ < $${13.81}$$
✅ iot_agent_rpm_arm64 $${0}$$ $${47.91}$$ < $${48.85}$$ $${+0}$$ $${11.16}$$ < $${12.11}$$
✅ iot_agent_suse_amd64 $${0}$$ $${50.44}$$ < $${51.38}$$ $${-0}$$ $${12.86}$$ < $${13.81}$$

@buraizu buraizu self-assigned this Jun 18, 2025
@clarkb7 clarkb7 added the ask-review Ask required teams to review this PR label Jun 18, 2025
@clarkb7
Copy link
Contributor Author
clarkb7 commented Jun 20, 2025

/merge

@dd-devflow
Copy link
dd-devflow bot commented Jun 20, 2025 •
edited
Loading

View all feedbacks in Devflow UI.

2025-06-20 15:02:31 UTC ℹ️ Start processing command /merge

2025-06-20 15:02:40 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

2025-06-20 16:50:17 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in main is approximately 1h (p90).

2025-06-20 17:27:50 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit 8b8f1e5 into main Jun 20, 2025
220 checks passed
@dd-mergequeue dd-mergequeue bot deleted the branden.clark/fix-ps1-config-edit branch June 20, 2025 17:27
@github-actions github-actions bot added this to the 7.69.0 milestone Jun 20, 2025
@clarkb7 clarkb7 added the backport/7.67.x Automatically create a backport PR to 7.67.x label Jun 20, 2025
agent-platform-auto-pr bot pushed a commit that referenced this pull request Jun 20, 2025
@clarkb7 @github-actions
fix config edit when there is no EOL (#38054)
d778d12 
(cherry picked from commit 8b8f1e5)
@agent-platform-auto-pr agent-platform-auto-pr bot mentioned this pull request Jun 20, 2025
Merged
@clarkb7 clarkb7 added the backport/7.68.x Automatically create a backport PR to 7.68.x label Jun 23, 2025
agent-platform-auto-pr bot pushed a commit that referenced this pull request Jun 23, 2025
@clarkb7 @github-actions
fix config edit when there is no EOL (#38054)
a35bbaf 
(cherry picked from commit 8b8f1e5)
@agent-platform-auto-pr agent-platform-auto-pr bot mentioned this pull request Jun 23, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julien-lebot julien-lebot julien-lebot approved these changes

@buraizu buraizu buraizu approved these changes

Assignees

@buraizu buraizu

Labels
ask-review Ask required teams to review this PR backport/7.67.x Automatically create a backport PR to 7.67.x backport/7.68.x Automatically create a backport PR to 7.68.x medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/windows-agent
Projects
None yet
Milestone
7.69.0
Development

Successfully merging this pull request may close these issues.
3 participants
@clarkb7 @julien-lebot @buraizu
0