Merge branch 'main' into jose/disk_feature_parity

Author: jose-manuel-almaza

.dda/version

@@ -1 +1 @@
-0.5.0
+0.10.1

.ddqa/config.toml

@@ -189,13 +189,6 @@ jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "windows-agent"
 github_labels = ["team/windows-agent"]
 
-[teams."Windows Kernel Integrations"]
-jira_project = "WKINT"
-jira_issue_type = "Task"
-jira_statuses = ["To Do", "In Progress", "Done"]
-github_team = "windows-kernel-integrations"
-github_labels = ["team/windows-kernel-integrations"]
-
 [teams."Database Monitoring"]
 jira_project = "DBMON"
 jira_issue_type = "Task"

.github/CODEOWNERS

@@ -240,8 +240,8 @@
 /cmd/system-probe/modules/ping*         @DataDog/ndm-core
 /cmd/system-probe/modules/language_detection* @DataDog/container-intake @DataDog/agent-discovery
 /cmd/system-probe/modules/dynamic_instrumentation* @DataDog/debugger
-/cmd/system-probe/windows_resources/    @DataDog/windows-kernel-integrations
-/cmd/system-probe/main_windows*.go      @DataDog/windows-kernel-integrations
+/cmd/system-probe/windows_resources/    @DataDog/windows-agent
+/cmd/system-probe/main_windows*.go      @DataDog/windows-agent
 /cmd/system-probe/subcommands/runtime/  @DataDog/agent-security
 /cmd/systray/                           @DataDog/windows-agent
 /cmd/security-agent/                    @DataDog/agent-security
@@ -254,7 +254,7 @@
 /Dockerfiles/agent/entrypoint.d.windows/ @DataDog/container-integrations @DataDog/windows-agent
 /Dockerfiles/agent/entrypoint.ps1        @DataDog/container-integrations @DataDog/windows-agent
 /Dockerfiles/agent/windows/              @DataDog/container-integrations @DataDog/windows-agent
-/Dockerfiles/agent-ot                    @DataDog/opentelemetry-agent
+/Dockerfiles/agent-ddot                  @DataDog/opentelemetry-agent
 /Dockerfiles/agent/bouncycastle-fips     @DataDog/agent-metric-pipelines
 
 /docs/                                  @DataDog/agent-devx
@@ -318,7 +318,7 @@
 /comp/agent/cloudfoundrycontainer @DataDog/agent-integrations
 /comp/agent/jmxlogger @DataDog/agent-metric-pipelines
 /comp/aggregator/diagnosesendermanager @DataDog/agent-configuration
-/comp/checks/agentcrashdetect @DataDog/windows-kernel-integrations
+/comp/checks/agentcrashdetect @DataDog/windows-agent
 /comp/checks/windowseventlog @DataDog/windows-agent
 /comp/checks/winregistry @DataDog/windows-agent
 /comp/core/autodiscovery @DataDog/container-platform
@@ -405,7 +405,7 @@
 /comp/core/autodiscovery/providers/remote_config*.go  @DataDog/remote-config
 /pkg/cloudfoundry                       @Datadog/agent-integrations
 /pkg/clusteragent/                      @DataDog/container-platform
-/pkg/clusteragent/autoscaling/          @DataDog/container-integrations
+/pkg/clusteragent/autoscaling/          @DataDog/container-autoscaling @DataDog/container-integrations
 /pkg/clusteragent/admission/mutate/autoscaling          @DataDog/container-integrations
 /pkg/clusteragent/admission/mutate/autoinstrumentation/ @DataDog/container-platform @DataDog/injection-platform
 /pkg/clusteragent/admission/mutate/cwsinstrumentation    @Datadog/agent-security
@@ -435,7 +435,7 @@
 /pkg/collector/corechecks/snmp/         @DataDog/ndm-core
 /pkg/collector/corechecks/system/                 @DataDog/agent-runtimes
 /pkg/collector/corechecks/system/**/*_windows*.go @DataDog/agent-runtimes @DataDog/windows-agent
