Skip to content

initial commit for fleet config experiments on Windows #37421

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.

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

Open
wants to merge 21 commits into
base: main
Choose a base branch
from

Conversation

clarkb7
Copy link
Contributor

@clarkb7 clarkb7 commented May 27, 2025

What does this PR do?

initial commit for fleet config experiments on Windows

On config load, fleet merges configs from the directory provided by fleet_policies_dir config option with the Agent config. The option should point to either the experiment or stable symlinks. On Windows, we set this value through a registry key.

Motivation

https://datadoghq.atlassian.net/browse/WINA-878
See linked doc for more info

Describe how you validated your changes

new e2e tests that

  • basic config that sets log_level
  • invalid config
  • config that starts new services (datadog-system-probe, datadog-security-agent)

Possible Drawbacks / Trade-offs

Additional Notes

will have follow-up commits for

Once viper migration is complete, we may consider using a registry config layer/source to set fleet_policies_dir rather than the AddOverrideFunc we're using now. This will help ensure the option is set, rather than relying on the config load code to apply the override (see special case for system-probe which uses a separate load function, for example).

@clarkb7 clarkb7 requested review from a team as code owners May 27, 2025 18:41
@clarkb7 clarkb7 added the qa/done QA done before merge and regressions are covered by tests label May 27, 2025
@clarkb7 clarkb7 requested a review from hush-hush May 27, 2025 18:41
@github-actions github-actions bot added the long review PR is complex, plan time to review it label May 27, 2025
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented May 27, 2025

Gitlab CI Configuration Changes

Modified Jobs

