Merge branch 'main' into chore/agent-internal-image-tmpl-v26

Author: sabrina-datadog

.gitattributes

@@ -1,15 +1,27 @@
+# Default to LF for all files that git identifies as text files, regardless of platform
+* text=auto eol=lf
+
+# TODO(alopezz): These exceptions, matching files that are stored with CRLF endings in
+# git, are transitional while migrating to LF as the default eol for all text files.
+*.ps1 -text
+Dockerfiles/agent/windows/amd64/Dockerfile -text
+cmd/ai_prompt_logger/Cargo.toml -text
+cmd/ai_prompt_logger/src/main.rs -text
+cmd/trace-agent/test/testsuite/testdata/trace_with_rates.json -text
+comp/core/gui/impl/views/private/images/datadog_icon_white.svg -text
+deps/msodbcsql18/LICENSE.txt -text
+devenv/answer_files/**/*.xml -text
+pkg/collector/corechecks/containers/kubelet/testdata/summary.json -text
+releasenotes/notes/*.yaml -text
+tasks/unit_tests/testdata/secret.tar.gz/*.xml -text
+# The test that uses this file needs adjustment to not rely on autocrlf
+bazel/tools/tar_checksums/testdata/expected_checksums.txt -eol
+
 # Set batch file line endings to CRLF so that they can be executed on Windows
 *.bat text eol=crlf
 *.cmd text eol=crlf
 *.bin binary
 
-# Set go source line endings to LF on all platforms so gofmt can be used
-*.go text=auto eol=lf
-# Same for gopatch (does not handle CRLF line endings)
-*.gopatch text eol=lf
-# Same for go workspace files (root and testdata)
-*go.work text eol=lf
-go.mod text eol=lf
 go.sum -diff -merge linguist-generated=true
 # Merge changelog entries without conflicts when multiple PRs add lines simultaneously
 CHANGELOG-AIX.md merge=union
@@ -22,19 +34,6 @@ CHANGELOG-AIX.md merge=union
 pkg/config/schema/*.yaml text eol=lf
 pkg/security/probe/constantfetch/btfhub/constants.json -diff -merge linguist-generated=true
 pkg/security/seclwin/** -diff -merge linguist-generated=true
-# CWS doc JSON is generated as LF on Linux; force LF on Windows too
-# so Bazel's byte-exact diff_test doesn't trip on core.autocrlf-rewritten CRLF.
-docs/cloud-workload-security/** text eol=lf
-# Fixtures should have LF line endings because they are checked against OCI packages built on Linux
-pkg/fleet/installer/fixtures/** text=auto eol=lf
-
-# Bazel writes LF; force LF on Windows too to avoid autocrlf churn after `bazel run` / `dda inv tidy`
-*.bazel text eol=lf
-*.bzl text eol=lf
-MODULE.bazel.lock text eol=lf
-
-# Use LF for python files that need to pass Bazel's byte-exact diff_test
-tasks/core_checks.py text eol=lf
 
 # Fix `git diff` when running on the below file formats.
 # Our windows build image uses MinGit which tries to use the astextplain diff algorithm (https://git-scm.com/docs/gitattributes#_setting_the_internal_diff_algorithm).

.gitlab-ci.yml

@@ -174,6 +174,11 @@ default:
     max: 1 # Retry everything once on failure
     when: always
 
+# Full git history. Override the default shallow clone.
+.needs_full_git_history:
+  variables:
+    GIT_DEPTH: 0
+
 stages:
   - .pre
   - setup
@@ -375,8 +380,9 @@ variables:
   DD_PKG_GITLAB_URL: "https://artifact-gateway.us1.ddbuild.io/internal/artifact-gateway/api/v4"
   PIPELINE_KEY_ALIAS: "alias/ci_datadog-agent_pipeline-key"
 
-  # Job cloning strategy
+  # Shallow clone by default.
   GIT_STRATEGY: "fetch"
+  GIT_DEPTH: 1
   DISABLE_GIT_CACHE: true
 
   # Job stage attempts (see https://docs.gitlab.com/ee/ci/runners/configure_runners.html#job-stages-attempts)

.gitlab/.pre/ci_configuration.yml

@@ -15,6 +15,8 @@ test_gitlab_compare_to:
   image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
   tags: ["arch:amd64"]
   extends: .dd_octo_sts
+  variables:
+    GIT_DEPTH: 0  # Full history: gitlab_configuration_is_modified uses merge-base and HEAD^
   rules:
     - !reference [.except_mergequeue]
     - !reference [.on_gitlab_changes]
@@ -30,6 +32,8 @@ compute_gitlab_ci_config:
   stage: .pre
   needs: []
   tags: ["arch:arm64"]
+  variables:
+    GIT_DEPTH: 0  # Full history: computes gitlab-ci config diff against merge-base
   before_script:
     # Get main history
     - git fetch origin main
@@ -57,5 +61,7 @@ lint_github_actions_shellcheck:
         compare_to: $COMPARE_TO_BRANCH
       when: on_success
   allow_failure: true
+  variables:
+    GIT_DEPTH: 0  # Full history: linter.github-actions-shellcheck uses git merge-base
   script:
     - dda inv -- -e linter.github-actions-shellcheck

.gitlab/.pre/common/prebuild-workspace-image.yml

@@ -9,5 +9,9 @@ prebuild-workspace-image-check:
         paths:
           - .devcontainer/datadog/default/**/*
         compare_to: $COMPARE_TO_BRANCH
