Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into mwdd146980/port-confl…
Browse files Browse the repository at this point in the history
…ict-windows
mwdd146980 committed Sep 26, 2024

Verified

This commit was signed with the committer’s verified signature.
mwdd146980 morgan-wang
2 parents ace4274 + 7fa44ed commit 53795f4
Showing 1,298 changed files with 23,333 additions and 16,199 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ experimental:
templates:
job_template: &job_template
docker:
- image: gcr.io/datadoghq/agent-circleci-runner:v41089396-d65d75ec
- image: gcr.io/datadoghq/agent-circleci-runner:v45186095-84d9d5f2
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
35 changes: 15 additions & 20 deletions .github/CODEOWNERS
This CODEOWNERS file is valid.
Original file line number Diff line number Diff line change
@@ -47,12 +47,12 @@
/.circleci/ @DataDog/agent-devx-infra

/.github/CODEOWNERS # do not notify anyone
/.github/*_TEMPLATE.md @DataDog/agent-all
/.github/*_TEMPLATE.md @DataDog/agent-devx-loops
/.github/dependabot.yaml @DataDog/agent-devx-infra
/.github/workflows/serverless-benchmarks.yml @DataDog/serverless
/.github/workflows/serverless-binary-size.yml @DataDog/serverless
/.github/workflows/serverless-integration.yml @DataDog/serverless
/.github/workflows/serverless-vuln-scan.yml @DataDog/serverless
/.github/workflows/serverless-benchmarks.yml @DataDog/serverless @Datadog/serverless-aws
/.github/workflows/serverless-binary-size.yml @DataDog/serverless @Datadog/serverless-aws
/.github/workflows/serverless-integration.yml @DataDog/serverless @Datadog/serverless-aws
/.github/workflows/serverless-vuln-scan.yml @DataDog/serverless @Datadog/serverless-aws
/.github/workflows/windows-*.yml @DataDog/windows-agent
/.github/workflows/cws-btfhub-sync.yml @DataDog/agent-security
/.github/workflows/gohai.yml @DataDog/agent-shared-components
@@ -72,7 +72,7 @@
/.gitlab/binary_build/cluster_agent.yml @DataDog/container-integrations @DataDog/agent-delivery
/.gitlab/binary_build/fakeintake.yml @DataDog/agent-devx-loops
/.gitlab/binary_build/otel_agent.yml @DataDog/opentelemetry @DataDog/agent-delivery
/.gitlab/binary_build/serverless.yml @DataDog/serverless @DataDog/agent-delivery
/.gitlab/binary_build/serverless.yml @DataDog/serverless @Datadog/serverless-aws @DataDog/agent-delivery
/.gitlab/binary_build/system_probe.yml @DataDog/ebpf-platform @DataDog/agent-delivery
/.gitlab/binary_build/windows.yml @DataDog/agent-delivery @DataDog/windows-agent

@@ -98,13 +98,12 @@
/.gitlab/common/test_infra_version.yml @DataDog/agent-devx-loops @DataDog/agent-devx-infra

/.gitlab/e2e/e2e.yml @DataDog/container-integrations @DataDog/agent-devx-loops
/.gitlab/e2e_k8s/e2e_k8s.yml @DataDog/container-integrations @DataDog/agent-devx-loops
/.gitlab/e2e/install_packages @DataDog/agent-delivery
/.gitlab/container_build/fakeintake.yml @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
/.gitlab/binary_build/fakeintake.yml @DataDog/agent-e2e-testing @DataDog/agent-devx-loops

/.gitlab/functional_test/security_agent.yml @DataDog/agent-security @DataDog/agent-devx-infra
/.gitlab/functional_test/serverless.yml @DataDog/serverless @DataDog/agent-devx-infra
/.gitlab/functional_test/serverless.yml @DataDog/serverless @Datadog/serverless-aws @DataDog/agent-devx-infra
/.gitlab/functional_test_cleanup.yml @DataDog/agent-security @DataDog/windows-kernel-integrations @DataDog/agent-devx-infra
/.gitlab/functional_test/system_probe_windows.yml @DataDog/agent-devx-infra @DataDog/windows-kernel-integrations
/.gitlab/functional_test/common.yml @DataDog/agent-devx-infra @DataDog/windows-kernel-integrations
@@ -188,7 +187,7 @@
/cmd/dogstatsd/ @DataDog/agent-metrics-logs
/cmd/otel-agent/ @DataDog/opentelemetry
/cmd/process-agent/ @DataDog/processes
/cmd/serverless/ @DataDog/serverless
/cmd/serverless/ @DataDog/serverless @Datadog/serverless-aws
/cmd/serverless/dependencies*.txt @DataDog/serverless @DataDog/agent-shared-components
/cmd/serverless-init/ @DataDog/serverless
/cmd/system-probe/ @DataDog/ebpf-platform
@@ -311,7 +310,7 @@
/pkg/metrics/metricsource.go @DataDog/agent-metrics-logs @DataDog/agent-integrations
/pkg/serializer/ @DataDog/agent-processing-and-routing
/pkg/serializer/internal/metrics/origin_mapping.go @DataDog/agent-processing-and-routing @DataDog/agent-integrations
/pkg/serverless/ @DataDog/serverless
/pkg/serverless/ @DataDog/serverless @Datadog/serverless-aws
/pkg/serverless/appsec/ @DataDog/asm-go
/pkg/status/ @DataDog/agent-shared-components
/pkg/status/templates/trace-agent.tmpl @DataDog/agent-apm
@@ -351,9 +350,9 @@
/pkg/collector/corechecks/ebpf/ebpf* @DataDog/ebpf-platform
/pkg/collector/corechecks/ebpf/probe/ebpfcheck/ @DataDog/ebpf-platform
/pkg/collector/corechecks/ebpf/c/runtime/ebpf* @DataDog/ebpf-platform
/pkg/collector/corechecks/embed/ @Datadog/agent-devx-infra
/pkg/collector/corechecks/embed/apm/ @Datadog/agent-devx-infra @DataDog/agent-apm
/pkg/collector/corechecks/embed/process/ @Datadog/agent-devx-infra @DataDog/processes
/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/network-devices/ @DataDog/network-device-monitoring
/pkg/collector/corechecks/orchestrator/ @DataDog/container-app
/pkg/collector/corechecks/kubernetes/ @DataDog/container-integrations
@@ -399,7 +398,7 @@
/pkg/flare/*_windows_test.go @Datadog/windows-agent
/pkg/fleet/ @DataDog/fleet @DataDog/windows-agent
/pkg/otlp/ @DataDog/opentelemetry
/pkg/otlp/*_serverless*.go @DataDog/serverless
/pkg/otlp/*_serverless*.go @DataDog/serverless @Datadog/serverless-aws
/pkg/otlp/*_not_serverless*.go @DataDog/opentelemetry
/pkg/pidfile/ @DataDog/agent-shared-components
/pkg/persistentcache/ @DataDog/agent-metrics-logs
@@ -565,13 +564,9 @@
/test/ @DataDog/agent-devx-loops
/test/benchmarks/ @DataDog/agent-metrics-logs
/test/benchmarks/kubernetes_state/ @DataDog/container-integrations
/test/e2e/ @DataDog/container-integrations @DataDog/agent-security
/test/e2e/cws-tests/ @DataDog/agent-security
/test/e2e/argo-workflows/otlp-workflow.yaml @DataDog/opentelemetry
/test/e2e/containers/otlp_sender/ @DataDog/opentelemetry
/test/integration/ @DataDog/container-integrations
/test/integration/serverless @DataDog/serverless
/test/integration/serverless_perf @DataDog/serverless
/test/integration/serverless @DataDog/serverless @Datadog/serverless-aws
/test/integration/serverless_perf @DataDog/serverless @Datadog/serverless-aws
/test/kitchen/ @DataDog/agent-devx-loops
/test/kitchen/test-definitions/ @DataDog/agent-delivery
/test/kitchen/test/integration/ @DataDog/agent-delivery
33 changes: 6 additions & 27 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,25 @@
<!--
* New contributors are highly encouraged to read our
[CONTRIBUTING](/CONTRIBUTING.md) documentation.
* Contributors are encouraged to read our [CONTRIBUTING](/CONTRIBUTING.md) documentation.
* Both Contributor and Reviewer Checklists are available at https://datadoghq.dev/datadog-agent/guidelines/contributing/#pull-requests.
* The pull request:
* Should only fix one issue or add one feature at a time.
* Must update the test suite for the relevant functionality.
* Should pass all status checks before being reviewed or merged.
* Commit titles should be prefixed with general area of pull request's change.
* Please fill the below sections if possible with relevant information or links.
-->
### What does this PR do?

<!--
* A brief description of the change being made with this pull request.
* If the description here cannot be expressed in a succinct form, consider
opening multiple pull requests instead of a single one.
-->

### Motivation

<!--
* What inspired you to submit this pull request?
* Link any related GitHub issues or PRs here.
-->
### Describe how to test/QA your changes

### Additional Notes
### Possible Drawbacks / Trade-offs

### Additional Notes
<!--
* Anything else we should know when reviewing?
* Include benchmarking information here whenever possible.
* Include info about alternatives that were considered and why the proposed
version was chosen.
-->

### Possible Drawbacks / Trade-offs

<!--
* What are the possible side-effects or negative impacts of the code change?
-->

### Describe how to test/QA your changes

<!--
* Write here in detail or link to detailed instructions on how this change can
be tested/QAd/validated, including any environment setup.
-->
-->
2 changes: 1 addition & 1 deletion .github/workflows/backport-pr.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
contents: write
pull-requests: write
steps:
- uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3
- uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
id: app-token
with:
app-id: ${{ vars.DD_GITHUB_TOKEN_GENERATOR_APP_ID }}
2 changes: 1 addition & 1 deletion .github/workflows/buildimages-update.yml
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ jobs:
ref: ${{ inputs.branch }}

- name: Setup Python and pip
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
# use Python < 3.12 so that distutil is still available by default
python-version: 3.11
5 changes: 3 additions & 2 deletions .github/workflows/chase_release_managers.yml
Original file line number Diff line number Diff line change
@@ -11,15 +11,15 @@ on:
permissions: {}

jobs:
create_release_schedule:
chase_release_managers:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
ref: ${{ github.head_ref }}
- name: Install python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: "pip"
@@ -31,5 +31,6 @@ jobs:
env:
ATLASSIAN_USERNAME : ${{ secrets.ATLASSIAN_USERNAME }}
ATLASSIAN_PASSWORD : ${{ secrets.ATLASSIAN_PASSWORD }}
SLACK_API_TOKEN : ${{ secrets.SLACK_DATADOG_AGENT_BOT_TOKEN }}
run: |
inv -e release.chase-release-managers --version ${{ github.event.inputs.version }}
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ jobs:
fetch-depth: 0

- name: Setup Python3
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: "3.11.8"
cache: "pip"
6 changes: 3 additions & 3 deletions .github/workflows/create_rc_pr.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
sparse-checkout: 'tasks'

- name: Install python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: "pip"
@@ -64,7 +64,7 @@ jobs:
fetch-depth: 0

- name: Install python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: "pip"
@@ -81,8 +81,8 @@ jobs:
env:
ATLASSIAN_USERNAME: ${{ secrets.ATLASSIAN_USERNAME }}
ATLASSIAN_PASSWORD: ${{ secrets.ATLASSIAN_PASSWORD }}
SLACK_API_TOKEN : ${{ secrets.SLACK_DATADOG_AGENT_BOT_TOKEN }}
run: |
export SLACK_API_TOKEN="${{ secrets.SLACK_API_TOKEN }}"
echo "CHANGES=$(inv -e release.check-for-changes -r ${{ matrix.value }} ${{ needs.find_release_branches.outputs.warning }})" >> $GITHUB_OUTPUT
- name: Create RC PR
2 changes: 1 addition & 1 deletion .github/workflows/create_release_schedule.yml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ jobs:
with:
ref: ${{ github.head_ref }}
- name: Install python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: "pip"
4 changes: 2 additions & 2 deletions .github/workflows/cws-btfhub-sync.yml
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ jobs:
sparse-checkout: ${{ matrix.cone }}

- name: Install python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: 'pip'
@@ -103,7 +103,7 @@ jobs:
ref: ${{ inputs.base_branch || 'main' }}

- name: Install python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: 'pip'
2 changes: 1 addition & 1 deletion .github/workflows/docs-dev.yml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ jobs:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: '3.12'

2 changes: 1 addition & 1 deletion .github/workflows/external-contributor.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:
ref: main
fetch-depth: 0
- name: Setup python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: 'pip'
2 changes: 1 addition & 1 deletion .github/workflows/go_mod_tidy.yml
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ jobs:
with:
go-version-file: ".go-version"
- name: Install python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: "pip"
4 changes: 2 additions & 2 deletions .github/workflows/label-analysis.yml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Setup python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: 'pip'
@@ -43,7 +43,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.11
cache: 'pip'
2 changes: 2 additions & 0 deletions .github/workflows/serverless-binary-size.yml
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ permissions: {}
jobs:
comment:
runs-on: ubuntu-latest
permissions:
pull-requests: write # Add comment to PR
steps:
- name: Checkout datadog-agent repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
23 changes: 17 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ include:
- .gitlab/deps_fetch/deps_fetch.yml
- .gitlab/dev_container_deploy/include.yml
- .gitlab/e2e/e2e.yml
- .gitlab/e2e_k8s/e2e_k8s.yml
- .gitlab/e2e_install_packages/include.yml
- .gitlab/e2e_pre_test/e2e_pre_test.yml
- .gitlab/functional_test/include.yml
@@ -35,6 +34,7 @@ include:
- .gitlab/kitchen_cleanup/include.yml
- .gitlab/kitchen_deploy/kitchen_deploy.yml
- .gitlab/kitchen_testing/include.yml
- .gitlab/lint/include.yml
- .gitlab/maintenance_jobs/include.yml
- .gitlab/notify/notify.yml
- .gitlab/package_build/include.yml
@@ -65,6 +65,7 @@ stages:
- maintenance_jobs
- deps_build
- deps_fetch
- lint
- source_test
- source_test_stats
- software_composition_analysis
@@ -169,15 +170,15 @@ variables:
# To use images from datadog-agent-buildimages dev branches, set the corresponding
# SUFFIX variable to _test_only
DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BUILDIMAGES: v41089396-d65d75ec
DATADOG_AGENT_BUILDIMAGES: v45186095-84d9d5f2
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_WINBUILDIMAGES: v41089396-d65d75ec
DATADOG_AGENT_WINBUILDIMAGES: v45186095-84d9d5f2
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_ARMBUILDIMAGES: v41089396-d65d75ec
DATADOG_AGENT_ARMBUILDIMAGES: v45186095-84d9d5f2
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v41089396-d65d75ec
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v45186095-84d9d5f2
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v41089396-d65d75ec
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v45186095-84d9d5f2

DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
DEB_GPG_KEY_ID: c0962c7d
@@ -794,6 +795,7 @@ workflow:
paths:
- test/new-e2e/pkg/**/*
- test/new-e2e/go.mod
- flakes.yaml
compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916

.on_e2e_or_windows_installer_changes:
@@ -1032,6 +1034,15 @@ workflow:
- when: manual
allow_failure: true

.on_cspm_or_e2e_changes:
- !reference [.on_e2e_main_release_or_rc]
- changes:
paths:
- pkg/security/**/*
- test/new-e2e/tests/cspm/**/* #TODO: Add other paths that should trigger the execution of CSPM e2e tests
compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
when: on_success

.on_windows_systemprobe_or_e2e_changes:
- !reference [.on_e2e_main_release_or_rc]
- changes:
2 changes: 1 addition & 1 deletion .gitlab/.pre/cancel-prev-pipelines.yml
Original file line number Diff line number Diff line change
@@ -14,5 +14,5 @@ cancel-prev-pipelines:
when: never
- when: on_success
script:
- export GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_SCHEDULER_TOKEN)
- GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_SCHEDULER_TOKEN) || exit $?; export GITLAB_TOKEN
- inv pipeline.auto-cancel-previous-pipelines
Loading

0 comments on commit 53795f4

Please sign in to comment.