new-e2e-installer-windows
  new-e2e-installer-windows:
    after_script:
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh "junit-${CI_JOB_ID}.tgz" "$E2E_RESULT_JSON"
    artifacts:
      expire_in: 2 weeks
      paths:
      - $E2E_OUTPUT_DIR
      - $E2E_RESULT_JSON
      - junit-*.tgz
      reports:
        annotations:
        - $EXTERNAL_LINKS_PATH
      when: always
    before_script:
    - CURRENT_AGENT_VERSION=$(dda inv agent.version) || exit $?; export CURRENT_AGENT_VERSION
    - CURRENT_AGENT_VERSION_PACKAGE=$(dda inv agent.version --url-safe)-1 || exit $?;
      export CURRENT_AGENT_VERSION_PACKAGE
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_e2e.tar.xz
    - mkdir -p ~/.aws
    - "if [ -n \"$E2E_USE_AWS_PROFILE\" ]; then\n  echo Using agent-qa-ci aws profile\n\
      \  $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E profile >> ~/.aws/config\
      \ || exit $?\n  # Now all `aws` commands target the agent-qa profile\n  export\
      \ AWS_PROFILE=agent-qa-ci\nelse\n  # Assume role to fetch only once credentials\
      \ and avoid rate limits\n  echo Assuming ddbuild-agent-ci role\n  roleoutput=\"\
      $(aws sts assume-role --role-arn arn:aws:iam::669783387624:role/ddbuild-agent-ci\
      \ --external-id ddbuild-agent-ci --role-session-name RoleSession)\"\n  export\
      \ AWS_ACCESS_KEY_ID=\"$(echo \"$roleoutput\" | jq -r '.Credentials.AccessKeyId')\"\
      \n  export AWS_SECRET_ACCESS_KEY=\"$(echo \"$roleoutput\" | jq -r '.Credentials.SecretAccessKey')\"\
      \n  export AWS_SESSION_TOKEN=\"$(echo \"$roleoutput\" | jq -r '.Credentials.SessionToken')\"\
      \nfi\n"
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_AWS_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_AWS_PRIVATE_KEY_PATH && chmod 600 $E2E_AWS_PRIVATE_KEY_PATH && $CI_PROJECT_DIR/tools/ci/fetch_secret.sh
      $AGENT_QA_E2E ssh_key_rsa > $E2E_AWS_PRIVATE_KEY_PATH || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_AZURE_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_AZURE_PRIVATE_KEY_PATH && chmod 600 $E2E_AZURE_PRIVATE_KEY_PATH &&
      $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_key_rsa > $E2E_AZURE_PRIVATE_KEY_PATH
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_GCP_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_GCP_PRIVATE_KEY_PATH && chmod 600 $E2E_GCP_PRIVATE_KEY_PATH && $CI_PROJECT_DIR/tools/ci/fetch_secret.sh
      $AGENT_QA_E2E ssh_key_rsa > $E2E_GCP_PRIVATE_KEY_PATH || exit $?
    - pulumi login "s3://dd-pulumi-state?region=us-east-1&awssdk=v2&profile=$AWS_PROFILE"
    - ARM_CLIENT_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE client_id)
      || exit $?; export ARM_CLIENT_ID
    - ARM_CLIENT_SECRET=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE token)
      || exit $?; export ARM_CLIENT_SECRET
    - ARM_TENANT_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE tenant_id)
      || exit $?; export ARM_TENANT_ID
    - ARM_SUBSCRIPTION_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE subscription_id)
      || exit $?; export ARM_SUBSCRIPTION_ID
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_GCP credentials_json > ~/gcp-credentials.json
      || exit $?
    - export GOOGLE_APPLICATION_CREDENTIALS=~/gcp-credentials.json
    - dda inv -- -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
    image: registry.ddbuild.io/ci/test-infra-definitions/runner$TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX:$TEST_INFRA_DEFINITIONS_BUILDIMAGES
    needs:
    - go_e2e_deps
    - deploy_windows_testing-a7
    - deploy_installer_oci
    - deploy_agent_oci
    - qa_installer_script_windows
    parallel:
      matrix:
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestUpgradeMSI$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestUpgradeAgentPackage$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestUpgradeAgentPackageWithAltDir$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestUpgradeAgentPackageAfterRollback$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestDowngradeAgentPackage$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestStopExperiment$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestExperimentForNonExistingPackageFails$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestExperimentCurrentVersionFails$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestStopWithoutExperiment$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestRevertsExperimentWhenServiceDies$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestRevertsExperimentWhenTimeout$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestExperimentMSIRollbackMaintainsCustomUserAndAltDir$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestRevertsExperimentWhenServiceDiesMaintainsCustomUserAndAltDir$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestRunAgentMSIAfterExperiment$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$/TestUpgradeWithAgentUser$"
      - EXTRA_PARAMS: --run "TestAgentUpgradesOnDC$/TestUpgradeMSI$"
      - EXTRA_PARAMS: --run "TestAgentUpgradesOnDC$/TestUpgradeAgentPackage$"
      - EXTRA_PARAMS: --run "TestAgentUpgradesOnDCWithGMSA$/TestUpgradeMSI$"
      - EXTRA_PARAMS: --run "TestAgentUpgradesOnDCWithGMSA$/TestUpgradeAgentPackage$"
      - EXTRA_PARAMS: --run "TestAgentUpgradesFromGA$/TestUpgradeAgentPackage$"
      - EXTRA_PARAMS: --run "TestAgentUpgradesFromGA$/TestUpgradeAgentPackageAfterRollback$"
