Skip to content

Commit

Permalink
Merge branch 'main' into ibraheem/fix-default-otel-agent-config
Browse files Browse the repository at this point in the history
  • Loading branch information
IbraheemA committed Dec 13, 2024
2 parents 6291c2f + 0f53c9a commit 7e7a38f
Show file tree
Hide file tree
Showing 565 changed files with 9,465 additions and 8,175 deletions.
10 changes: 5 additions & 5 deletions .ddqa/config.toml
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
65 changes: 35 additions & 30 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,21 @@

/.circleci/ @DataDog/agent-devx-infra

/.github/CODEOWNERS # do not notify anyone
/.github/*_TEMPLATE.md @DataDog/agent-devx-loops
/.github/dependabot.yaml @DataDog/agent-devx-infra
/.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/cws-btfhub-sync.yml @DataDog/agent-security
/.github/workflows/gohai.yml @DataDog/agent-shared-components
/.github/workflows/go-update-commenter.yml @DataDog/agent-shared-components
/.github/workflows/buildimages-update.yml @DataDog/agent-delivery @DataDog/agent-shared-components

/.run @DataDog/agent-devx-loops
/.run/docker/ @DataDog/container-integrations @DataDog/container-platform
/.github/CODEOWNERS # do not notify anyone
/.github/*_TEMPLATE.md @DataDog/agent-devx-loops
/.github/dependabot.yaml @DataDog/agent-devx-infra
/.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/cws-btfhub-sync.yml @DataDog/agent-security
/.github/workflows/gohai.yml @DataDog/agent-shared-components
/.github/workflows/go-update-commenter.yml @DataDog/agent-shared-components
/.github/workflows/update_dependencies.yml @DataDog/agent-shared-components
/.github/workflows/buildimages-update.yml @DataDog/agent-delivery @DataDog/agent-shared-components
/.github/workflows/collector-generate-and-update.yml @DataDog/opentelemetry

/.run @DataDog/agent-devx-loops
/.run/docker/ @DataDog/container-integrations @DataDog/container-platform

# Gitlab files
# Files containing job contents are owned by teams in charge of the jobs + agent-devx-infra or agent-delivery
Expand Down Expand Up @@ -217,7 +219,7 @@
/cmd/cws-instrumentation/ @DataDog/agent-security
/cmd/dogstatsd/ @DataDog/agent-metrics-logs
/cmd/otel-agent/ @DataDog/opentelemetry
/cmd/process-agent/ @DataDog/processes
/cmd/process-agent/ @DataDog/container-intake
/cmd/serverless/ @DataDog/serverless @Datadog/serverless-aws
/cmd/serverless-init/ @DataDog/serverless
/cmd/system-probe/ @DataDog/ebpf-platform
Expand All @@ -226,12 +228,12 @@
/cmd/system-probe/config/adjust_security.go @DataDog/ebpf-platform @DataDog/agent-security
/cmd/system-probe/modules/network_tracer* @DataDog/Networks
/cmd/system-probe/modules/oom_kill_probe* @DataDog/container-integrations
/cmd/system-probe/modules/process* @DataDog/processes
/cmd/system-probe/modules/process* @DataDog/container-intake
/cmd/system-probe/modules/eventmonitor* @DataDog/agent-security
/cmd/system-probe/modules/tcp_queue_tracer* @DataDog/container-integrations
/cmd/system-probe/modules/traceroute* @DataDog/network-device-monitoring @Datadog/Networks
/cmd/system-probe/modules/ping* @DataDog/ndm-core
/cmd/system-probe/modules/language_detection* @DataDog/processes @DataDog/universal-service-monitoring
/cmd/system-probe/modules/language_detection* @DataDog/container-intake @DataDog/universal-service-monitoring
/cmd/system-probe/modules/dynamic_instrumentation* @DataDog/debugger
/cmd/system-probe/windows_resources/ @DataDog/windows-kernel-integrations
/cmd/system-probe/main_windows*.go @DataDog/windows-kernel-integrations
Expand Down Expand Up @@ -298,7 +300,7 @@
/comp/netflow @DataDog/ndm-integrations
/comp/networkpath @DataDog/Networks @DataDog/network-device-monitoring
/comp/otelcol @DataDog/opentelemetry
/comp/process @DataDog/processes
/comp/process @DataDog/container-intake
/comp/remote-config @DataDog/remote-config
/comp/snmptraps @DataDog/ndm-core
/comp/systray @DataDog/windows-agent
Expand Down Expand Up @@ -390,7 +392,7 @@
/pkg/collector/corechecks/ebpf/c/runtime/ebpf* @DataDog/ebpf-platform
/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/embed/process/ @DataDog/container-intake
/pkg/collector/corechecks/gpu/ @DataDog/ebpf-platform
/pkg/collector/corechecks/network-devices/ @DataDog/ndm-integrations
/pkg/collector/corechecks/orchestrator/ @DataDog/container-app
Expand All @@ -412,7 +414,7 @@
/pkg/config/autodiscovery/ @DataDog/container-integrations @DataDog/container-platform
/pkg/config/env @DataDog/container-integrations @DataDog/container-platform
/pkg/config/setup @DataDog/agent-shared-components
/pkg/config/setup/process*.go @DataDog/processes
/pkg/config/setup/process*.go @DataDog/container-intake
/pkg/config/setup/system_probe.go @DataDog/ebpf-platform
/pkg/config/setup/system_probe_cws.go @DataDog/agent-security
/pkg/config/setup/system_probe_cws_notwin.go @DataDog/agent-security
Expand All @@ -432,11 +434,12 @@
/pkg/flare/*_windows.go @Datadog/windows-agent
/pkg/flare/*_windows_test.go @Datadog/windows-agent
/pkg/fleet/ @DataDog/fleet @DataDog/windows-agent
/pkg/fleet/installer/setup/djm/ @DataDog/fleet @DataDog/data-jobs-monitoring
/pkg/pidfile/ @DataDog/agent-shared-components
/pkg/persistentcache/ @DataDog/agent-metrics-logs
/pkg/proto/ @DataDog/agent-shared-components
/pkg/proto/datadog/languagedetection @DataDog/processes
/pkg/proto/datadog/process @DataDog/processes
/pkg/proto/datadog/languagedetection @DataDog/container-intake
/pkg/proto/datadog/process @DataDog/container-intake
/pkg/proto/datadog/trace @DataDog/agent-apm
/pkg/proto/datadog/workloadmeta @DataDog/container-platform
/pkg/remoteconfig/ @DataDog/remote-config
Expand Down Expand Up @@ -471,7 +474,7 @@
/pkg/util/testutil/patternscanner.go @DataDog/universal-service-monitoring @DataDog/ebpf-platform
/pkg/util/testutil/docker @DataDog/universal-service-monitoring @DataDog/ebpf-platform
/pkg/util/trie @DataDog/container-integrations
/pkg/languagedetection @DataDog/processes @DataDog/universal-service-monitoring
/pkg/languagedetection @DataDog/container-intake @DataDog/universal-service-monitoring
/pkg/linters/ @DataDog/agent-devx-loops
/pkg/linters/components/ @DataDog/agent-shared-components
/pkg/logs/ @DataDog/agent-metrics-logs
Expand All @@ -485,19 +488,18 @@
/pkg/logs/processor @DataDog/agent-processing-and-routing
/pkg/logs/sds @DataDog/agent-processing-and-routing
/pkg/logs/sender @DataDog/agent-processing-and-routing
/pkg/process/ @DataDog/processes
/pkg/process/ @DataDog/container-intake
/pkg/process/util/address*.go @DataDog/Networks
/pkg/process/checks/net*.go @DataDog/Networks
/pkg/process/metadata/parser/ @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks
/pkg/process/metadata/parser/*windows* @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks @DataDog/windows-kernel-integrations
/pkg/process/metadata/parser/ @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks
/pkg/process/metadata/parser/*windows* @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks @DataDog/windows-kernel-integrations
/pkg/process/monitor/ @DataDog/universal-service-monitoring
/pkg/process/net/ @DataDog/universal-service-monitoring @DataDog/Networks
/pkg/process/net/common_windows.go @DataDog/windows-agent
/pkg/proto/datadog/remoteconfig/ @DataDog/remote-config
/pkg/proto/pbgo/ # do not notify anyone
/pkg/proto/pbgo/trace @DataDog/agent-apm
/pkg/proto/pbgo/languagedetection @DataDog/agent-apm
/pkg/proto/pbgo/process @DataDog/processes
/pkg/proto/pbgo/process @DataDog/container-intake
/pkg/proto/pbgo/core @DataDog/agent-shared-components
/pkg/proto/pbgo/core/remoteconfig.pb.go @DataDog/remote-config
/pkg/proto/pbgo/core/remoteconfig_gen.go @DataDog/remote-config
Expand Down Expand Up @@ -558,7 +560,7 @@
/tasks/unit_tests/update_go_tests.py @DataDog/agent-shared-components
/tasks/cluster_agent_cloudfoundry.py @DataDog/platform-integrations
/tasks/new_e2e_tests.py @DataDog/agent-e2e-testing @DataDog/agent-devx-loops
/tasks/process_agent.py @DataDog/processes
/tasks/process_agent.py @DataDog/container-intake
/tasks/system_probe.py @DataDog/ebpf-platform
/tasks/ebpf.py @DataDog/ebpf-platform
/tasks/kmt.py @DataDog/ebpf-platform
Expand All @@ -572,6 +574,7 @@
/tasks/winbuildscripts/ @DataDog/windows-agent
/tasks/winbuild.py @DataDog/windows-agent
/tasks/windows_resources.py @DataDog/windows-agent
/tasks/collector.py @DataDog/opentelemetry
/tasks/components.py @DataDog/agent-shared-components
/tasks/components_templates @DataDog/agent-shared-components
/tasks/libs/ciproviders/ @DataDog/agent-devx-infra
Expand Down Expand Up @@ -604,14 +607,15 @@
/test/new-e2e/tests/containers @DataDog/container-integrations @DataDog/container-platform
/test/new-e2e/tests/discovery @DataDog/universal-service-monitoring
/test/new-e2e/tests/ha-agent @DataDog/ndm-core
/test/new-e2e/tests/language-detection @DataDog/processes
/test/new-e2e/tests/language-detection @DataDog/container-intake
/test/new-e2e/tests/ndm @DataDog/ndm-core
/test/new-e2e/tests/ndm/netflow @DataDog/ndm-integrations
/test/new-e2e/tests/netpath @DataDog/Networks @DataDog/network-device-monitoring
/test/new-e2e/tests/npm @DataDog/Networks
/test/new-e2e/tests/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-kernel-integrations
/test/new-e2e/tests/orchestrator @DataDog/container-app
/test/new-e2e/tests/otel @DataDog/opentelemetry
/test/new-e2e/tests/process @DataDog/processes
/test/new-e2e/tests/process @DataDog/container-intake
/test/new-e2e/tests/sysprobe-functional @DataDog/windows-kernel-integrations
/test/new-e2e/tests/security-agent-functional @DataDog/windows-kernel-integrations @DataDog/agent-security
/test/new-e2e/tests/cws @DataDog/agent-security
Expand All @@ -620,6 +624,7 @@
/test/new-e2e/tests/apm @DataDog/agent-apm
/test/new-e2e/tests/remote-config @DataDog/remote-config
/test/new-e2e/tests/installer @DataDog/fleet @DataDog/windows-agent
/test/new-e2e/tests/installer/script @DataDog/fleet @DataDog/data-jobs-monitoring
/test/new-e2e/tests/gpu @Datadog/ebpf-platform
/test/otel/ @DataDog/opentelemetry
/test/system/ @DataDog/agent-shared-components
Expand Down
26 changes: 26 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ updates:
- dependency-name: github.com/ugorji/go
# Ignore internal modules
- dependency-name: github.com/DataDog/datadog-agent/*
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
# OpenTelemetry collector packages need to be updated with inv rather than dependabot
- dependency-name: go.opentelemetry.io/collector/*
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/*
schedule:
interval: weekly
open-pull-requests-limit: 100
Expand All @@ -52,6 +57,11 @@ updates:
- dependency-name: github.com/DataDog/datadog-agent/*
# See https://github.com/DataDog/datadog-agent/pull/10112
- dependency-name: github.com/mailru/easyjson
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
# OpenTelemetry collector packages need to be updated with inv rather than dependabot
- dependency-name: go.opentelemetry.io/collector/*
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/*
schedule:
interval: weekly
open-pull-requests-limit: 100
Expand All @@ -67,6 +77,8 @@ updates:
- dependency-name: github.com/DataDog/datadog-agent/*
# See https://github.com/DataDog/datadog-agent/pull/10112
- dependency-name: github.com/mailru/easyjson
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
schedule:
interval: weekly
open-pull-requests-limit: 100
Expand All @@ -82,6 +94,8 @@ updates:
- dependency-name: github.com/DataDog/datadog-agent/*
# See https://github.com/DataDog/datadog-agent/pull/10112
- dependency-name: github.com/mailru/easyjson
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
schedule:
interval: weekly
open-pull-requests-limit: 100
Expand All @@ -95,6 +109,8 @@ updates:
ignore:
# Ignore internal modules
- dependency-name: github.com/DataDog/datadog-agent/*
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
schedule:
interval: weekly
open-pull-requests-limit: 100
Expand All @@ -113,6 +129,9 @@ updates:
- qa/no-code-change
schedule:
interval: monthly
ignore:
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
open-pull-requests-limit: 100
- package-ecosystem: gomod
directory: /pkg/networkdevice/profile
Expand All @@ -124,6 +143,8 @@ updates:
ignore:
# Ignore internal modules
- dependency-name: github.com/DataDog/datadog-agent/*
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
schedule:
interval: weekly
open-pull-requests-limit: 100
Expand All @@ -144,6 +165,8 @@ updates:
# Do not bump dependencies that come from test-infra-definitions, they will be bumped when we'll bump the version
# https://datadoghq.atlassian.net/browse/ADXT-375
- dependency-name: github.com/pulumi*
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*

schedule:
interval: weekly
Expand All @@ -160,6 +183,9 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 100
ignore:
# Ignore golang.org/x/... deps to avoid noise, they are updated together, pretty regularly
- dependency-name: golang.org/x/*
- package-ecosystem: docker
directory: /test/fakeintake
labels:
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 @@ -45,7 +45,7 @@ jobs:
go-version-file: ".go-version"

- name: Initialize CodeQL
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
with:
languages: ${{ matrix.language }}
config: |
Expand All @@ -67,4 +67,4 @@ jobs:
invoke agent.build --build-exclude=systemd
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
Loading

0 comments on commit 7e7a38f

Please sign in to comment.