[pull] main from DataDog:main

.ddqa/config.toml

@@ -176,12 +176,12 @@ jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-cspm"
 github_labels = ["team/agent-cspm"]
 
-[teams."Processes"]
-jira_project = "PROCS"
+[teams."Container Intake"]
+jira_project = "CTK"
 jira_issue_type = "Task"
 jira_statuses = ["TRIAGE", "In Progress", "Done"]
-github_team = "processes"
-github_labels = ["team/processes"]
+github_team = "container-intake"
+github_labels = ["team/container-intake"]
 
 [teams."Windows Agent"]
 jira_project = "WINA"

.github/CODEOWNERS

@@ -218,7 +218,7 @@
 /cmd/cws-instrumentation/               @DataDog/agent-security
 /cmd/dogstatsd/                         @DataDog/agent-metrics-logs
 /cmd/otel-agent/                        @DataDog/opentelemetry
-/cmd/process-agent/                     @DataDog/processes
+/cmd/process-agent/                     @DataDog/container-intake
 /cmd/serverless/                        @DataDog/serverless @Datadog/serverless-aws
 /cmd/serverless-init/                   @DataDog/serverless
 /cmd/system-probe/                      @DataDog/ebpf-platform
@@ -227,12 +227,12 @@
 /cmd/system-probe/config/adjust_security.go  @DataDog/ebpf-platform @DataDog/agent-security
 /cmd/system-probe/modules/network_tracer*   @DataDog/Networks
 /cmd/system-probe/modules/oom_kill_probe*   @DataDog/container-integrations
-/cmd/system-probe/modules/process*      @DataDog/processes
+/cmd/system-probe/modules/process*      @DataDog/container-intake
 /cmd/system-probe/modules/eventmonitor* @DataDog/agent-security
 /cmd/system-probe/modules/tcp_queue_tracer* @DataDog/container-integrations
 /cmd/system-probe/modules/traceroute*   @DataDog/network-device-monitoring @Datadog/Networks
 /cmd/system-probe/modules/ping*         @DataDog/ndm-core
-/cmd/system-probe/modules/language_detection* @DataDog/processes @DataDog/universal-service-monitoring
+/cmd/system-probe/modules/language_detection* @DataDog/container-intake @DataDog/universal-service-monitoring
 /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
@@ -299,7 +299,7 @@
 /comp/netflow @DataDog/ndm-integrations
 /comp/networkpath @DataDog/Networks @DataDog/network-device-monitoring
 /comp/otelcol @DataDog/opentelemetry
-/comp/process @DataDog/processes
+/comp/process @DataDog/container-intake
 /comp/remote-config @DataDog/remote-config
 /comp/snmptraps @DataDog/ndm-core
 /comp/systray @DataDog/windows-agent
@@ -391,7 +391,7 @@
 /pkg/collector/corechecks/ebpf/c/runtime/ebpf*        @DataDog/ebpf-platform
 /pkg/collector/corechecks/embed/                   @Datadog/agent-delivery
 /pkg/collector/corechecks/embed/apm/               @DataDog/agent-apm
-/pkg/collector/corechecks/embed/process/           @DataDog/processes
+/pkg/collector/corechecks/embed/process/           @DataDog/container-intake
 /pkg/collector/corechecks/gpu/                     @DataDog/ebpf-platform
 /pkg/collector/corechecks/network-devices/         @DataDog/ndm-integrations
 /pkg/collector/corechecks/orchestrator/   @DataDog/container-app
@@ -413,7 +413,7 @@
 /pkg/config/autodiscovery/              @DataDog/container-integrations @DataDog/container-platform
 /pkg/config/env                         @DataDog/container-integrations @DataDog/container-platform
 /pkg/config/setup                            @DataDog/agent-shared-components
-/pkg/config/setup/process*.go                 @DataDog/processes
+/pkg/config/setup/process*.go                 @DataDog/container-intake
 /pkg/config/setup/system_probe.go               @DataDog/ebpf-platform
 /pkg/config/setup/system_probe_cws.go           @DataDog/agent-security
 /pkg/config/setup/system_probe_cws_notwin.go    @DataDog/agent-security
@@ -436,8 +436,8 @@
 /pkg/pidfile/                           @DataDog/agent-shared-components
 /pkg/persistentcache/                   @DataDog/agent-metrics-logs
 /pkg/proto/                             @DataDog/agent-shared-components
-/pkg/proto/datadog/languagedetection    @DataDog/processes
-/pkg/proto/datadog/process              @DataDog/processes
+/pkg/proto/datadog/languagedetection    @DataDog/container-intake
+/pkg/proto/datadog/process              @DataDog/container-intake
 /pkg/proto/datadog/trace                @DataDog/agent-apm
 /pkg/proto/datadog/workloadmeta         @DataDog/container-platform
 /pkg/remoteconfig/                      @DataDog/remote-config
@@ -472,7 +472,7 @@
 /pkg/util/testutil/patternscanner.go    @DataDog/universal-service-monitoring @DataDog/ebpf-platform
 /pkg/util/testutil/docker               @DataDog/universal-service-monitoring @DataDog/ebpf-platform
 /pkg/util/trie                          @DataDog/container-integrations
-/pkg/languagedetection                  @DataDog/processes @DataDog/universal-service-monitoring
+/pkg/languagedetection                  @DataDog/container-intake @DataDog/universal-service-monitoring
 /pkg/linters/                           @DataDog/agent-devx-loops
 /pkg/linters/components/                @DataDog/agent-shared-components
 /pkg/logs/                              @DataDog/agent-metrics-logs
@@ -486,18 +486,18 @@
 /pkg/logs/processor                     @DataDog/agent-processing-and-routing
 /pkg/logs/sds                           @DataDog/agent-processing-and-routing
 /pkg/logs/sender                        @DataDog/agent-processing-and-routing
-/pkg/process/                           @DataDog/processes
+/pkg/process/                           @DataDog/container-intake
 /pkg/process/util/address*.go           @DataDog/Networks
 /pkg/process/checks/net*.go             @DataDog/Networks
-/pkg/process/metadata/parser/           @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks
-/pkg/process/metadata/parser/*windows*  @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks @DataDog/windows-kernel-integrations
+/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/monitor/                   @DataDog/universal-service-monitoring
 /pkg/process/net/                       @DataDog/universal-service-monitoring @DataDog/Networks
 /pkg/proto/datadog/remoteconfig/        @DataDog/remote-config
 /pkg/proto/pbgo/                        # do not notify anyone
 /pkg/proto/pbgo/trace                   @DataDog/agent-apm
 /pkg/proto/pbgo/languagedetection       @DataDog/agent-apm
-/pkg/proto/pbgo/process                 @DataDog/processes
+/pkg/proto/pbgo/process                 @DataDog/container-intake
 /pkg/proto/pbgo/core                    @DataDog/agent-shared-components
 /pkg/proto/pbgo/core/remoteconfig.pb.go       @DataDog/remote-config
 /pkg/proto/pbgo/core/remoteconfig_gen.go      @DataDog/remote-config
@@ -558,7 +558,7 @@
 /tasks/unit_tests/update_go_tests.py    @DataDog/agent-shared-components
 /tasks/cluster_agent_cloudfoundry.py    @DataDog/platform-integrations
 /tasks/new_e2e_tests.py                 @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
-/tasks/process_agent.py                 @DataDog/processes
+/tasks/process_agent.py                 @DataDog/container-intake
 /tasks/system_probe.py                  @DataDog/ebpf-platform
 /tasks/ebpf.py                          @DataDog/ebpf-platform
 /tasks/kmt.py                           @DataDog/ebpf-platform
@@ -605,15 +605,15 @@
 /test/new-e2e/tests/containers                @DataDog/container-integrations @DataDog/container-platform
 /test/new-e2e/tests/discovery                 @DataDog/universal-service-monitoring
 /test/new-e2e/tests/ha-agent                  @DataDog/ndm-core
-/test/new-e2e/tests/language-detection        @DataDog/processes
+/test/new-e2e/tests/language-detection        @DataDog/container-intake
 /test/new-e2e/tests/ndm                       @DataDog/ndm-core
 /test/new-e2e/tests/ndm/netflow               @DataDog/ndm-integrations
 /test/new-e2e/tests/netpath                   @DataDog/Networks @DataDog/network-device-monitoring
 /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/orchestrator              @DataDog/container-app
 /test/new-e2e/tests/otel                      @DataDog/opentelemetry
-/test/new-e2e/tests/process                   @DataDog/processes
+/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/cws                       @DataDog/agent-security

.github/workflows/codeql-analysis.yml

@@ -45,7 +45,7 @@ jobs:
           go-version-file: ".go-version"
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/init@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
         with:
           languages: ${{ matrix.language }}
           config: |
@@ -67,4 +67,4 @@ jobs:
           invoke agent.build --build-exclude=systemd
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/analyze@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7

.github/workflows/create_rc_pr.yml

@@ -100,4 +100,4 @@ jobs:
                 git config user.name "github-actions[bot]"
                 git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
                 git fetch
-                inv -e release.create-rc "$MATRIX" --slack-webhook=${{ secrets.AGENT_RELEASE_SYNC_SLACK_WEBHOOK }}
+                inv -e release.create-rc -r "$MATRIX" --slack-webhook=${{ secrets.AGENT_RELEASE_SYNC_SLACK_WEBHOOK }}

.gitlab-ci.yml

@@ -282,6 +282,9 @@ variables:
 .if_main_branch: &if_main_branch
   if: $CI_COMMIT_BRANCH == "main"
 
+.if_not_main_branch: &if_not_main_branch
+  if: $CI_COMMIT_BRANCH != "main"
+
 .if_release_branch: &if_release_branch
   if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
 
@@ -628,6 +631,10 @@ workflow:
     variables:
       FAST_TESTS: "true"
 
+.only_main:
+  - <<: *if_not_main_branch
+    when: never
+
 .except_main_or_release_branch:
   - <<: *if_main_branch
     when: never

.gitlab/JOBOWNERS

@@ -114,9 +114,9 @@ deploy_packages*                       @DataDog/agent-delivery
 deploy_staging*                        @DataDog/agent-delivery
 publish_winget*                        @DataDog/windows-agent
 powershell_script_deploy               @DataDog/windows-agent
-windows_bootstrapper_deploy             @DataDog/windows-agent
+windows_bootstrapper_deploy            @DataDog/windows-agent
 qa_*_oci                               @DataDog/agent-delivery
-qa_installer_script                    @DataDog/agent-delivery
+qa_installer_script*                   @DataDog/agent-delivery
 
 # Deploy containers
 deploy_containers*                     @Datadog/agent-delivery

.gitlab/dev_container_deploy/e2e.yml

@@ -34,6 +34,22 @@ qa_agent_jmx:
     IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-arm64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-win1809-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx-winltsc2022-amd64
     IMG_DESTINATIONS: agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-jmx
 
+qa_agent_fips_jmx:
+  extends: .docker_publish_job_definition
+  stage: dev_container_deploy
+  rules:
+    - !reference [.except_mergequeue]
+    - !reference [.except_disable_e2e_tests]
+    - when: on_success
+  needs:
+    - docker_build_fips_agent7_jmx
+    - docker_build_fips_agent7_arm64_jmx
+    - docker_build_fips_agent7_windows2022_core_jmx
+  variables:
+    IMG_REGISTRIES: agent-qa
+    IMG_SOURCES: ${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-jmx-amd64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-jmx-arm64,${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips-jmx-winltsc2022-servercore-amd64
+    IMG_DESTINATIONS: agent:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-fips-jmx
+
 qa_agent_ot:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy

.gitlab/e2e/e2e.yml

@@ -43,7 +43,7 @@
     KUBERNETES_MEMORY_REQUEST: 12Gi
     KUBERNETES_MEMORY_LIMIT: 16Gi
     KUBERNETES_CPU_REQUEST: 6
-    # AWS SSH Key configuration  
+    # AWS SSH Key configuration
     E2E_AWS_PUBLIC_KEY_PATH: /tmp/agent-qa-aws-ssh-key.pub
     E2E_AWS_PRIVATE_KEY_PATH: /tmp/agent-qa-aws-ssh-key
     E2E_KEY_PAIR_NAME: datadog-agent-ci-rsa
@@ -512,7 +512,7 @@ new-e2e-ha-agent:
     TEAM: ndm-core
 
 new-e2e-netpath:
-  extends: .new_e2e_template_needs_deb_x64
+  extends: .new_e2e_template_needs_deb_windows_x64
   rules:
     - !reference [.on_netpath_or_e2e_changes]
     - !reference [.manual]

.gitlab/e2e_install_packages/include.yml

@@ -9,3 +9,4 @@ include:
   - .gitlab/e2e_install_packages/centos.yml
   - .gitlab/e2e_install_packages/suse.yml
   - .gitlab/e2e_install_packages/windows.yml
+  - .gitlab/e2e_install_packages/installer.yml

.gitlab/e2e_install_packages/installer.yml

@@ -0,0 +1,15 @@
+qa_installer_script_main:
+  image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
+  stage: e2e_install_packages
+  tags: ["arch:amd64"]
+  rules:
+    - !reference [.only_main] # Disable non-main branch. Must be first.
+    - !reference [.on_installer_or_e2e_changes]
+    - !reference [.manual]
+  needs:
+    - new-e2e-installer-script
+    - installer-install-scripts
+  before_script:
+    - ls $OMNIBUS_PACKAGE_DIR
+  script:
+    - $S3_CP_CMD --recursive --exclude "*" --include "install-*.sh" "$OMNIBUS_PACKAGE_DIR" "s3://${INSTALLER_TESTING_S3_BUCKET}/scripts/"

.golangci.yml

@@ -18,8 +18,6 @@ issues:
   exclude:
     - "Error return value of `io.WriteString` is not checked" # 'errcheck' errors in tools/dep_tree_resolver/go_deps.go
     - "Error return value of `pem.Encode` is not checked" # 'errcheck' errors in test/integration/utils/certificates.go
-    - "Error return value of `c.logErrorNotImplemented` is not checked" # 'errcheck' errors in pkg/config/nodetreemodel/config.go
-    - "Error return value of `n.logErrorNotImplemented` is not checked" # 'errcheck' errors in pkg/config/nodetreemodel/config.go
     - "exported: exported const Exec should have comment \\(or a comment on this block\\) or be unexported" # 'revive' errors in pkg/process/events/model/model_common.go
     - "exported: exported const APIName should have comment \\(or a comment on this block\\) or be unexported" # 'revive' errors in pkg/serverless/trace/inferredspan/constants.go
     - "unnecessary conversion" # 'unconvert' errors in test/integration/utils/certificates_test.go

Dockerfiles/agent/windows/amd64/Dockerfile

@@ -7,7 +7,8 @@ ARG WITH_JMX="false"
 ARG VARIANT="unknown"
 ARG INSTALL_INFO="unknown"
 ARG GENERAL_ARTIFACTS_CACHE_BUCKET_URL
-ARG WITH_FIPS="false"
+# Should be empty for non-FIPS builds
+ARG WITH_FIPS
 
 LABEL maintainer "Datadog <package@datadoghq.com>"
 
@@ -23,6 +24,7 @@ RUN . ./install.ps1
 COPY bouncycastle-fips /fips-build
 COPY install-fips.ps1 ./
 RUN . ./install-fips.ps1
+ENV JAVA_TOOL_OPTIONS="${WITH_FIPS:+--module-path=\'c:\\program files\\datadog\\bouncycastle fips\' -Djava.security.properties==\'c:\\program files\\datadog\\bouncycastle fips\\java.security\' -Dpolicy.url.2=\'file:c:\\program files\\datadog\\bouncycastle fips\\bc-fips.policy\'}"
 
 EXPOSE 8125/udp 8126/tcp
 

cmd/agent/launcher/launcher.c

@@ -0,0 +1,32 @@
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#ifndef DD_AGENT_PATH
+#error DD_AGENT_PATH must be defined
+#endif
+
+#ifndef DD_AGENT
+#define DD_AGENT "agent"
+#endif
+
+int main(int argc, char **argv) {
+    if (argc > 1) {
+        argv[0] = DD_AGENT;
+    } else {
+        argv = malloc(sizeof(char *) * 2);
+        argv[0] = DD_AGENT;
+        argv[1] = NULL;
+    }
+
+    if (strlen(DD_AGENT_PATH) == 0) {
+        fprintf(stderr, "Cannot determine agent location\n");
+        exit(1);
+    }
+
+    setenv("DD_BUNDLED_AGENT", DD_AGENT, 0);
+
+    execvp(DD_AGENT_PATH, argv);
+    return 1;
+}

cmd/agent/main.go

@@ -9,13 +9,62 @@
 package main
 
 import (
+	"fmt"
 	"os"
+	"path"
+	"strings"
 
 	"github.com/DataDog/datadog-agent/cmd/agent/command"
 	"github.com/DataDog/datadog-agent/cmd/agent/subcommands"
 	"github.com/DataDog/datadog-agent/cmd/internal/runcmd"
+	"github.com/spf13/cobra"
 )
 
+var agents = map[string]func() *cobra.Command{}
+
+func registerAgent(names []string, getCommand func() *cobra.Command) {
+	for _, name := range names {
+		agents[name] = getCommand
+	}
+}
+
+func coreAgentMain() *cobra.Command {
+	return command.MakeCommand(subcommands.AgentSubcommands())
+}
+
+func init() {
+	registerAgent([]string{"agent", "datadog-agent", "dd-agent"}, coreAgentMain)
+}
+
 func main() {
-	os.Exit(runcmd.Run(command.MakeCommand(subcommands.AgentSubcommands())))
+	process := strings.TrimSpace(os.Getenv("DD_BUNDLED_AGENT"))
+
+	if process == "" {
+		if len(os.Args) > 0 {
+			process = strings.TrimSpace(path.Base(os.Args[0]))
+		}
+
+		if process == "" {
+			executable, err := os.Executable()
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Failed to determine the Agent process name: %s\n", err.Error())
+				os.Exit(1)
+			}
+			process = executable
+		}
+
+		process = strings.TrimSuffix(process, path.Ext(process))
+	}
+
+	agentCmdBuilder := agents[process]
+	if agentCmdBuilder == nil {
+		fmt.Fprintf(os.Stderr, "Invoked as '%s', acting as main Agent.\n", process)
+		agentCmdBuilder = coreAgentMain
+	}
+
+	rootCmd := agentCmdBuilder()
+	if err := setProcessName(process); err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to set process name as '%s': %s\n", process, err)
+	}
+	os.Exit(runcmd.Run(rootCmd))
 }

cmd/agent/main_common.go

@@ -0,0 +1,13 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
+//go:build !linux
+
+package main
+
+// nolint: deadcode, unused
+func setProcessName(_ string) error {
+	return nil
+}