+     - EXTRA_PARAMS: --run "TestAgentConfig$/TestConfigUpgradeSuccessful$"
+     - EXTRA_PARAMS: --run "TestAgentConfig$/TestConfigUpgradeFailure$"
+     - EXTRA_PARAMS: --run "TestAgentConfig$/TestConfigUpgradeNewAgents$"
      - EXTRA_PARAMS: --run "TestInstallExe$/TestInstallAgentPackage$"
      - EXTRA_PARAMS: --run "TestInstallScript$/TestInstallAgentPackage$"
      - EXTRA_PARAMS: --run "TestInstallScript$/TestInstallFromOldInstaller$"
      - EXTRA_PARAMS: --run "TestInstallScript$/TestFailedUnsupportedVersion$"
      - EXTRA_PARAMS: --run "TestInstallScriptWithAgentUser$"
      - EXTRA_PARAMS: --run "TestInstallScriptWithAgentUserOnDC$"
      - EXTRA_PARAMS: --run "TestInstaller$"
      - EXTRA_PARAMS: --run "TestDotnetLibraryInstalls$"
      - EXTRA_PARAMS: --run "TestDotnetLibraryInstallsWithoutIIS/TestInstallDotnetLibraryPackageWithoutIIS$"
      - EXTRA_PARAMS: --run "TestDotnetLibraryInstallsWithoutIIS/TestMSIInstallDotnetLibraryFailsWithoutIIS$"
      - EXTRA_PARAMS: --run "TestAgentMSIInstallsDotnetLibrary/TestInstallFromMSI$"
      - EXTRA_PARAMS: --run "TestAgentMSIInstallsDotnetLibrary/TestMSIThenRemoteUpgrade$"
      - EXTRA_PARAMS: --run "TestAgentMSIInstallsDotnetLibrary/TestUpgradeWithMSI$"
      - EXTRA_PARAMS: --run "TestAgentMSIInstallsDotnetLibrary/TestMSIRollbackRemovesLibrary$"
      - EXTRA_PARAMS: --run "TestAgentMSIInstallsDotnetLibrary/TestMSISkipRollbackIfInstalled$"
      - EXTRA_PARAMS: --run "TestAgentMSIInstallsDotnetLibrary/TestUninstallKeepsLibrary$"
    retry: 1
    rules:
    - if: $RUN_E2E_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $RUN_E2E_TESTS == "on"
      when: on_success
    - if: $CI_COMMIT_BRANCH == "main"
      when: on_success
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      when: on_success
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      when: on_success
    - changes:
        compare_to: $COMPARE_TO_BRANCH
        paths:
        - .gitlab/e2e/e2e.yml
        - test/new-e2e/pkg/**/*
        - test/new-e2e/go.mod
        - flakes.yaml
        - release.json
    - changes:
        compare_to: $COMPARE_TO_BRANCH
        paths:
        - .gitlab/**/*
        - omnibus/config/**/*
        - pkg/fleet/**/*
        - cmd/installer/**/*
        - test/new-e2e/tests/installer/**/*
        - tasks/installer.py
      when: on_success
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      when: manual
    script:
    - dda inv -- -e new-e2e-tests.run --local-package $CI_PROJECT_DIR/$OMNIBUS_BASE_DIR
      --result-json $E2E_RESULT_JSON --targets $TARGETS -c ddagent:imagePullRegistry=669783387624.dkr.ecr.us-east-1.amazonaws.com
      -c ddagent:imagePullUsername=AWS -c ddagent:imagePullPassword=$(aws ecr get-login-password)
      --junit-tar junit-${CI_JOB_ID}.tgz ${EXTRA_PARAMS} --test-washer --logs-folder=$E2E_OUTPUT_DIR/logs
      --logs-post-processing --logs-post-processing-test-depth=$E2E_LOGS_PROCESSING_TEST_DEPTH
    stage: e2e
    tags:
    - arch:amd64
    variables:
      E2E_AWS_PRIVATE_KEY_PATH: /tmp/agent-qa-aws-ssh-key
      E2E_AWS_PUBLIC_KEY_PATH: /tmp/agent-qa-aws-ssh-key.pub
      E2E_AZURE_PRIVATE_KEY_PATH: /tmp/agent-qa-azure-ssh-key
      E2E_AZURE_PUBLIC_KEY_PATH: /tmp/agent-qa-azure-ssh-key.pub
      E2E_COMMIT_SHA: $CI_COMMIT_SHORT_SHA
      E2E_GCP_PRIVATE_KEY_PATH: /tmp/agent-qa-gcp-ssh-key
      E2E_GCP_PUBLIC_KEY_PATH: /tmp/agent-qa-gcp-ssh-key.pub
      E2E_KEY_PAIR_NAME: datadog-agent-ci-rsa
      E2E_LOGS_PROCESSING_TEST_DEPTH: 1
      E2E_OUTPUT_DIR: $CI_PROJECT_DIR/e2e-output
      E2E_PIPELINE_ID: $CI_PIPELINE_ID
      E2E_RESULT_JSON: $CI_PROJECT_DIR/e2e_test_output.json
      E2E_USE_AWS_PROFILE: 'false'
      EXTERNAL_LINKS_PATH: external_links_$CI_JOB_ID.json
      FLAKY_PATTERNS_CONFIG: $CI_PROJECT_DIR/flaky-patterns-runtime.yaml
      FLEET_INSTALL_METHOD: windows
      KUBERNETES_CPU_REQUEST: 6
      KUBERNETES_MEMORY_LIMIT: 16Gi
      KUBERNETES_MEMORY_REQUEST: 12Gi
      SHOULD_RUN_IN_FLAKES_FINDER: 'true'
      TARGETS: ./tests/installer/windows
      TEAM: fleet

