Merge branch 'main' into tobz/add-hamr-support-logs

.circleci/config.yml

@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v27950662-17e84032
+      - image: gcr.io/datadoghq/agent-circleci-runner:v29603376-40fa78c0
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

.copyright-overrides.yml

@@ -203,9 +203,15 @@ github.com/aquasecurity/go-gem-version: Copyright (c) 2020 Teppei Fukuda (knqyf2
 github.com/aquasecurity/go-npm-version: Copyright (c) 2020 Teppei Fukuda (knqyf263)
 github.com/aquasecurity/go-pep440-version: Copyright (c) 2020 Teppei Fukuda (knqyf263)
 github.com/aquasecurity/go-version: Copyright (c) 2020 Teppei Fukuda (knqyf263)
+github.com/aquasecurity/trivy-java-db: Copyright 2019-2020 Aqua Security
 github.com/spdx/tools-golang: Copyright (c) 2018 The Authors
 github.com/google/flatbuffers: Copyright (c) 2014 Google
 github.com/gocomply/scap: "CC0 1.0 Universal"
+github.com/anchore/go-struct-converter: Copyright (c) 2022-2023 Anchore, Inc.
+github.com/bitnami/go-version/pkg/version: Copyright (c) 2023-2024 Carlos Rodríguez Hernández
+github.com/kylelemons/godebug: Copyright (c) 2013-2020 Kyle Lemons
+github.com/santhosh-tekuri/jsonschema: Copyright (c) 2017-2024 Santhosh Kumar Tekuri
+
 
 # The Copyright information is not contained in the LICENSE file, but it can be found in other
 # files in the package, such as:
@@ -292,3 +298,18 @@ github.com/pjbgf/sha1cd:
 
 github.com/kr/pretty: Copyright 2012 Keith Rarick
 github.com/kr/text: Copyright 2012 Keith Rarick
+
+# Copyright information is in the Makefile
+github.com/openvex/go-vex: Copyright 2023 The OpenVEX Authors
+
+# Copyright information is in the LICENSE
+github.com/aquasecurity/trivy-policies/pkg/spec: Copyright (c) 2024 Aqua Security
+github.com/aquasecurity/trivy-policies/rules/specs: Copyright (c) 2024 Aqua Security
+github.com/pjbgf/sha1cd: Copyright 2023 pjbgf
+
+# Copyright information is in the source headers
+github.com/csaf-poc/csaf_distribution: Copyright 2021-2023 German Federal Office for Information Security (BSI) <https://www.bsi.bund.de>
+
+github.com/vibrantbyte/go-antpath/antpath: vibrantbyte <[email protected]>|suchao <[email protected]>
+github.com/vibrantbyte/go-antpath/extend: vibrantbyte <[email protected]>|suchao <[email protected]>
+

.ddqa/config.toml

@@ -1,193 +1,133 @@
 global_config_source = "aHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL0RhdGFEb2cvZ2l0aHViLW1ldGFkYXRhL21hc3Rlci9qaXJhLnRvbWw="
-qa_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
-ignored_labels = [
-  "qa/done",
-  "qa/no-code-change",
-]
+qa_statuses = ["To Do", "In Progress", "Done"]
+ignored_labels = ["qa/done", "qa/no-code-change"]
 
 [teams."Agent Metrics Logs"]
 jira_project = "AMLII"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-metrics-logs"
 github_labels = ["team/agent-metrics-logs"]
 exclude_members = ["olivielpeau"]
 
 [teams."Agent Shared Components"]
 jira_project = "ASCII"
 jira_issue_type = "QA"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-shared-components"
 github_labels = ["team/agent-shared-components"]
-exclude_members = [
-  "sgnn7",
-  "truthbk",
-  "cmourot",
-]
+exclude_members = ["sgnn7", "truthbk", "cmourot"]
 
-[teams."Agent Platform"]
-jira_project = "APL"
+[teams."Agent Developer Tools"]
+jira_project = "ADXT"
 jira_issue_type = "QA"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
-github_team = "agent-platform"
-github_labels = ["team/agent-platform"]
-exclude_members = ["olivielpeau"]
+jira_statuses = ["To Do", "In Progress", "Done"]
+github_team = "agent-developer-tools"
+github_labels = ["team/agent-developer-tools"]
+exclude_members = []
+
+[teams."Agent CI Experience"]
+jira_project = "ACIX"
+jira_issue_type = "QA"
+jira_statuses = ["To Do", "In Progress", "Done"]
+github_team = "agent-ci-experience"
+github_labels = ["team/agent-ci-experience"]
+exclude_members = []
+
+[teams."Agent Build and Releases Experience"]
+jira_project = "BARX"
+jira_issue_type = "Task"
+jira_statuses = ["To Do", "In Progress", "Done"]
+github_team = "agent-build-and-releases"
+github_labels = ["team/agent-build-and-releases"]
+exclude_members = ["hithwen"]
 
 [teams."Universal Service Monitoring"]
 jira_project = "USMON"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "universal-service-monitoring"
 github_labels = ["team/usm"]
 
 [teams."Network Device Monitoring"]
 jira_project = "NDMII"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "network-device-monitoring"
 github_labels = ["team/network-device-monitoring"]
 exclude_members = ["leeavital", "heyronhay"]
 
 [teams."Network Performance Monitoring"]
 jira_project = "NPM"
 jira_issue_type = "Task"
-jira_statuses = [
-  "Backlog",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["Backlog", "In Progress", "Done"]
 github_team = "networks"
 github_labels = ["team/networks"]
 
 [teams."OpenTelemetry"]
 jira_project = "OTEL"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "opentelemetry"
 github_labels = ["team/opentelemetry"]
 
 [teams."eBPF Platform"]
 jira_project = "EBPF"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "ebpf-platform"
 github_labels = ["team/ebpf-platform"]
 
 [teams."Agent Integrations"]
 jira_project = "AI"
 jira_issue_type = "Task"
-jira_statuses = [
-  "Backlog",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["Backlog", "In Progress", "Done"]
 github_team = "agent-integrations"
 github_labels = ["team/integrations"]
-exclude_members = [
-  "ofek",
-  "alopezz",
-]
+exclude_members = ["ofek", "alopezz"]
 
 [teams."Platform Integrations"]
 jira_project = "PLINT"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "platform-integrations"
 github_labels = ["team/platform-integrations"]
-exclude_members = [
-  "hithwen",
-]
+exclude_members = ["hithwen"]
 
 [teams."APM"]
 jira_project = "AIT"
 jira_component = "Trace Agent"
 jira_issue_type = "Task"
-jira_statuses = [
-  "Backlog",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["Backlog", "In Progress", "Done"]
 github_team = "apm-go"
 github_labels = ["team/agent-apm"]
 
 [teams."Remote Config"]
 jira_project = "RC"
 jira_issue_type = "QA"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "remote-config"
 github_labels = ["team/remote-config"]
 
 [teams."Container Integrations"]
 jira_project = "CONTINT"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "container-integrations"
 github_labels = ["team/containers"]
 
 [teams."Container Ecosystems"]
 jira_project = "CECO"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "container-ecosystems"
 github_labels = ["team/container-ecosystems"]
 
 [teams."Security And Compliance Agent"]
 jira_project = "CWS"
 jira_component = "Agent"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-security"
 github_labels = ["team/agent-security"]
 exclude_members = [
@@ -199,87 +139,55 @@ exclude_members = [
 jira_project = "SEC"
 jira_component = "CSPM Agent"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-cspm"
 github_labels = ["team/agent-cspm"]
 
 [teams."Processes"]
 jira_project = "PROCS"
 jira_issue_type = "Task"
-jira_statuses = [
-  "TRIAGE",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["TRIAGE", "In Progress", "Done"]
 github_team = "processes"
 github_labels = ["team/processes"]
 
 [teams."Windows Agent"]
 jira_project = "WINA"
 jira_issue_type = "QA Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+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",
-]
+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"
-jira_statuses = [
-  "Eventually",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["Eventually", "In Progress", "Done"]
 github_team = "database-monitoring"
 github_labels = ["team/database-monitoring"]
 
 [teams."Container App"]
 jira_project = "CAP"
 jira_issue_type = "Task"
-jira_statuses = [
-  "💼 To Do",
-  "💡 In Progress",
-  "✅ Done",
-]
+jira_statuses = ["💼 To Do", "💡 In Progress", "✅ Done"]
 github_team = "container-app"
 github_labels = ["team/container-app"]
 
 [teams."APM Onboarding"]
 jira_project = "APMON"
 jira_issue_type = "Story"
-jira_statuses = [
-  "Selected For Development",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["Selected For Development", "In Progress", "Done"]
 github_team = "apm-onboarding"
 github_labels = ["team/apm-onboarding"]
 
 [teams."Agent Release Management"]
 jira_project = "AGNTR"
 jira_issue_type = "Task"
-jira_statuses = [
-  "To Do",
-  "In Progress",
-  "Done",
-]
+jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-release-management"
 github_labels = ["team/agent-release-management"]