-/pkg/collector/corechecks/system/wincrashdetect/  @DataDog/windows-kernel-integrations
+/pkg/collector/corechecks/system/wincrashdetect/  @DataDog/windows-agent
 /pkg/collector/corechecks/system/winkmem/         @DataDog/windows-agent
 /pkg/collector/corechecks/system/winproc/         @DataDog/windows-agent
 /pkg/collector/corechecks/systemd/      @DataDog/agent-integrations
@@ -450,7 +450,7 @@
 /pkg/config/setup/system_probe.go               @DataDog/ebpf-platform @DataDog/agent-configuration
 /pkg/config/setup/system_probe_cws.go           @DataDog/agent-security @DataDog/agent-configuration
 /pkg/config/setup/system_probe_cws_notwin.go    @DataDog/agent-security @DataDog/agent-configuration
-/pkg/config/setup/system_probe_cws_windows.go   @DataDog/windows-kernel-integrations @DataDog/agent-configuration
+/pkg/config/setup/system_probe_cws_windows.go   @DataDog/windows-agent @DataDog/agent-configuration
 /pkg/config/setup/security_agent.go             @DataDog/agent-security @DataDog/agent-configuration
 /pkg/config/remote/                     @DataDog/remote-config
 /pkg/config/remote/meta/                @DataDog/remote-config @DataDog/sdlc-security
