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
  • Loading branch information
mwdd146980 committed Sep 11, 2024
2 parents 8de2ecb + f704138 commit ace4274
Show file tree
Hide file tree
Showing 552 changed files with 21,435 additions and 3,344 deletions.
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
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
/.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_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
Expand Down Expand Up @@ -205,6 +205,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 @@ -425,6 +426,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
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
5 changes: 5 additions & 0 deletions .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,6 +20,9 @@ jobs:
&& contains(github.event.label.name, 'backport')
)
)
permissions:
contents: write
pull-requests: write
steps:
- uses: actions/create-github-app-token@31c86eb3b33c9b601a1f60f98dcbfd1d70f379b4 # v1.10.3
id: app-token
Expand Down
2 changes: 2 additions & 0 deletions .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
1 change: 1 addition & 0 deletions .github/workflows/chase_release_managers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
required: true
type: string

permissions: {}

jobs:
create_release_schedule:
Expand Down
4 changes: 4 additions & 0 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 Down
5 changes: 5 additions & 0 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 Down Expand Up @@ -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 Down
2 changes: 2 additions & 0 deletions .github/workflows/create_release_schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
required: true
type: string

permissions: {}


jobs:
create_release_schedule:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/cws-btfhub-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ on:
schedule:
- cron: '30 4 * * 5' # at 4:30 UTC on Friday

permissions: {}

jobs:
generate:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -91,6 +93,9 @@ jobs:
combine:
needs: generate
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- name: Checkout datadog-agent repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/datadog-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ on: [push]

name: Datadog Static Analysis

permissions: {}

jobs:
static-analysis:
if: github.triggering_actor != 'dependabot[bot]'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/do-not-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
branches:
- mq-working-branch-*

permissions: {}

jobs:
do-not-merge:
if: ${{ contains(github.event.*.labels.*.name, 'do-not-merge/hold') || contains(github.event.*.labels.*.name, 'do-not-merge/WIP') }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/docs-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ on:
- docs/**
- .github/workflows/docs-dev.yml

permissions: {}

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' && true || false }}
Expand Down Expand Up @@ -54,6 +56,8 @@ jobs:

publish:
runs-on: ubuntu-latest
permissions:
contents: write

if: github.event_name == 'push' && github.ref == 'refs/heads/main'
needs:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/external-contributor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ on:
pull_request_target:
types: [opened, reopened]

permissions: {}

jobs:
external-contributor-prs:
name: Handle Fork PRs
runs-on: ubuntu-latest
permissions:
pull-requests: write
if: github.event.pull_request.head.repo.full_name != github.repository
steps:
- name: Checkout repository
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/go-update-commenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
# Only run on PR label events (in particular not on every commit)
types: [ labeled ]

permissions: {}

jobs:
old-versions-match:
# Only run if the PR is labeled with 'go-update'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gohai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
paths:
- "pkg/gohai/**"

permissions: {}

jobs:
gohai_test:
strategy:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/label-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}

permissions: {}

jobs:
assign-team-label:
if: github.triggering_actor != 'dd-devflow[bot]'
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
- main
- "[0-9]+.[0-9]+.x"

permissions: {}

jobs:
label:
permissions:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/markdown-lint-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Check Markdown links
on:
pull_request:

permissions: {}

jobs:
markdown-link-check:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/serverless-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ concurrency:
group: ${{ github.workflow }}/PR#${{ github.event.pull_request.number }}
cancel-in-progress: true

permissions: {}

jobs:
baseline:
name: Baseline
Expand Down
33 changes: 15 additions & 18 deletions .github/workflows/serverless-binary-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
env:
SIZE_ALLOWANCE: fromJSON(1000000) # 1 MB

permissions: {}

jobs:
comment:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -138,28 +140,23 @@ jobs:
name: dependency-graphs
path: go/src/github.com/DataDog/datadog-lambda-extension/graphs

- name: Write message
id: write
if: steps.should.outputs.should_run == 'true'
env:
VAR_COLD_START: ${{ steps.compare.outputs.coldstart }}
VAR_DIFF: ${{ steps.compare.outputs.diff }}
VAR_DEPS: ${{ steps.deps.outputs.deps }}
VAR_RUN_ID: ${{ github.run_id }}
run: |
cd go/src/github.com/DataDog/datadog-agent
./test/integration/serverless_perf/write_message.sh
- name: Post comment
uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0
if: steps.should.outputs.should_run == 'true'
with:
header: serverless-binary-size
hide_and_recreate: true
hide_classify: "RESOLVED"
message: |
:warning::rotating_light: Warning, this pull request increases the binary size of serverless extension by ${{ steps.compare.outputs.diff }} bytes. Each MB of binary size increase means about 10ms of additional cold start time, so this pull request would increase cold start time by ${{ steps.compare.outputs.coldstart }}ms.
If you have questions, we are happy to help, come visit us in the [#serverless](https://dd.slack.com/archives/CBWDFKWV8) slack channel and provide a link to this comment.
<details>
<summary>Debug info</summary>
These dependencies were added to the serverless extension by this pull request:
```
${{ steps.deps.outputs.deps }}
```
View dependency graphs for each added dependency in the [artifacts section](https://github.com/DataDog/datadog-agent/actions/runs/${{ github.run_id }}#artifacts) of the github action.
We suggest you consider adding the `!serverless` build tag to remove any new dependencies not needed in the serverless extension.
</details>
path: ${{ steps.write.outputs.filename }}
2 changes: 2 additions & 0 deletions .github/workflows/serverless-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
schedule:
- cron: '0 14 * * *' # cron schedule uses UTC timezone. Run tests at the beginning of the day in US-East

permissions: {}

jobs:
test:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/slapr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# pull_request:
# types: [closed]
#
# permissions: {}
#
# jobs:
# run_slapr_datadog_agent:
# runs-on: ubuntu-latest
Expand Down
10 changes: 0 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,6 @@ pkg/process/config/logs
*.ninja
compile_commands.json
pkg/ebpf/bytecode/build/**/*.d
pkg/ebpf/bytecode/runtime/conntrack.go
pkg/ebpf/bytecode/runtime/http.go
pkg/ebpf/bytecode/runtime/usm.go
pkg/ebpf/bytecode/runtime/shared-libraries.go
pkg/ebpf/bytecode/runtime/offsetguess-test.go
pkg/ebpf/bytecode/runtime/oom-kill.go
pkg/ebpf/bytecode/runtime/runtime-security.go
pkg/ebpf/bytecode/runtime/tcp-queue-length.go
pkg/ebpf/bytecode/runtime/tracer.go
pkg/ebpf/bytecode/runtime/logdebug-test.go
pkg/security/tests/syscall_tester/**/*.d

# dsd artifacts
Expand Down
Loading

0 comments on commit ace4274

Please sign in to comment.