Skip to content

Commit

Permalink
Merge branch 'main' of github.com:DataDog/datadog-agent into kfairise…
Browse files Browse the repository at this point in the history
…/test-early-create-eks
  • Loading branch information
KevinFairise2 committed Oct 10, 2024
2 parents 7114f3b + 304623b commit 75bdc8d
Show file tree
Hide file tree
Showing 2,029 changed files with 54,284 additions and 28,972 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:v45979046-89a73a40
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
9 changes: 5 additions & 4 deletions .copyright-overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ github.com/elastic/*: Copyright 2017-2018 Elasticsearch B.V.
github.com/golang/*: Copyright (c) 2009 The Go Authors. All rights reserved.
github.com/googleapis/*: Copyright 2017 Google Inc.
github.com/google/go-cmp/*: Copyright (c) 2017 The Go Authors. All rights reserved.
github.com/grpc-ecosystem/*: Copyright (c) 2015, Gengo, Inc.
github.com/hashicorp/*: Copyright © 2014-2018 HashiCorp, Inc
github.com/prometheus/*: Copyright 2012-2015 The Prometheus Authors
github.com/open-telemetry/*: Copyright The OpenTelemetry Authors
Expand All @@ -44,8 +43,9 @@ sigs.k8s.io/*: Copyright 2017 The Kubernetes Authors.
contrib.go.opencensus.io/exporter/prometheus: Copyright 2020, OpenCensus Authors
go.opencensus.io: Copyright 2018, OpenCensus Authors
go.opencensus.io/*: Copyright 2018, OpenCensus Authors
github.com/grpc-ecosystem/*: Copyright 2016 Michal Witkowski. All Rights Reserved.
google.golang.org/genproto/*: Copyright 2015 Google LLC
github.com/grpc-ecosystem/go-grpc-prometheus: Copyright 2016 Michal Witkowski. All Rights Reserved.
github.com/grpc-ecosystem/go-grpc-middleware: Copyright (c) The go-grpc-middleware Authors.
github.com/grpc-ecosystem/grpc-gateway: Copyright (c) 2015, Gengo, Inc.
google.golang.org/grpc: Copyright 2014 gRPC authors.
google.golang.org/grpc/*: Copyright 2014 gRPC authors.
github.com/skydive-project/go-debouncer: Copyright (C) 2018 Red Hat, Inc.
Expand Down Expand Up @@ -213,6 +213,7 @@ github.com/gogo/protobuf: ["Copyright (c) 2013, The GoGo Authors. All rights res
# * Automatic "Copyright (c)"
# * Year is based on the year of the first commit to the repository
# * Author, when known only by GitHub username, is "GitHub Full Name (github-username)"
github.com/moby/docker-image-spec/specs-go/v1: Copyright 2012-2017 Docker, Inc.
github.com/moby/sys/mountinfo: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
github.com/moby/sys/signal: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
github.com/moby/sys/user: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
Expand Down Expand Up @@ -333,6 +334,7 @@ github.com/pjbgf/sha1cd:
- Copyright 2009 The Go Authors. All rights reserved.
- Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
- Copyright 2022 Paulo Gomes <pjbgf@linux.com>
- Copyright 2023 pjbgf

github.com/kr/pretty: Copyright 2012 Keith Rarick
github.com/kr/text: Copyright 2012 Keith Rarick
Expand All @@ -343,7 +345,6 @@ 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
github.com/go-errors/errors: Copyright (c) 2015 Conrad Irwin <conrad@bugsnag.com>
github.com/apache/arrow/*: Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
github.com/tailscale/tailscale: Copyright (c) 2020 Tailscale Inc & AUTHORS.
Expand Down
7 changes: 7 additions & 0 deletions .ddqa/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -216,3 +216,10 @@ jira_issue_type = "Task"
jira_statuses = ["To Do", "In Progress", "Done"]
github_team = "agent-release-management"
github_labels = ["team/agent-release-management"]

[teams."Dynamic Instrumentation"]
jira_project = "DEBUG"
jira_issue_type = "Task"
jira_statuses = ["To Do", "In Progress", "Done"]
github_team = "debugger-go"
github_labels = ["team/dynamic-instrumentation"]
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ go.sum -diff -merge linguist-generated=true
*_easyjson.go -diff -merge
*_easyjson.go 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

Expand Down
92 changes: 69 additions & 23 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

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
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildimages-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chase_release_managers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,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
4 changes: 2 additions & 2 deletions .github/workflows/create_rc_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release_schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cws-btfhub-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/external-contributor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -31,7 +31,6 @@ jobs:
run: pip install -r requirements.txt -r tasks/requirements.txt
- name: Set label on external contributor PRs
run: |
gh issue edit "$NUMBER"
inv -e github.handle-community-pr --repo="$GH_REPO" --pr-id="$NUMBER" --labels="$LABELS"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go_mod_tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/label-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/serverless-binary-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/slapr.yml

This file was deleted.

Loading

0 comments on commit 75bdc8d

Please sign in to comment.