Changes Summary

Removed Modified Added Renamed
0 1 0 0

ℹ️ Diff available in the job log.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented May 27, 2025

Uncompressed package size comparison

Comparison with ancestor 06e08cf387fb430c0acb1508a8e0b55778d2f6c7

Diff per package
package diff status size ancestor threshold
datadog-agent-arm64-deb 0.01MB ⚠️ 760.38MB 760.37MB 0.50MB
datadog-agent-aarch64-rpm 0.01MB ⚠️ 769.31MB 769.30MB 0.50MB
datadog-agent-x86_64-rpm 0.00MB 783.22MB 783.22MB 0.50MB
datadog-agent-x86_64-suse 0.00MB 783.22MB 783.22MB 0.50MB
datadog-agent-amd64-deb 0.00MB 774.27MB 774.27MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 31.99MB 31.99MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 32.07MB 32.07MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 32.07MB 32.07MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 30.47MB 30.47MB 0.50MB
datadog-heroku-agent-amd64-deb 0.00MB 380.65MB 380.65MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 62.80MB 62.80MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 62.88MB 62.88MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 62.88MB 62.88MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 59.37MB 59.37MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 59.45MB 59.45MB 0.50MB

Decision

⚠️ Warning

Copy link

cit-pr-commenter bot commented May 27, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 8f6ae4e9-9202-475a-b032-3badbe91ae1f

Baseline: 3aca5c9
Comparison: daf5a57
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
tcp_syslog_to_blackhole ingress throughput +1.88 [+1.83, +1.93] 1 Logs
quality_gate_logs % cpu utilization +1.87 [-0.94, +4.68] 1 Logs bounds checks dashboard
uds_dogstatsd_to_api_cpu % cpu utilization +1.65 [+0.78, +2.52] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput +0.10 [-0.50, +0.70] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.05 [-0.02, +0.12] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.01 [-0.66, +0.69] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.00 [-0.23, +0.23] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.02, +0.02] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.29, +0.28] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.01 [-0.63, +0.61] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.03 [-0.55, +0.50] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.03 [-0.70, +0.63] 1 Logs
ddot_metrics memory utilization -0.04 [-0.16, +0.08] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput -0.08 [-0.70, +0.55] 1 Logs
ddot_logs memory utilization -0.09 [-0.23, +0.06] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.10 [-0.74, +0.54] 1 Logs
file_tree memory utilization -0.17 [-0.30, -0.03] 1 Logs
otlp_ingest_logs memory utilization -0.29 [-0.42, -0.17] 1 Logs
docker_containers_memory memory utilization -0.47 [-0.52, -0.42] 1 Logs
quality_gate_idle memory utilization -0.50 [-0.57, -0.43] 1 Logs bounds checks dashboard
otlp_ingest_metrics memory utilization -0.52 [-0.68, -0.37] 1 Logs
docker_containers_cpu % cpu utilization -0.67 [-3.68, +2.33] 1 Logs
quality_gate_idle_all_features memory utilization -1.06 [-1.14, -0.97] 1 Logs bounds checks dashboard

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
docker_containers_memory memory_usage 0/10
docker_containers_cpu simple_check_run 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 memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 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 lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented May 28, 2025