+  variables:
+    GIT_DEPTH: 0  # Full history: three-dot diff is from merge-base to HEAD
   script:
+    - git fetch origin "$COMPARE_TO_BRANCH"
+    - export SOURCE_REF="origin/$COMPARE_TO_BRANCH"
     - bash tools/prebuild-devcontainer-check.sh

.gitlab/.pre/setup/setup.yml

@@ -23,3 +23,4 @@ setup_agent_version:
       dotenv: build.env
   variables:
     DISABLE_GIT_CACHE: true
+    GIT_DEPTH: 0  # git describe --tags needs reachable tags

.gitlab/build/binary_build/fakeintake.yml

@@ -23,5 +23,7 @@ fakeintake_check_version_bump:
   needs: []
   image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
   tags: ["arch:amd64", "specific:true"]
+  variables:
+    GIT_DEPTH: 0  # Full history: fakeintake.check-version-bump uses merge-base
   script:
     - dda inv -- fakeintake.check-version-bump

.gitlab/build/binary_build/host_profiler.yml

@@ -10,6 +10,7 @@
     - dda inv -- -e host-profiler.build
   needs: ["go_deps"]
   variables:
+    GIT_DEPTH: 0  # git describe --tags needs reachable tags
     KUBERNETES_MEMORY_REQUEST: "16Gi"
     KUBERNETES_MEMORY_LIMIT: "16Gi"
   artifacts:

.gitlab/build/lint/technical_linters.yml

@@ -89,6 +89,8 @@ validate_experiment_systemd_units:
 lint_releasenotes_rst:
   extends: .lint
   rules: !reference [.on_releasenotes_changes]
+  variables:
+    GIT_DEPTH: 0  # Full history: linter.rst-releasenotes --only-changed uses merge-base
   script:
     - dda inv -- -e linter.rst-releasenotes --only-changed
 

.gitlab/build/pkg_metrics/pkg_metrics.yml

@@ -102,5 +102,7 @@ check_pkg_size:
     - dogstatsd_deb-arm64
     - agent_rpm-arm64-a7
     - iot_agent_rpm-arm64
+  variables:
+    GIT_DEPTH: 0  # Full history: package.check-size uses git merge-base
   script:
     - dda inv -- package.check-size

.gitlab/build/source_test/ebpf.yml

@@ -102,6 +102,7 @@ prepare_sysprobe_ebpf_functional_tests_x64:
     KUBERNETES_CPU_REQUEST: 4
     KUBERNETES_MEMORY_REQUEST: "12Gi"
     KUBERNETES_MEMORY_LIMIT: "12Gi"
+    GIT_DEPTH: 0  # Full history: kmt.prepare embeds git merge-base in the testsuite binary
   artifacts:
     when: always
     paths: