Skip to content

Conversation

@rdesgroppes
Copy link
Contributor

@rdesgroppes rdesgroppes commented Jul 25, 2025

What does this PR do?

This reverts "Temporarily move macOS test on AArch64/ARM64 out of merge queue (ABLD-28 follow-up) (#39241)", commit 666ad9d.

Motivation

There are now 5 times more macos:ventura-arm64 runners available (25), so we should be good to go without much contention, see corresponding queue time dashboard.

@rdesgroppes rdesgroppes requested a review from chouetz July 25, 2025 08:06
@rdesgroppes rdesgroppes requested a review from a team as a code owner July 25, 2025 08:06
@rdesgroppes rdesgroppes added changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation labels Jul 25, 2025
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Jul 25, 2025
@rdesgroppes rdesgroppes requested a review from CelianR July 25, 2025 08:07
@agent-platform-auto-pr
Copy link
Contributor

Gitlab CI Configuration Changes

Modified Jobs

tests_macos_gitlab_arm64
  tests_macos_gitlab_arm64:
    after_script:
    - export VAULT_ADDR=https://vault.us1.ddbuild.io
    - vault login -method=aws -no-print
    - 'export PATH="$(pyenv root)/shims:$PATH"
  
      eval "$(pyenv init -)"
  
      eval "$(pyenv virtualenv-init -)"
  
      '
    - "if [ -n \"$PYTHON_VERSION\" ]; then\n  # 1. Use PYTHON_VERSION if set\n  if !\
      \ [[ \"$PYTHON_VERSION\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then\n    echo \"Invalid\
      \ Python version format (should be X.Y.Z): $PYTHON_VERSION\" >& 2\n    exit 1\n\
      \  fi\n  if ! [ -d \"$(pyenv root)/versions/$PYTHON_VERSION\" ]; then\n    echo\
      \ \"Python version $PYTHON_VERSION not found. Installing...\"\n    pyenv install\
      \ \"$PYTHON_VERSION\"\n  fi\nelse\n  # 2. Find appropriate python version from\
      \ major version\n  PYTHON_VERSION=\"$(cat .python-version)\"\n  echo \"Find python\
      \ version matching $PYTHON_VERSION\"\n  PYTHON_VERSION_ESCAPED=\"${PYTHON_VERSION//./\\\
      \\.}\"\n  versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
      \\.[0-9]+$\")\"\n  if [ -n \"$versionmatches\" ]; then\n    # 2.a.\n    echo \"\
      Found already existing python version for $PYTHON_VERSION\"\n  else\n    # 2.b.\n\
      \    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install \"$PYTHON_VERSION\"\
      \n    versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
      \\.[0-9]+$\")\"\n    if [ -z \"$versionmatches\" ]; then\n      echo \"No matching\
      \ Python version found for $PYTHON_VERSION even after installation.\" >& 2\n \
      \     exit 1\n    fi\n  fi\n  # If there are multiple matches, select the latest\
      \ one\n  PYTHON_VERSION=\"$(echo \"$versionmatches\" | sort -V | tail -n 1)\"\n\
      fi\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\nVENV_PATH=\"$(pyenv root)/versions/$VENV_NAME\"\
      \n"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
      \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
      \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
      \ already exists. Skipping creation.\"\nfi\n"
    - pyenv activate $VENV_NAME
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
    - CODECOV_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $CODECOV token) || exit
      $?; export CODECOV_TOKEN
    - dda inv -- -e coverage.upload-to-codecov $COVERAGE_CACHE_FLAG || true
    artifacts:
      expire_in: 2 weeks
      paths:
      - $TEST_OUTPUT_FILE
      - junit-*.tgz
      reports:
        annotations:
        - $EXTERNAL_LINKS_PATH
        junit:
        - '**/junit-out-*.xml'
      when: always
    before_script:
    - export VAULT_ADDR=https://vault.us1.ddbuild.io
    - vault login -method=aws -no-print
    - export AWS_RETRY_MODE=standard
    - export AWS_RETRY_MAX_ATTEMPTS=5
    - 'eval $(gimme $(cat .go-version))
  
      export GOPATH=$GOROOT
  
      '
    - 'export PATH="$(pyenv root)/shims:$PATH"
  
      eval "$(pyenv init -)"
  
      eval "$(pyenv virtualenv-init -)"
  
      '
    - "if [ -n \"$PYTHON_VERSION\" ]; then\n  # 1. Use PYTHON_VERSION if set\n  if !\
      \ [[ \"$PYTHON_VERSION\" =~ ^[0-9]+\\.[0-9]+\\.[0-9]+$ ]]; then\n    echo \"Invalid\
      \ Python version format (should be X.Y.Z): $PYTHON_VERSION\" >& 2\n    exit 1\n\
      \  fi\n  if ! [ -d \"$(pyenv root)/versions/$PYTHON_VERSION\" ]; then\n    echo\
      \ \"Python version $PYTHON_VERSION not found. Installing...\"\n    pyenv install\
      \ \"$PYTHON_VERSION\"\n  fi\nelse\n  # 2. Find appropriate python version from\
      \ major version\n  PYTHON_VERSION=\"$(cat .python-version)\"\n  echo \"Find python\
      \ version matching $PYTHON_VERSION\"\n  PYTHON_VERSION_ESCAPED=\"${PYTHON_VERSION//./\\\
      \\.}\"\n  versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
      \\.[0-9]+$\")\"\n  if [ -n \"$versionmatches\" ]; then\n    # 2.a.\n    echo \"\
      Found already existing python version for $PYTHON_VERSION\"\n  else\n    # 2.b.\n\
      \    echo \"Installing Python $PYTHON_VERSION...\"\n    pyenv install \"$PYTHON_VERSION\"\
      \n    versionmatches=\"$(ls \"$(pyenv root)/versions\" | grep -E \"^${PYTHON_VERSION_ESCAPED}\\\
      \\.[0-9]+$\")\"\n    if [ -z \"$versionmatches\" ]; then\n      echo \"No matching\
      \ Python version found for $PYTHON_VERSION even after installation.\" >& 2\n \
      \     exit 1\n    fi\n  fi\n  # If there are multiple matches, select the latest\
      \ one\n  PYTHON_VERSION=\"$(echo \"$versionmatches\" | sort -V | tail -n 1)\"\n\
      fi\nVENV_NAME=\"datadog-agent-python-$PYTHON_VERSION\"\nVENV_PATH=\"$(pyenv root)/versions/$VENV_NAME\"\
      \n"
    - echo "Using Python $PYTHON_VERSION..."
    - "# Check if the virtual environment directory exists\nif [ ! -d \"$VENV_PATH\"\
      \ ]; then\n  echo \"Creating virtual environment '$VENV_NAME'...\"\n  pyenv virtualenv\
      \ \"$PYTHON_VERSION\" \"$VENV_NAME\"\nelse\n  echo \"Virtual environment '$VENV_NAME'\
      \ already exists. Skipping creation.\"\nfi\n"
    - pyenv activate $VENV_NAME
    - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat
      .dda/version)" --break-system-packages
    - pyenv rehash
    - python3 -m dda self dep sync -f legacy-tasks
    - pyenv rehash
    - DD_API_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_API_KEY_ORG2"
      token)" || exit $?; export DD_API_KEY
    - DD_APP_KEY="$("$CI_PROJECT_DIR"/tools/ci/fetch_secret.sh "$AGENT_APP_KEY_ORG2"
      token)" || exit $?; export DD_APP_KEY
    - "if [ \"$CI_COMMIT_BRANCH\" = \"main\" ] || [[ \"$CI_COMMIT_BRANCH\" =~ ^[0-9]+\\\
      .[0-9]+\\.(x|[0-9]+)$ ]]; then\n  dda inv -- -e macos.report-versions -l all ||\
      \ true\nfi\n"
    - "if [ \"$((RANDOM%20))\" -eq 0 ]; then\n  echo Trying to remove inactive versions\n\
      \  dda inv -- -e macos.remove-inactive-versions -l python -t \"$PYTHON_VERSION\"\
      \ || true\n  dda inv -- -e macos.remove-inactive-versions -l go -t \"$(cat .go-version)\"\
      \ || true\nfi\n"
    - dda inv -- -e rtloader.make
    - dda inv -- -e rtloader.install
    - dda inv -- -e install-tools
    needs:
    - go_deps
    - go_tools_deps
    rules:
-   - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
-     when: never
    - if: $RUN_UNIT_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH == "main"
      variables:
        COVERAGE_CACHE_FLAG: --push-coverage-cache
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_TAG != null
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "pipeline"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $RUN_UNIT_TESTS == "on"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - variables:
        COVERAGE_CACHE_FLAG: --pull-coverage-cache
        FAST_TESTS: 'true'
    script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_tools.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_tools.tar.xz
    - dda inv -- -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
    - FAST_TESTS_FLAG=""
    - if [[ "$FAST_TESTS" == "true" ]]; then FAST_TESTS_FLAG="--only-impacted-packages";
      fi
    - dda inv -- -e test --rerun-fails=2 --race --profile --cpus 12 --result-json $TEST_OUTPUT_FILE
      --junit-tar "junit-${CI_JOB_NAME}.tgz" $FAST_TESTS_FLAG --test-washer --coverage
    - dda inv -- -e invoke-unit-tests
    stage: source_test
    tags:
    - macos:ventura-arm64
    - specific:true
    variables:
      FLAKY_PATTERNS_CONFIG: $CI_PROJECT_DIR/flaky-patterns-runtime.yaml
      TEST_OUTPUT_FILE: test_output.json

Changes Summary

Removed Modified Added Renamed
0 1 0 0

ℹ️ Diff available in the job log.

@cit-pr-commenter
Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 0886cbf5-6825-4824-8129-0d1d6facc93d

Baseline: 3f02f1c
Comparison: 2a47c06
Diff

Optimization Goals: ✅ No significant changes detected

Experiments ignored for regressions

Regressions in experiments with settings containing erratic: true are ignored.

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization -1.90 [-5.00, +1.20] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
tcp_syslog_to_blackhole ingress throughput +1.49 [+1.43, +1.54] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.41 [+0.37, +0.45] 1 Logs
otlp_ingest_logs memory utilization +0.25 [+0.13, +0.38] 1 Logs
docker_containers_memory memory utilization +0.21 [+0.15, +0.27] 1 Logs
file_tree memory utilization +0.03 [-0.01, +0.07] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.03 [-0.56, +0.61] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.03, +0.02] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.01 [-0.35, +0.33] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.01 [-0.63, +0.61] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.03 [-0.65, +0.58] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.06 [-0.65, +0.53] 1 Logs
otlp_ingest_metrics memory utilization -0.08 [-0.22, +0.06] 1 Logs
ddot_logs memory utilization -0.14 [-0.23, -0.04] 1 Logs
ddot_metrics memory utilization -0.14 [-0.26, -0.02] 1 Logs
quality_gate_idle_all_features memory utilization -0.29 [-0.33, -0.24] 1 Logs bounds checks dashboard
quality_gate_idle memory utilization -0.35 [-0.39, -0.32] 1 Logs bounds checks dashboard
quality_gate_metrics_logs memory utilization -0.93 [-1.31, -0.55] 1 Logs bounds checks dashboard
docker_containers_cpu % cpu utilization -1.90 [-5.00, +1.20] 1 Logs
quality_gate_logs % cpu utilization -2.26 [-4.98, +0.47] 1 Logs bounds checks dashboard

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_1000ms_latency 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_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
quality_gate_metrics_logs cpu_usage 10/10 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 bounds checks dashboard
quality_gate_metrics_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_metrics_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_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, 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_idle, 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_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor

Static quality checks

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

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 $${0}$$ $${704.67}$$ < $${704.84}$$ $${+0.01}$$ $${178.23}$$ < $${178.58}$$
agent_deb_amd64_fips $${0}$$ $${702.92}$$ < $${703.09}$$ $${-0.02}$$ $${177.63}$$ < $${178.12}$$
agent_heroku_amd64 $${0}$$ $${354.66}$$ < $${355.37}$$ $${-0}$$ $${94.88}$$ < $${95.72}$$
agent_msi $${0}$$ $${979.26}$$ < $${979.61}$$ $${+0.01}$$ $${148.65}$$ < $${149.31}$$
agent_rpm_amd64 $${0}$$ $${704.66}$$ < $${704.83}$$ $${+0.01}$$ $${179.85}$$ < $${180.22}$$
agent_rpm_amd64_fips $${0}$$ $${702.91}$$ < $${703.08}$$ $${-0.02}$$ $${179.56}$$ < $${179.85}$$
agent_rpm_arm64 $${0}$$ $${693.56}$$ < $${694.74}$$ $${+0}$$ $${163.23}$$ < $${163.96}$$
agent_rpm_arm64_fips $${0}$$ $${691.87}$$ < $${693.05}$$ $${+0}$$ $${162.23}$$ < $${163.0}$$
agent_suse_amd64 $${0}$$ $${704.66}$$ < $${704.83}$$ $${+0.01}$$ $${179.85}$$ < $${180.22}$$
agent_suse_amd64_fips $${0}$$ $${702.91}$$ < $${703.08}$$ $${-0.02}$$ $${179.56}$$ < $${179.85}$$
agent_suse_arm64 $${0}$$ $${693.56}$$ < $${694.74}$$ $${+0}$$ $${163.23}$$ < $${163.96}$$
agent_suse_arm64_fips $${0}$$ $${691.87}$$ < $${693.05}$$ $${+0}$$ $${162.23}$$ < $${163.0}$$
docker_agent_amd64 $${-0}$$ $${788.42}$$ < $${788.65}$$ $${+0}$$ $${271.62}$$ < $${272.01}$$
docker_agent_arm64 $${-0}$$ $${800.83}$$ < $${802.0}$$ $${-0}$$ $${258.85}$$ < $${259.7}$$
docker_agent_jmx_amd64 $${-0}$$ $${979.66}$$ < $${979.84}$$ $${+0}$$ $${340.62}$$ < $${340.95}$$
docker_agent_jmx_arm64 $${-0}$$ $${980.67}$$ < $${981.8}$$ $${-0}$$ $${323.84}$$ < $${324.65}$$
docker_cluster_agent_amd64 $${-0}$$ $${213.92}$$ < $${214.5}$$ $${-0}$$ $${72.74}$$ < $${73.51}$$
docker_cluster_agent_arm64 $${-0}$$ $${229.81}$$ < $${230.33}$$ $${-0}$$ $${68.97}$$ < $${69.77}$$
docker_cws_instrumentation_amd64 $${0}$$ $${7.07}$$ < $${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}$$ $${38.53}$$ < $${39.57}$$ $${+0}$$ $${14.88}$$ < $${15.76}$$
docker_dogstatsd_arm64 $${0}$$ $${37.23}$$ < $${38.2}$$ $${-0}$$ $${14.33}$$ < $${14.83}$$
dogstatsd_deb_amd64 $${0}$$ $${29.77}$$ < $${31.4}$$ $${+0}$$ $${7.84}$$ < $${8.95}$$
dogstatsd_deb_arm64 $${0}$$ $${28.37}$$ < $${29.97}$$ $${-0}$$ $${6.81}$$ < $${7.89}$$
dogstatsd_rpm_amd64 $${0}$$ $${29.77}$$ < $${31.4}$$ $${+0}$$ $${7.86}$$ < $${8.96}$$
dogstatsd_suse_amd64 $${0}$$ $${29.77}$$ < $${31.4}$$ $${+0}$$ $${7.86}$$ < $${8.96}$$
iot_agent_deb_amd64 $${0}$$ $${54.08}$$ < $${54.55}$$ $${-0}$$ $${13.63}$$ < $${14.45}$$
iot_agent_deb_arm64 $${0}$$ $${51.4}$$ < $${51.9}$$ $${+0}$$ $${11.79}$$ < $${12.63}$$
iot_agent_deb_armhf $${0}$$ $${50.92}$$ < $${51.42}$$ $${-0.04}$$ $${11.87}$$ < $${12.74}$$
iot_agent_rpm_amd64 $${0}$$ $${54.08}$$ < $${54.55}$$ $${-0}$$ $${13.65}$$ < $${14.47}$$
iot_agent_rpm_arm64 $${0}$$ $${51.4}$$ < $${51.91}$$ $${+0}$$ $${11.81}$$ < $${12.65}$$
iot_agent_suse_amd64 $${0}$$ $${54.08}$$ < $${54.55}$$ $${-0}$$ $${13.65}$$ < $${14.47}$$

@rdesgroppes rdesgroppes merged commit ffbe950 into main Jul 25, 2025
315 checks passed
@rdesgroppes rdesgroppes deleted the regis.desgroppes/move-macos-test-on-arm64-back-to-mq branch July 25, 2025 10:01
@github-actions github-actions bot added this to the 7.70.0 milestone Jul 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation short review PR is simple enough to be reviewed quickly

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants