Skip to content

Commit

Permalink
Merge branch 'main' of ssh://github.com/DataDog/datadog-agent into le…
Browse files Browse the repository at this point in the history 
…naic/CONTINT-4295
  • Loading branch information
@L3n41c
L3n41c committed Dec 20, 2024
2 parents 336e2bb + 72c4da4 commit ead2539
Show file tree
Hide file tree
Showing 3,085 changed files with 91,900 additions and 68,144 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
173 changes: 1 addition & 172 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ experimental:
templates:
job_template: &job_template
docker:
- image: gcr.io/datadoghq/agent-circleci-runner:v48262719-bfb00f80
- image: gcr.io/datadoghq/agent-circleci-runner:v50263243-1a30c934
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down Expand Up @@ -66,19 +66,6 @@ jobs:
name: grab go deps
command: |
inv -e deps
- run:
name: build rtloader
command: |
inv rtloader.make --install-prefix=/go/src/github.com/DataDog/datadog-agent/dev
inv rtloader.install
- run:
name: lint rtloader
command: |
inv rtloader.format --raise-if-changed
- run:
name: test rtloader
command: |
inv rtloader.test
- run:
name: install go tooling
command: |
Expand All @@ -91,19 +78,6 @@ jobs:
- /go/src/github.com/DataDog/datadog-agent/dev
- /usr/local/bin

unit_tests:
<<: *job_template
resource_class: xlarge
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run unit tests
no_output_timeout: 20m
command: inv -e test --rerun-fails=2 --coverage --race --profile --cpus 8 --build-stdlib --test-washer
environment:
GO_TEST_SKIP_FLAKE: "true"

integration_tests:
<<: *job_template
resource_class: large
Expand All @@ -115,80 +89,6 @@ jobs:
name: run integration tests
command: inv -e integration-tests --race --remote-docker

go_linting:
<<: *job_template
resource_class: xlarge
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run go linters
no_output_timeout: 20m
command: inv -e linter.go

licenses_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run license linting
command: inv -e lint-licenses

copyrights_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run copyrights linting
command: inv -e linter.copyrights

filename_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run filename linting
command: inv -e linter.filenames

shell_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: Install shellcheck
command: inv -e install-shellcheck
- run:
name: Print shellcheck version
command: shellcheck --version
- run:
name: Run shellcheck
#Excludes:
#SC2028: echo may not expand escape sequences. Use printf.
#SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo".
command: shellcheck --severity=info -e SC2059 -e SC2028 --shell=bash ./cmd/**/*.sh ./omnibus/package-scripts/*/*

component_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run component linting
command: inv -e lint-components lint-fxutil-oneshot-test

codeowner_linting:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: run CODEOWNER linting
command: inv -e github.lint-codeowner

docker_tests:
<<: *job_template
steps:
Expand All @@ -202,40 +102,6 @@ jobs:
name: run docker image integration tests
command: inv -e docker.integration-tests

build_binaries:
<<: *job_template
resource_class: large
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: build dogstatsd
command: inv -e dogstatsd.build --static
- run:
name: build agent
command: inv -e agent.build --exclude-rtloader

build_iot_agent:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: build iot agent
command: inv -e agent.build --flavor iot
- run:
name: test iot agent
command: DD_HOSTNAME=test-circleci-hostname ./bin/agent/agent -c ./bin/agent/dist check cpu

documentation_generation:
<<: *job_template
steps:
- restore_cache: *restore_source
- restore_cache: *restore_deps
- run:
name: generate doxygen documentation
command: inv -e rtloader.generate-doc

workflows:
version: 2
test_and_build:
Expand All @@ -244,46 +110,9 @@ workflows:
- dependencies:
requires:
- checkout_code
- unit_tests:
requires:
- dependencies
- integration_tests:
requires:
- dependencies
- go_linting:
requires:
- dependencies
- licenses_linting:
requires:
- dependencies
- copyrights_linting:
requires:
- dependencies
- filename_linting:
requires:
- dependencies
- shell_linting:
requires:
- dependencies
- component_linting:
requires:
- dependencies
- codeowner_linting:
requires:
- dependencies
- docker_tests:
requires:
- dependencies
- documentation_generation:
requires:
- dependencies
- build_binaries:
requires:
- unit_tests
- integration_tests
- docker_tests
- build_iot_agent:
requires:
- unit_tests
- integration_tests
- docker_tests
2 changes: 1 addition & 1 deletion .custom-gcl.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v1.59.1
version: v1.60.3

name: golangci-lint

Expand Down
14 changes: 7 additions & 7 deletions .ddqa/config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jira_issue_type = "Task"
jira_statuses = ["To Do", "In Progress", "Done"]
github_team = "agent-delivery"
github_labels = ["team/agent-delivery"]
exclude_members = ["hithwen"]
exclude_members = ["KSerrania"]

[teams."Universal Service Monitoring"]
jira_project = "USMON"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -215,8 +215,8 @@ github_labels = ["team/container-app"]
jira_project = "INPLAT"
jira_issue_type = "Task"
jira_statuses = ["Selected For Development", "In Progress", "Done"]
github_team = "apm-onboarding"
github_labels = ["team/apm-onboarding"]
github_team = "injection-platform"
github_labels = ["team/injection-platform"]

[teams."Agent Release Management"]
jira_project = "AGNTR"
Expand Down
47 changes: 23 additions & 24 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ go.sum -diff -merge linguist-generated=true
pkg/security/probe/constantfetch/btfhub/constants.json -diff -merge linguist-generated=true
pkg/security/seclwin/** -diff -merge linguist-generated=true
# Fixtures should have LF line endings because they are checked against OCI packages built on Linux
pkg/fleet/internal/fixtures/** text=auto eol=lf
pkg/fleet/installer/fixtures/** text=auto 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).
Expand All @@ -27,26 +27,25 @@ pkg/fleet/internal/fixtures/** text=auto eol=lf
# textconv = astextplain
# ```


*.doc diff
*.DOC diff
*.docx diff
*.DOCX diff
*.docm diff
*.DOCM diff
*.dot diff
*.DOT diff
*.dotx diff
*.DOTX diff
*.dotm diff
*.DOTM diff
*.pdf diff
*.PDF diff
*.rtf diff
*.RTF diff
*.ods diff
*.ODS diff
*.odf diff
*.ODF diff
*.odt diff
*.ODT diff
*.doc diff
*.DOC diff
*.docx diff
*.DOCX diff
*.docm diff
*.DOCM diff
*.dot diff
*.DOT diff
*.dotx diff
*.DOTX diff
*.dotm diff
*.DOTM diff
*.pdf diff
*.PDF diff
*.rtf diff
*.RTF diff
*.ods diff
*.ODS diff
*.odf diff
*.ODF diff
*.odt diff
*.ODT diff
Loading

0 comments on commit ead2539

Please sign in to comment.