Merge branch 'main' into hongshi/mac_sw_inventory

Author: guohdd

.adms/bazel/adms.mirror.cfg

@@ -38,7 +38,8 @@ allow mirrors.edge.kernel.org
 
 # Sqreen sources
 # (https://github.com/DataDog/logs-backend/blob/93eccaef54c4d0f99151c2bf49ff2bcb028c0bd7/rules/jvm/setup.bzl#L64-L73)
-allow sqreen-ci-java.s3.amazonaws.com
+# incident-48655
+# allow sqreen-ci-java.s3.amazonaws.com
 
 # dd-agent and dd-trace jars
 # (https://github.com/DataDog/logs-backend/blob/8ea7c29de6185481f61ba0b3affa97acad69d18b/rules/jvm/setup.bzl#L84-L98)

.custom-gcl.yml

@@ -21,31 +21,28 @@
     features=["github"],
 )
 @click.option("--pr-number", type=int)
-@click.option("--target-branch", type=str)
+@click.option("--target-branch", type=str, required=True)
 @pass_app
 def cmd(
     app: Application,
+    target_branch: str,
     pr_number: int | None = None,
-    target_branch: str | None = None,
 ) -> None:
     """
     Cherry-pick a merged PR changes to another branch.
     """
-    # Use pr_number and target_branch if provided, otherwise use the event
-    if pr_number and target_branch:
+    # Get the PR either from --pr-number or from the event
+    if pr_number:
         original_pr = get_pr_by_number(pr_number)
-        base = target_branch
     else:
         event = get_event()
         original_pr = event.get("pull_request")
         if not original_pr:
-            app.display_warning("Expecting a pull request event or --pr-number and --target-branch arguments.")
-            return
-        base = find_backport_target(original_pr.get("labels", []))
-        if not base:
-            app.display_warning("No backport/<target> label found. Skipping backport.")
+            app.display_warning("Expecting a pull request event or --pr-number argument.")
             return
 
+    base = target_branch
+
     # Merge commit SHA (the commit created on base branch)
     merge_commit_sha = original_pr.get("merge_commit_sha")
     if not original_pr.get("merged", False) or not merge_commit_sha:
@@ -133,19 +130,6 @@ def get_event() -> dict:
         return json.load(f)
 
 
-def find_backport_target(labels: list[dict]) -> str | None:
-    """
-    Look for a label of the form 'backport/<target>' and return <target>'.
-    """
-    for lbl in labels:
-        name = lbl.get("name")
-        if not name:
-            continue
-        if name.startswith("backport/"):
-            return name.split("/", 1)[1]
-    return None
-
-
 def get_non_backport_labels(labels: list[dict]) -> list[str]:
     """
     Get all labels that are not backport labels.

.dda/extend/commands/gh/cherry_pick_pr/__init__.py

@@ -72,12 +72,11 @@ github_team = "universal-service-monitoring"
 github_labels = ["team/usm"]
 
 [teams."Network Device Monitoring - Core"]
-jira_project = "NDMII"
-jira_issue_type = "Task"
+jira_project = "NDMC"
+jira_issue_type = "HighPriority"
 jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "ndm-core"
-github_labels = ["team/ndm-core", "team/network-device-monitoring"]
-exclude_members = ["leeavital", "heyronhay"]
+github_labels = ["team/ndm-core"]
 
 [teams."Network Device Monitoring - Integrations"]
 jira_project = "NDINT"
@@ -252,3 +251,10 @@ jira_issue_type = "Task"
 jira_statuses = ["To do", "In Development", "Done"]
 github_team = "data-streams-monitoring"
 github_labels = ["team/data-streams-monitoring"]
+
+[teams."Profiling Full Host"]
+jira_project = "PROF"
+jira_issue_type = "Task"
+jira_statuses = ["To Do", "In Progress", "Done"]
+github_team = "profiling-full-host"
+github_labels = ["team/profiling-full-host"]

.ddqa/config.toml

@@ -19,7 +19,6 @@
 /.go-version                            @DataDog/agent-runtimes @DataDog/agent-build
 # Go linters and pre-commit config
 /.golangci.yml                          @DataDog/agent-devx
-/.custom-gcl.yml                        @DataDog/agent-devx
 /.pre-commit-config.yaml                @DataDog/agent-devx
 /.vscode/                               @DataDog/agent-devx
 
@@ -100,11 +99,10 @@
 /.gitlab/.pre/maintenance_jobs/*                          @DataDog/agent-devx
 /.gitlab/.post/notify/*                                    @DataDog/agent-devx
 /.gitlab/build/pkg_metrics/*                               @DataDog/agent-devx
-/.gitlab/.post/post_rc_build/*                             @DataDog/agent-devx
+/.gitlab/.post/post_rc_build/*                             @DataDog/agent-delivery
 /.gitlab/.pre/setup/*                                     @DataDog/agent-devx
 /.gitlab/deploy/trigger_distribution.yml                      @DataDog/agent-delivery
 /.gitlab/distribute/trigger_release/*                           @DataDog/agent-devx @DataDog/agent-delivery
-
 /.gitlab/build/binary_build/cws_instrumentation.yml        @DataDog/agent-devx @DataDog/agent-security
 /.gitlab/build/binary_build/linux.yml                      @DataDog/agent-devx @DataDog/agent-build
 /.gitlab/test/functional_test/static_quality_gate.yml     @DataDog/agent-build
@@ -143,7 +141,7 @@
 /.gitlab/deploy/deploy_packages/windows.yml                    @DataDog/agent-delivery @DataDog/windows-products
 /.gitlab/distribute/winget.yml                     @DataDog/agent-delivery @DataDog/windows-products
 /.gitlab/deploy/deploy_packages/cluster_agent_cloudfoundry.yml @DataDog/agent-integrations @DataDog/agent-devx
-/.gitlab/deploy/deploy_packages/e2e.yml                        @DataDog/agent-devx @DataDog/agent-e2e-testing @DataDog/fleet
+/.gitlab/deploy/deploy_packages/e2e.yml                        @DataDog/agent-devx  @DataDog/fleet
 
 /.gitlab/.pre/deps_build/                                 @DataDog/ebpf-platform @DataDog/agent-build @DataDog/windows-products
 
@@ -152,8 +150,8 @@
 /.gitlab/.pre/common/                                     @DataDog/agent-devx
 
 /.gitlab/test/e2e/e2e.yml                                 @DataDog/container-integrations @DataDog/agent-devx @DataDog/fleet
-/.gitlab/deploy/container_build/fakeintake.yml              @DataDog/agent-e2e-testing @DataDog/agent-devx
-/.gitlab/build/binary_build/fakeintake.yml                 @DataDog/agent-e2e-testing @DataDog/agent-devx
+/.gitlab/deploy/container_build/fakeintake.yml               @DataDog/agent-devx
+/.gitlab/build/binary_build/fakeintake.yml                  @DataDog/agent-devx
 
 /.gitlab/test/functional_test/oracle.yml                  @DataDog/agent-devx @DataDog/database-monitoring
 
@@ -170,7 +168,7 @@
 
 /.gitlab/deploy/dev_container_deploy/                       @DataDog/container-integrations @DataDog/agent-delivery
 /.gitlab/deploy/dev_container_deploy/fakeintake.yml         @DataDog/agent-devx
-/.gitlab/deploy/dev_container_deploy/e2e.yml                @DataDog/agent-devx @DataDog/agent-e2e-testing
+/.gitlab/deploy/dev_container_deploy/e2e.yml                @DataDog/agent-devx
 /.gitlab/deploy/dev_container_deploy/docker_windows.yml     @DataDog/agent-delivery @DataDog/windows-products
 
 /.gitlab/deploy/container_scan/container_scan.yml           @DataDog/container-integrations @DataDog/agent-delivery
@@ -264,7 +262,7 @@
 /cmd/system-probe/subcommands/ebpf/     @DataDog/ebpf-platform @DataDog/universal-service-monitoring
 /cmd/system-probe/subcommands/compliance/     @DataDog/agent-cspm
 /cmd/systray/                           @DataDog/windows-products
-/cmd/secret-backend/                    @DataDog/agent-configuration
+/cmd/secret-generic-connector/          @DataDog/agent-configuration
 /cmd/security-agent/                    @DataDog/agent-security
 /cmd/security-agent/subcommands/compliance/ @DataDog/agent-cspm
 /cmd/installer/                         @DataDog/fleet @DataDog/windows-products
@@ -506,6 +504,7 @@
 /pkg/config/autodiscovery/              @DataDog/container-integrations @DataDog/container-platform @DataDog/agent-configuration
 /pkg/config/env                         @DataDog/container-integrations @DataDog/container-platform @DataDog/agent-configuration
 /pkg/config/setup                            @DataDog/agent-configuration
+/pkg/config/setup/privateactionrunner.go      @DataDog/action-platform
 /pkg/config/setup/process*.go                 @DataDog/container-experiences @DataDog/agent-configuration
 /pkg/config/setup/system_probe.go               @DataDog/ebpf-platform @DataDog/agent-configuration
 /pkg/config/setup/system_probe_cws.go           @DataDog/agent-security @DataDog/agent-configuration
@@ -589,9 +588,6 @@
 /pkg/util/testutil/docker               @DataDog/universal-service-monitoring @DataDog/ebpf-platform
 /pkg/util/trie                          @DataDog/container-integrations
 /pkg/languagedetection                  @DataDog/container-experiences @DataDog/agent-discovery
-/pkg/linters/                           @DataDog/agent-devx
-/pkg/linters/components/                @DataDog/agent-runtimes
-/pkg/linters/components/pkgconfigusage  @DataDog/agent-configuration
 /pkg/logs/                              @DataDog/agent-log-pipelines
 /pkg/logs/launchers/container           @DataDog/agent-log-pipelines @DataDog/container-integrations
 /pkg/logs/tailers/container             @DataDog/agent-log-pipelines @DataDog/container-integrations
@@ -628,6 +624,7 @@
 /pkg/network/                           @DataDog/cloud-network-monitoring
 /pkg/network/*usm*                      @DataDog/universal-service-monitoring
 /pkg/network/*_windows*.go              @DataDog/windows-products
+/pkg/network/*usm*windows*.go           @DataDog/windows-products @DataDog/universal-service-monitoring
 /pkg/network/config/config_test.go      @DataDog/cloud-network-monitoring @DataDog/universal-service-monitoring @DataDog/windows-products
 /pkg/network/config/usm*.go             @DataDog/universal-service-monitoring
 /pkg/network/driver_*.go                @DataDog/windows-products
@@ -642,15 +639,16 @@
 /pkg/network/ebpf/c/protocols/tls       @DataDog/cloud-network-monitoring @DataDog/universal-service-monitoring
 /pkg/network/encoding/marshal/*usm*     @DataDog/universal-service-monitoring
 /pkg/network/encoding/marshal/*_windows*.go  @DataDog/windows-products
+/pkg/network/encoding/marshal/*usm*windows*.go  @DataDog/windows-products @DataDog/universal-service-monitoring
 /pkg/network/go/                        @DataDog/universal-service-monitoring
 /pkg/network/protocols/                 @DataDog/universal-service-monitoring
-/pkg/network/protocols/http/driver_*.go         @DataDog/windows-products
-/pkg/network/protocols/http/etw*.go             @DataDog/windows-products
-/pkg/network/protocols/http/*_windows*.go       @DataDog/windows-products
+/pkg/network/protocols/http/driver_*.go         @DataDog/windows-products @DataDog/universal-service-monitoring
+/pkg/network/protocols/http/etw*.go             @DataDog/windows-products @DataDog/universal-service-monitoring
+/pkg/network/protocols/http/*_windows*.go       @DataDog/windows-products @DataDog/universal-service-monitoring
 /pkg/network/tracer/testutil/proxy/              @DataDog/universal-service-monitoring
 /pkg/network/tracer/*_windows*.go               @DataDog/windows-products
 /pkg/network/usm/                       @DataDog/universal-service-monitoring
-/pkg/network/usm/tests/*_windows*.go    @DataDog/windows-products
+/pkg/network/usm/tests/*_windows*.go    @DataDog/windows-products @DataDog/universal-service-monitoring
 /pkg/networkconfigmanagement/           @DataDog/ndm-core @DataDog/ndm-integrations
 /pkg/ebpf/                              @DataDog/ebpf-platform
 /pkg/ebpf/map_cleaner*.go               @DataDog/universal-service-monitoring
@@ -700,7 +698,7 @@
 /tasks/cluster_agent_cloudfoundry.py    @DataDog/agent-integrations
 /tasks/devcontainer.py                  @DataDog/agent-devx @DataDog/container-platform
 /tasks/skaffold.py                      @DataDog/agent-devx @DataDog/container-platform
-/tasks/new_e2e_tests.py                 @DataDog/agent-e2e-testing @DataDog/agent-devx
+/tasks/new_e2e_tests.py                  @DataDog/agent-devx
 /tasks/process_agent.py                 @DataDog/container-experiences
 /tasks/privateactionrunner.py           @DataDog/action-platform
 /tasks/system_probe.py                  @DataDog/ebpf-platform
@@ -743,12 +741,12 @@
 /test/integration/                      @DataDog/serverless-azure-gcp
 /test/integration/docker/               @DataDog/opentelemetry-agent
 /test/e2e-framework/testing/testcommon/check            @DataDog/agent-runtimes
-/test/fakeintake/                             @DataDog/agent-e2e-testing @DataDog/agent-devx
+/test/fakeintake/                              @DataDog/agent-devx
 /test/fakeintake/aggregator/ndmAggregator.go @DataDog/ndm-core
 /test/fakeintake/aggregator/ndmAggregator_test.go @DataDog/ndm-core
 /test/fakeintake/aggregator/ndmflowAggregator.go @DataDog/ndm-integrations
 /test/fakeintake/aggregator/ndmflowAggregator_test.go @DataDog/ndm-integrations
-/test/new-e2e/                                @DataDog/agent-e2e-testing @DataDog/agent-devx
+/test/new-e2e/                                 @DataDog/agent-devx
 /test/new-e2e/test-infra-definition           @DataDog/agent-devx
 /test/new-e2e/system-probe                    @DataDog/ebpf-platform
 /test/new-e2e/system-probe/config/vmconfig-security-agent.json @DataDog/ebpf-platform @DataDog/agent-security
@@ -807,6 +805,7 @@
 /test/regression/cases/docker_containers*     @DataDog/single-machine-performance @DataDog/container-integrations
 
 /tools/                                 @DataDog/agent-devx
+/tools/host-profiler/                   @DataDog/profiling-full-host
 /tools/bazel*                           @DataDog/agent-build
 /tools/ci/*bazel*                       @DataDog/agent-build
 /tools/ci                               @DataDog/agent-devx

.github/CODEOWNERS

@@ -0,0 +1,10 @@
+issuer: https://gitlab.ddbuild.io
+subject_pattern: "project_path:DataDog/datadog-agent:ref_type:branch:ref:.*"
+claim_pattern:
+  project_path: "DataDog/datadog-agent"
+  ref_type: "branch"
+  ref: ".+"
+  ref_path: "refs/heads/.+"
+  ref_protected: "true"
+permissions:
+  security_events: write

.github/chainguard/codeql.sts.yaml

@@ -137,7 +137,7 @@ updates:
     labels:
       - dependencies
       - dependencies-go
-      - team/network-device-monitoring
+      - team/ndm-core
       - changelog/no-changelog
     ignore:
       # Ignore internal modules

.github/dependabot.yaml

@@ -6,23 +6,51 @@ on:
       - labeled
 
 jobs:
+  get-backport-targets:
+    name: Get backport targets
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged
+    outputs:
+      targets: ${{ steps.get-targets.outputs.targets }}
+    steps:
+      - name: Get backport targets
+        id: get-targets
+        run: |
+          # For 'labeled' event, use just the added label
+          # For 'closed' event, use all backport labels
+          if [[ "${{ github.event.action }}" == "labeled" ]]; then
+            if [[ "${{ github.event.label.name }}" == backport/* ]]; then
+              echo "targets=[\"${{ github.event.label.name }}\"]" >> $GITHUB_OUTPUT
+            else
+              echo "targets=[]" >> $GITHUB_OUTPUT
+            fi
+          else
+            # Extract all backport/* labels as JSON array
+            targets=$(echo '${{ toJson(github.event.pull_request.labels.*.name) }}' | jq -c '[.[] | select(startswith("backport/"))]')
+            echo "targets=$targets" >> $GITHUB_OUTPUT
+          fi
+
   backport:
-    name: Backport PR
+    name: Backport PR to ${{ matrix.target }}
+    needs: get-backport-targets
+    if: needs.get-backport-targets.outputs.targets != '[]' && needs.get-backport-targets.outputs.targets != ''
     runs-on: ubuntu-latest
-    if: >
-      github.event.pull_request.merged
-      && (
-        github.event.action == 'closed'
-        || (
-          github.event.action == 'labeled'
-          && contains(github.event.label.name, 'backport')
-        )
-      )
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ${{ fromJson(needs.get-backport-targets.outputs.targets) }}
     permissions:
       id-token: write # This is required for getting the required OIDC token from GitHub
       contents: write # This is required for pushing the backport branch
       pull-requests: write # This is required for creating the backport PR
     steps:
+      - name: Compute target branch
+        id: target
+        run: |
+          target="${{ matrix.target }}"
+          target_branch="${target/backport\//}"
+          echo "target_branch=$target_branch" >> $GITHUB_OUTPUT
+
       - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
         id: octo-sts
         with:
@@ -32,7 +60,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0 # needed to get the full history of the PR
-  
+
       - name: Install dda
         uses: ./.github/actions/install-dda
         with:
@@ -43,12 +71,12 @@ jobs:
         env:
             GITHUB_TOKEN: ${{ steps.octo-sts.outputs.token }}
             GITHUB_EVENT_PATH: ${{ github.event_path }}
-        run: dda gh cherry-pick-pr
+        run: dda gh cherry-pick-pr --target-branch "${{ steps.target.outputs.target_branch }}"
 
       - name: Reset cherry-pick
         if: steps.cherry-pick.outputs.base != ''
         run: git reset HEAD~1
-  
+
       - name: Create pull request
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         if: steps.cherry-pick.outputs.base != ''
@@ -60,15 +88,15 @@ jobs:
           title: "[Backport ${{steps.cherry-pick.outputs.base}}]  ${{steps.cherry-pick.outputs.original_title}}"
           body: |
             Backport ${{steps.cherry-pick.outputs.merge_commit_sha}} from #${{steps.cherry-pick.outputs.original_pr_number}}.
-            
+
              ___
-  
+
             ${{ steps.cherry-pick.outputs.original_body }}
-  
+
           labels: ${{ steps.cherry-pick.outputs.original_labels }},backport,bot
           commit-message: |
             ${{ steps.cherry-pick.outputs.message }}
-            
+
             ___
-  
+
             Co-authored-by: ${{ steps.cherry-pick.outputs.author }}