@@ -468,6 +468,7 @@
 /pkg/flare/*_windows_test.go            @Datadog/windows-agent @DataDog/agent-configuration
 /pkg/fleet/                             @DataDog/fleet @DataDog/windows-agent
 /pkg/fleet/installer/setup/djm/         @DataDog/fleet @DataDog/data-jobs-monitoring
+/pkg/opentelemetry-mapping-go           @DataDog/opentelemetry-agent
 /pkg/pidfile/                           @DataDog/agent-runtimes
 /pkg/persistentcache/                   @DataDog/agent-runtimes
 /pkg/proto/                             @DataDog/agent-runtimes
@@ -478,8 +479,8 @@
 /pkg/remoteconfig/                      @DataDog/remote-config
 /pkg/runtime/                           @DataDog/agent-runtimes
 /pkg/system-probe/                      @DataDog/ebpf-platform
-/pkg/system-probe/api/client/client_windows.go      @DataDog/windows-kernel-integrations
-/pkg/system-probe/api/server/listener_windows.go    @DataDog/windows-kernel-integrations
+/pkg/system-probe/api/client/client_windows.go      @DataDog/windows-agent
+/pkg/system-probe/api/server/listener_windows.go    @DataDog/windows-agent
 /pkg/system-probe/config/adjust_npm.go  @DataDog/ebpf-platform @DataDog/Networks
 /pkg/system-probe/config/adjust_usm.go  @DataDog/ebpf-platform @DataDog/universal-service-monitoring
 /pkg/system-probe/config/adjust_security.go  @DataDog/ebpf-platform @DataDog/agent-security
@@ -512,7 +513,7 @@
 /pkg/util/cgroups/                      @DataDog/container-integrations
 /pkg/util/retry/                        @DataDog/container-platform
 /pkg/util/intern/                       @DataDog/ebpf-platform
-/pkg/util/crashreport/                  @DataDog/windows-kernel-integrations
+/pkg/util/crashreport/                  @DataDog/windows-agent
 /pkg/util/pdhutil/                      @DataDog/windows-agent
 /pkg/util/winutil/                      @DataDog/windows-agent
 /pkg/util/testutil/flake                @DataDog/agent-devx
@@ -539,7 +540,7 @@
 /pkg/process/util/address*.go           @DataDog/Networks
 /pkg/process/checks/net*.go             @DataDog/Networks
 /pkg/process/metadata/parser/           @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks
-/pkg/process/metadata/parser/*windows*  @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks @DataDog/windows-kernel-integrations
+/pkg/process/metadata/parser/*windows*  @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks @DataDog/windows-agent
 /pkg/process/monitor/                   @DataDog/universal-service-monitoring
 /pkg/process/net/                       @DataDog/universal-service-monitoring @DataDog/Networks
 /pkg/proto/datadog/remoteconfig/        @DataDog/remote-config
@@ -555,28 +556,28 @@
 /pkg/orchestrator/                      @DataDog/container-app
 /pkg/network/                           @DataDog/Networks
 /pkg/network/*usm*                      @DataDog/universal-service-monitoring
-/pkg/network/*_windows*.go              @DataDog/windows-kernel-integrations
-/pkg/network/config/config_test.go      @DataDog/Networks @DataDog/universal-service-monitoring @DataDog/windows-kernel-integrations
-/pkg/network/driver_*.go                @DataDog/windows-kernel-integrations
-/pkg/network/dns/*_windows*.go          @DataDog/windows-kernel-integrations
-/pkg/network/driver/                    @DataDog/windows-kernel-integrations
+/pkg/network/*_windows*.go              @DataDog/windows-agent
+/pkg/network/config/config_test.go      @DataDog/Networks @DataDog/universal-service-monitoring @DataDog/windows-agent
+/pkg/network/driver_*.go                @DataDog/windows-agent
+/pkg/network/dns/*_windows*.go          @DataDog/windows-agent
+/pkg/network/driver/                    @DataDog/windows-agent
 /pkg/network/ebpf/c/prebuilt/usm*      @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/runtime/usm*       @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/prebuilt/shared-libraries*  @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/runtime/shared-libraries*   @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/shared-libraries/           @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/protocols/          @DataDog/universal-service-monitoring
 /pkg/network/encoding/marshal/*usm*     @DataDog/universal-service-monitoring
-/pkg/network/encoding/marshal/*_windows*.go  @DataDog/windows-kernel-integrations
+/pkg/network/encoding/marshal/*_windows*.go  @DataDog/windows-agent
 /pkg/network/go/                        @DataDog/universal-service-monitoring
 /pkg/network/protocols/                 @DataDog/universal-service-monitoring
-/pkg/network/protocols/http/driver_*.go         @DataDog/windows-kernel-integrations
-/pkg/network/protocols/http/etw*.go             @DataDog/windows-kernel-integrations
-/pkg/network/protocols/http/*_windows*.go       @DataDog/windows-kernel-integrations
+/pkg/network/protocols/http/driver_*.go         @DataDog/windows-agent
+/pkg/network/protocols/http/etw*.go             @DataDog/windows-agent
+/pkg/network/protocols/http/*_windows*.go       @DataDog/windows-agent
 /pkg/network/tracer/testutil/proxy/              @DataDog/universal-service-monitoring
-/pkg/network/tracer/*_windows*.go               @DataDog/windows-kernel-integrations
+/pkg/network/tracer/*_windows*.go               @DataDog/windows-agent
 /pkg/network/usm/                       @DataDog/universal-service-monitoring
-/pkg/network/usm/tests/*_windows*.go    @DataDog/windows-kernel-integrations
+/pkg/network/usm/tests/*_windows*.go    @DataDog/windows-agent
 /pkg/ebpf/                              @DataDog/ebpf-platform
 /pkg/ebpf/map_cleaner*.go               @DataDog/universal-service-monitoring
 /pkg/compliance/                        @DataDog/agent-cspm
@@ -586,7 +587,7 @@
 /pkg/networkdevice/                     @DataDog/ndm-core
 /pkg/snmp/                              @DataDog/ndm-core
 /pkg/tagger/                            @DataDog/container-platform
-/pkg/windowsdriver/                     @DataDog/windows-kernel-integrations
+/pkg/windowsdriver/                     @DataDog/windows-agent
 /comp/core/workloadmeta/collectors/internal/cloudfoundry  @DataDog/agent-integrations
 /comp/core/workloadmeta/collectors/internal/containerd    @DataDog/container-platform @DataDog/container-integrations
 /comp/core/workloadmeta/collectors/internal/crio          @DataDog/container-platform @DataDog/container-integrations
@@ -686,15 +687,15 @@
 /test/new-e2e/tests/ndm/netflow               @DataDog/ndm-integrations
 /test/new-e2e/tests/netpath                   @DataDog/Networks
 /test/new-e2e/tests/npm                       @DataDog/Networks
-/test/new-e2e/tests/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-kernel-integrations
+/test/new-e2e/tests/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-agent
 /test/new-e2e/tests/orchestrator              @DataDog/container-app
 /test/new-e2e/tests/otel                      @DataDog/opentelemetry-agent
 /test/new-e2e/tests/process                   @DataDog/container-intake
-/test/new-e2e/tests/sysprobe-functional     @DataDog/windows-kernel-integrations
-/test/new-e2e/tests/security-agent-functional     @DataDog/windows-kernel-integrations @DataDog/agent-security
+/test/new-e2e/tests/sysprobe-functional     @DataDog/windows-agent
+/test/new-e2e/tests/security-agent-functional     @DataDog/windows-agent @DataDog/agent-security
 /test/new-e2e/tests/cws                       @DataDog/agent-security
 /test/new-e2e/tests/agent-log-pipelines       @DataDog/agent-log-pipelines
-/test/new-e2e/tests/windows                   @DataDog/windows-agent @DataDog/windows-kernel-integrations
+/test/new-e2e/tests/windows                   @DataDog/windows-agent @DataDog/windows-agent
 /test/new-e2e/tests/apm                       @DataDog/agent-apm
 /test/new-e2e/tests/remote-config             @DataDog/remote-config
 /test/new-e2e/tests/installer                 @DataDog/fleet @DataDog/windows-agent
@@ -713,7 +714,7 @@
 /tools/ebpf/                            @DataDog/ebpf-platform
 /tools/gdb/                             @DataDog/agent-runtimes
 /tools/go-update/                       @DataDog/agent-runtimes
-/tools/NamedPipeCmd/                    @DataDog/windows-kernel-integrations
+/tools/NamedPipeCmd/                    @DataDog/windows-agent
 /tools/retry_file_dump/                 @DataDog/agent-metric-pipelines
 /tools/windows/                         @DataDog/windows-agent
 /tools/windows/DatadogAgentInstaller/WixSetup/localization-en-us.wxl @DataDog/windows-agent @DataDog/documentation

.gitlab-ci.yml

@@ -661,10 +661,13 @@ workflow:
 .on_main_or_release_branch_or_deploy_manual:
   - <<: *if_deploy
     when: manual
+    allow_failure: true
   - <<: *if_main_branch
     when: manual
+    allow_failure: true
   - <<: *if_release_branch
     when: manual
+    allow_failure: true
 
 .on_all_builds:
   - <<: *if_run_all_builds
@@ -1038,9 +1041,12 @@ workflow:
   - changes:
       paths:
         - cmd/otel-agent/**/*
+        - comp/core/tagger/**/*
         - comp/otelcol/**/*
+        - pkg/config/setup/otlp.go
         - pkg/trace/api/otlp.go
         - pkg/trace/stats/otel_util.go
+        - pkg/trace/traceutil/otel_util.go
         - pkg/trace/transform/transform.go
         - test/new-e2e/tests/otel/**/*
       compare_to: $COMPARE_TO_BRANCH

.gitlab/JOBOWNERS

@@ -20,7 +20,7 @@ fetch_openjdk                        @DataDog/agent-metric-pipelines
 tests_*                                 @DataDog/multiple
 tests_ebpf*                             @DataDog/ebpf-platform
 tests_serverless                        @DataDog/serverless
-tests_windows_sysprobe*                 @DataDog/windows-kernel-integrations
+tests_windows_sysprobe*                 @DataDog/windows-agent
 security_go_generate_check              @DataDog/agent-security
 prepare_sysprobe_ebpf_functional_tests* @DataDog/ebpf-platform
 prepare_secagent_ebpf_functional_tests* @DataDog/agent-security
@@ -143,6 +143,7 @@ trace_agent_integration_tests @DataDog/agent-apm
 # Functional test
 serverless_cold_start_performance-deb_x64      @DataDog/serverless
 static_quality_gates                           @DataDog/agent-delivery
+manual_gate_threshold_update                   @DataDog/agent-delivery
 oracle*                                        @DataDog/database-monitoring
 
 # E2E

.gitlab/binary_build/cluster_agent.yml

@@ -9,7 +9,7 @@
     - !reference [.retrieve_linux_go_deps]
   script:
     - dda inv -- check-go-version
-    - dda inv -- -e cluster-agent.build
+    - dda inv -- -e cluster-agent.build --major-version "$AGENT_MAJOR_VERSION"
   artifacts:
     paths:
       - $CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent
@@ -23,6 +23,7 @@
     KUBERNETES_MEMORY_REQUEST: "8Gi"
     KUBERNETES_MEMORY_LIMIT: "8Gi"
     KUBERNETES_CPU_REQUEST: 6
+    AGENT_MAJOR_VERSION: 7
 
 cluster_agent-build_amd64:
   extends: .cluster_agent-build_common

.gitlab/common/macos.yml

@@ -23,19 +23,50 @@
     export PATH="$(pyenv root)/shims:$PATH"
     eval "$(pyenv init -)"
     eval "$(pyenv virtualenv-init -)"
-  - PYTHON_VERSION=3.12.6
-  - VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
-  - VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
-  - echo "Using Python $PYTHON_VERSION..."
+  # Select target python version
+  # 1. If PYTHON_VERSION is set, use it (and install it if necessary)
+  # 2. If PYTHON_VERSION is not set, use a version matching the one in .python-version
+  #   2.a If there is a 3.M.x version (or multiple matches) that is already installed on the runner, select the latest version in this list
+  #   2.b If there is no match, download and install the latest one
   - |
-    # Check if the virtual environment directory exists
-    if [ ! -d "$VENV_PATH" ]; then
-      # Install target python if necessary
-      if [ ! -d "$(pyenv root)/versions/$PYTHON_VERSION" ]; then
+    if [ -n "$PYTHON_VERSION" ]; then
+      # 1. Use PYTHON_VERSION if set
+      if ! [[ "$PYTHON_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        echo "Invalid Python version format (should be X.Y.Z): $PYTHON_VERSION" >& 2
+        exit 1
+      fi
+      if ! [ -d "$(pyenv root)/versions/$PYTHON_VERSION" ]; then
+        echo "Python version $PYTHON_VERSION not found. Installing..."
+        pyenv install "$PYTHON_VERSION"
+      fi
+    else
+      # 2. Find appropriate python version from major version
+      PYTHON_VERSION="$(cat .python-version)"
+      echo "Find python version matching $PYTHON_VERSION"
+      PYTHON_VERSION_ESCAPED="${PYTHON_VERSION//./\\.}"
+      versionmatches="$(ls "$(pyenv root)/versions" | grep -E "^${PYTHON_VERSION_ESCAPED}\\.[0-9]+$")"
+      if [ -n "$versionmatches" ]; then
+        # 2.a.
+        echo "Found already existing python version for $PYTHON_VERSION"
+      else
+        # 2.b.
         echo "Installing Python $PYTHON_VERSION..."
         pyenv install "$PYTHON_VERSION"
+        versionmatches="$(ls "$(pyenv root)/versions" | grep -E "^${PYTHON_VERSION_ESCAPED}\\.[0-9]+$")"
+        if [ -z "$versionmatches" ]; then
+          echo "No matching Python version found for $PYTHON_VERSION even after installation." >& 2
+          exit 1
+        fi
       fi
-
+      # If there are multiple matches, select the latest one
+      PYTHON_VERSION="$(echo "$versionmatches" | sort -V | tail -n 1)"
+    fi
+    VENV_NAME="datadog-agent-python-$PYTHON_VERSION"
+    VENV_PATH="$(pyenv root)/versions/$VENV_NAME"
+  - echo "Using Python $PYTHON_VERSION..."
+  - |
+    # Check if the virtual environment directory exists
+    if [ ! -d "$VENV_PATH" ]; then
       echo "Creating virtual environment '$VENV_NAME'..."
       pyenv virtualenv "$PYTHON_VERSION" "$VENV_NAME"
     else

.gitlab/common/test_infra_version.yml

@@ -5,5 +5,5 @@
 
 ---
 variables:
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: d610d4c9aa4b
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 54e029f4a38f
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ''