Skip to content

Commit

Permalink
Merge branch 'main' into momar/new-process-resolver-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mftoure committed Oct 3, 2024
2 parents 01537e8 + 56218b7 commit f7ec124
Show file tree
Hide file tree
Showing 1,787 changed files with 52,313 additions and 23,126 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
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:v41089396-d65d75ec
- image: gcr.io/datadoghq/agent-circleci-runner:v45605580-5f42ffba
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
1 change: 1 addition & 0 deletions .ddqa/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jira_issue_type = "Task"
jira_statuses = ["To Do", "In Progress", "Done"]
github_team = "opentelemetry"
github_labels = ["team/opentelemetry"]
exclude_members = ["ancostas", "Maascamp"]

[teams."eBPF Platform"]
jira_project = "EBPF"
Expand Down
48 changes: 26 additions & 22 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -98,18 +98,19 @@
/.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.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
/.gitlab/functional_test/oracle.yml @DataDog/agent-devx-infra @DataDog/database-monitoring

/.gitlab/powershell_script_deploy/powershell_script_deploy.yml @DataDog/agent-delivery @DataDog/windows-agent
/.gitlab/powershell_script_deploy/powershell_script_signing.yml @DataDog/agent-delivery @DataDog/windows-agent

/.gitlab/choco_build/choco_build.yml @DataDog/agent-delivery @DataDog/windows-agent
/.gitlab/choco_deploy/choco_deploy.yml @DataDog/agent-delivery @DataDog/windows-agent
Expand Down Expand Up @@ -188,7 +189,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
Expand All @@ -205,6 +206,7 @@
/cmd/system-probe/modules/service_discover* @DataDog/apm-onboarding @DataDog/universal-service-monitoring
/cmd/system-probe/modules/language_detection* @DataDog/processes @DataDog/universal-service-monitoring
/cmd/system-probe/runtime/ @DataDog/agent-security
/cmd/system-probe/modules/dynamic_instrumentation* @DataDog/debugger
/cmd/system-probe/windows/ @DataDog/windows-kernel-integrations
/cmd/system-probe/windows_resources/ @DataDog/windows-kernel-integrations
/cmd/system-probe/main_windows*.go @DataDog/windows-kernel-integrations
Expand Down Expand Up @@ -310,7 +312,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
Expand All @@ -324,7 +326,7 @@
/pkg/trace/api/otlp*.go @DataDog/opentelemetry
/pkg/trace/traceutil/otel*.go @DataDog/opentelemetry
/pkg/trace/stats/ @DataDog/agent-apm @DataDog/opentelemetry
/pkg/trace/telemetry/ @DataDog/telemetry-and-analytics
/pkg/trace/telemetry/ @DataDog/apm-trace-storage
/comp/core/autodiscovery/listeners/ @DataDog/container-platform
/comp/core/autodiscovery/listeners/cloudfoundry*.go @DataDog/platform-integrations
/comp/core/autodiscovery/listeners/snmp*.go @DataDog/network-device-monitoring
Expand All @@ -339,7 +341,7 @@
/pkg/clusteragent/admission/mutate/autoscaling @DataDog/container-integrations
/pkg/clusteragent/admission/mutate/autoinstrumentation/ @DataDog/container-platform @DataDog/apm-onboarding
/pkg/clusteragent/orchestrator/ @DataDog/container-app
/pkg/clusteragent/telemetry/ @DataDog/telemetry-and-analytics
/pkg/clusteragent/telemetry/ @DataDog/apm-trace-storage
/pkg/collector/ @DataDog/agent-metrics-logs
/pkg/collector/corechecks/cluster/ @DataDog/container-integrations
/pkg/collector/corechecks/cluster/orchestrator @DataDog/container-app
Expand All @@ -350,9 +352,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
Expand Down Expand Up @@ -398,7 +400,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
Expand All @@ -425,6 +427,7 @@
/pkg/util/orchestrator/ @DataDog/container-app
/pkg/util/podman/ @DataDog/container-integrations
/pkg/util/prometheus @DataDog/container-integrations
/pkg/util/tagger @DataDog/container-platform
/pkg/util/trivy/ @DataDog/container-integrations @DataDog/agent-security
/pkg/util/uuid/ @DataDog/agent-shared-components
/pkg/util/cgroups/ @DataDog/container-integrations
Expand Down Expand Up @@ -457,6 +460,9 @@
/pkg/process/metadata/parser/*windows* @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks @DataDog/windows-kernel-integrations
/pkg/process/monitor/ @DataDog/universal-service-monitoring
/pkg/process/net/ @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks
/pkg/process/net/common_windows.go @DataDog/windows-agent
/pkg/process/net/windows_pipe.go @DataDog/windows-kernel-integrations
/pkg/process/net/windows_pipe_testutil.go @DataDog/windows-kernel-integrations
/pkg/proto/datadog/remoteconfig/ @DataDog/remote-config
/pkg/proto/pbgo/ # do not notify anyone
/pkg/proto/pbgo/trace @DataDog/agent-apm
Expand Down Expand Up @@ -563,13 +569,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
Expand All @@ -594,6 +596,7 @@
/test/fakeintake/aggregator/servicediscoveryAggregator.go @DataDog/apm-onboarding @DataDog/universal-service-monitoring
/test/fakeintake/aggregator/servicediscoveryAggregator_test.go @DataDog/apm-onboarding @DataDog/universal-service-monitoring
/test/new-e2e/ @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
/test/new-e2e/pkg/components/datadog-installer @DataDog/windows-agent
/test/new-e2e/test-infra-definition @DataDog/agent-devx-loops
/test/new-e2e/system-probe @DataDog/ebpf-platform
/test/new-e2e/scenarios/system-probe @DataDog/ebpf-platform
Expand Down Expand Up @@ -630,6 +633,7 @@
/tools/ebpf/ @DataDog/ebpf-platform
/tools/gdb/ @DataDog/agent-shared-components
/tools/go-update/ @DataDog/agent-shared-components
/tools/NamedPipeCmd/ @DataDog/windows-kernel-integrations
/tools/retry_file_dump/ @DataDog/agent-metrics-logs
/tools/windows/ @DataDog/windows-agent
/tools/windows/DatadogAgentInstaller/WixSetup/localization-en-us.wxl @DataDog/windows-agent @DataDog/documentation
Expand Down
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.
-->
-->
4 changes: 4 additions & 0 deletions .github/workflows/add_milestone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ on:
- main
- "[0-9]+.[0-9]+.x"

permissions: {}

jobs:
add-milestone-pr:
name: Add Milestone on PR
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
permissions:
pull-requests: write
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/backport-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- closed
- labeled

permissions: {}

jobs:
backport:
name: Backport PR
Expand All @@ -18,8 +20,11 @@ jobs:
&& contains(github.event.label.name, 'backport')
)
)
permissions:
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 }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/buildimages-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ on:
required: true
type: boolean

permissions: {}

jobs:
open-go-update-pr:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -52,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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/chase_release_managers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,18 @@ on:
required: true
type: string

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"
Expand All @@ -30,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 }}
8 changes: 6 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ on:
- main
- "[0-9]+.[0-9]+.x"

permissions: {}

jobs:
CodeQL-Build:
runs-on: ubuntu-20.04
permissions:
security-events: write
strategy:
matrix:
language: ["go", "javascript", "python", "cpp"]
Expand All @@ -24,9 +28,9 @@ 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"
python-version: "3.12.6"
cache: "pip"
- run: pip3 install -r requirements.txt

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/create_rc_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

permissions: {}

jobs:
find_release_branches:
runs-on: ubuntu-latest
Expand All @@ -22,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"
Expand All @@ -48,6 +50,9 @@ jobs:
create_rc_pr:
runs-on: ubuntu-latest
needs: find_release_branches
permissions:
contents: write
pull-requests: write
strategy:
matrix:
value: ${{fromJSON(needs.find_release_branches.outputs.branches)}}
Expand All @@ -59,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"
Expand All @@ -76,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
Expand Down
Loading

0 comments on commit f7ec124

Please sign in to comment.