Static quality checks

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

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 $${\color{red}+0}$$ $${\color{green}747.19}$$ < $${752.99}$$ $${\color{red}+0.02}$$ $${\color{green}185.04}$$ < $${187.44}$$
agent_deb_amd64_fips $${\color{green}-0}$$ $${\color{green}745.55}$$ < $${751.36}$$ $${\color{green}-0.02}$$ $${\color{green}184.41}$$ < $${187.06}$$
agent_heroku_amd64 $${\color{green}0}$$ $${\color{green}368.68}$$ < $${369.68}$$ $${\color{red}+0}$$ $${\color{green}98.66}$$ < $${99.55}$$
agent_msi $${\color{red}+0.03}$$ $${\color{green}986.41}$$ < $${987.01}$$ $${\color{red}+0.04}$$ $${\color{green}149.75}$$ < $${150.72}$$
agent_rpm_amd64 $${\color{red}+0}$$ $${\color{green}747.18}$$ < $${752.98}$$ $${\color{green}-0.01}$$ $${\color{green}186.56}$$ < $${190.03}$$
agent_rpm_amd64_fips $${\color{green}-0}$$ $${\color{green}745.54}$$ < $${751.35}$$ $${\color{green}-0.02}$$ $${\color{green}186.25}$$ < $${189.81}$$
agent_rpm_arm64 $${\color{red}+0}$$ $${\color{green}733.91}$$ < $${739.42}$$ $${\color{green}-0.01}$$ $${\color{green}168.68}$$ < $${171.23}$$
agent_rpm_arm64_fips $${\color{red}+0.01}$$ $${\color{green}732.41}$$ < $${737.91}$$ $${\color{green}-0.05}$$ $${\color{green}167.68}$$ < $${170.22}$$
agent_suse_amd64 $${\color{red}+0}$$ $${\color{green}747.18}$$ < $${752.98}$$ $${\color{green}-0.01}$$ $${\color{green}186.56}$$ < $${190.03}$$
agent_suse_amd64_fips $${\color{green}-0}$$ $${\color{green}745.54}$$ < $${751.35}$$ $${\color{green}-0.02}$$ $${\color{green}186.25}$$ < $${189.81}$$
agent_suse_arm64 $${\color{red}+0}$$ $${\color{green}733.91}$$ < $${739.42}$$ $${\color{green}-0.01}$$ $${\color{green}168.68}$$ < $${171.23}$$
agent_suse_arm64_fips $${\color{red}+0.01}$$ $${\color{green}732.41}$$ < $${737.91}$$ $${\color{green}-0.05}$$ $${\color{green}167.68}$$ < $${170.22}$$
docker_agent_amd64 $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_arm64 $${\color{red}+0}$$ $${\color{green}841.16}$$ < $${858.97}$$ $${\color{red}+0}$$ $${\color{green}268.33}$$ < $${274.36}$$
docker_agent_jmx_amd64 $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_jmx_arm64 $${\color{red}+0}$$ $${\color{green}841.16}$$ < $${858.97}$$ $${\color{red}+0}$$ $${\color{green}268.33}$$ < $${274.36}$$
docker_agent_windows1809 $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_windows1809_core $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_windows1809_core_jmx $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_windows1809_jmx $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_windows2022 $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_windows2022_core $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_windows2022_core_jmx $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_agent_windows2022_jmx $${\color{red}+0}$$ $${\color{green}830.98}$$ < $${849.39}$$ $${\color{green}-0}$$ $${\color{green}282.21}$$ < $${288.34}$$
docker_cluster_agent_amd64 $${\color{red}+0}$$ $${\color{green}259.1}$$ < $${259.73}$$ $${\color{red}+0.01}$$ $${\color{green}102.84}$$ < $${103.68}$$
docker_cluster_agent_arm64 $${\color{red}+0}$$ $${\color{green}273.5}$$ < $${274.24}$$ $${\color{red}+0}$$ $${\color{green}97.57}$$ < $${98.45}$$
docker_cws_instrumentation_amd64 $${\color{green}0}$$ $${\color{green}7.08}$$ < $${7.12}$$ $${\color{red}+0}$$ $${\color{green}2.95}$$ < $${3.29}$$
docker_cws_instrumentation_arm64 $${\color{green}-0}$$ $${\color{green}6.69}$$ < $${6.92}$$ $${\color{green}0}$$ $${\color{green}2.7}$$ < $${3.07}$$
docker_dogstatsd_amd64 $${\color{red}+0}$$ $${\color{green}38.92}$$ < $${39.57}$$ $${\color{red}+0}$$ $${\color{green}14.94}$$ < $${15.76}$$
docker_dogstatsd_arm64 $${\color{green}-0}$$ $${\color{green}37.52}$$ < $${38.2}$$ $${\color{red}+0}$$ $${\color{green}13.96}$$ < $${14.83}$$
dogstatsd_deb_amd64 $${\color{green}0}$$ $${\color{green}30.6}$$ < $${31.52}$$ $${\color{green}-0}$$ $${\color{green}8.03}$$ < $${8.97}$$
dogstatsd_deb_arm64 $${\color{green}0}$$ $${\color{green}29.15}$$ < $${30.08}$$ $${\color{red}+0}$$ $${\color{green}6.97}$$ < $${7.92}$$
dogstatsd_rpm_amd64 $${\color{green}0}$$ $${\color{green}30.6}$$ < $${31.52}$$ $${\color{green}-0}$$ $${\color{green}8.04}$$ < $${8.98}$$
dogstatsd_suse_amd64 $${\color{green}0}$$ $${\color{green}30.6}$$ < $${31.52}$$ $${\color{green}-0}$$ $${\color{green}8.04}$$ < $${8.98}$$
iot_agent_deb_amd64 $${\color{green}0}$$ $${\color{green}59.9}$$ < $${60.17}$$ $${\color{green}-0}$$ $${\color{green}14.98}$$ < $${15.82}$$
iot_agent_deb_arm64 $${\color{green}0}$$ $${\color{green}56.63}$$ < $${56.94}$$ $${\color{red}+0.01}$$ $${\color{green}12.86}$$ < $${13.86}$$
iot_agent_deb_armhf $${\color{green}0}$$ $${\color{green}56.08}$$ < $${56.41}$$ $${\color{green}-0.02}$$ $${\color{green}12.98}$$ < $${13.86}$$
iot_agent_rpm_amd64 $${\color{green}0}$$ $${\color{green}59.9}$$ < $${60.18}$$ $${\color{red}+0}$$ $${\color{green}15.0}$$ < $${15.84}$$
iot_agent_rpm_arm64 $${\color{green}0}$$ $${\color{green}56.63}$$ < $${56.94}$$ $${\color{red}+0}$$ $${\color{green}12.87}$$ < $${13.76}$$
iot_agent_suse_amd64 $${\color{green}0}$$ $${\color{green}59.9}$$ < $${60.18}$$ $${\color{red}+0}$$ $${\color{green}15.0}$$ < $${15.84}$$

Copy link
Contributor

@julien-lebot julien-lebot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some questions

@clarkb7 clarkb7 added the ask-review Ask required teams to review this PR label May 28, 2025
}

// Start the agent service to pick up the new config
err = winutil.RestartService("datadogagent")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this not restart the installer service?

Copy link
Contributor Author

@clarkb7 clarkb7 May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we expect it to. this code runs in a subprocess (daemon -> start-config-experiment -> hooks(post-start-config-experiment) so it won't be affected by the daemon restarting.

if err != nil {
return nil, err
}
pkgconfigsetup.SystemProbe().Set("fleet_policies_dir", fleetPoliciesDirPath, pkgconfigmodel.SourceAgentRuntime)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we setting this while we where getting it before ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the option is provided on the command line it takes precedence, so we overwrite the option to be used by applyFleetPolicy.

@@ -60,4 +63,39 @@ func osinit() {
DefaultDDAgentBin = agentFilePath
}
}

// Fleet Automation
pkgconfigmodel.AddOverrideFunc(FleetConfigOverride)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is called by newSysprobeConfig, why do we add it as an override function ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the system probe config load functions do not use ApplyOverrideFuncs. I experimented with adding a call to ApplyOverrideFuncs, but it applied a bunch of non-system probe related override functions to the system probe config. They'd all need to be separated by process/config somehow.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But we still use AddOverrideFunc so that the options are applied automatically to the core Agent config

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ask-review Ask required teams to review this PR changelog/no-changelog long review PR is complex, plan time to review it qa/done QA done before merge and regressions are covered by tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants