merge windows-kernel-integrations into windows-agent (#36280)

clarkb7 · web-flow · commit 1cb2fe523d83 · 2025-04-28T14:30:48.000Z
diff --git a/.ddqa/config.toml b/.ddqa/config.toml
@@ -189,13 +189,6 @@ jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "windows-agent"
 github_labels = ["team/windows-agent"]
 
-[teams."Windows Kernel Integrations"]
-jira_project = "WKINT"
-jira_issue_type = "Task"
-jira_statuses = ["To Do", "In Progress", "Done"]
-github_team = "windows-kernel-integrations"
-github_labels = ["team/windows-kernel-integrations"]
-
 [teams."Database Monitoring"]
 jira_project = "DBMON"
 jira_issue_type = "Task"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -240,8 +240,8 @@
 /cmd/system-probe/modules/ping*         @DataDog/ndm-core
 /cmd/system-probe/modules/language_detection* @DataDog/container-intake @DataDog/agent-discovery
 /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
+/cmd/system-probe/windows_resources/    @DataDog/windows-agent
+/cmd/system-probe/main_windows*.go      @DataDog/windows-agent
 /cmd/system-probe/subcommands/runtime/  @DataDog/agent-security
 /cmd/systray/                           @DataDog/windows-agent
 /cmd/security-agent/                    @DataDog/agent-security
@@ -318,7 +318,7 @@
 /comp/agent/cloudfoundrycontainer @DataDog/agent-integrations
 /comp/agent/jmxlogger @DataDog/agent-metric-pipelines
 /comp/aggregator/diagnosesendermanager @DataDog/agent-configuration
-/comp/checks/agentcrashdetect @DataDog/windows-kernel-integrations
+/comp/checks/agentcrashdetect @DataDog/windows-agent
 /comp/checks/windowseventlog @DataDog/windows-agent
 /comp/checks/winregistry @DataDog/windows-agent
 /comp/core/autodiscovery @DataDog/container-platform
@@ -435,7 +435,7 @@
 /pkg/collector/corechecks/snmp/         @DataDog/ndm-core
 /pkg/collector/corechecks/system/                 @DataDog/agent-runtimes
 /pkg/collector/corechecks/system/**/*_windows*.go @DataDog/agent-runtimes @DataDog/windows-agent
-/pkg/collector/corechecks/system/wincrashdetect/  @DataDog/windows-kernel-integrations
+/pkg/collector/corechecks/system/wincrashdetect/  @DataDog/windows-agent
 /pkg/collector/corechecks/system/winkmem/         @DataDog/windows-agent
 /pkg/collector/corechecks/system/winproc/         @DataDog/windows-agent
 /pkg/collector/corechecks/systemd/      @DataDog/agent-integrations
@@ -450,7 +450,7 @@
 /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
 /pkg/config/setup/system_probe_cws_notwin.go    @DataDog/agent-security @DataDog/agent-configuration
-/pkg/config/setup/system_probe_cws_windows.go   @DataDog/windows-kernel-integrations @DataDog/agent-configuration
+/pkg/config/setup/system_probe_cws_windows.go   @DataDog/windows-agent @DataDog/agent-configuration
 /pkg/config/setup/security_agent.go             @DataDog/agent-security @DataDog/agent-configuration
 /pkg/config/remote/                     @DataDog/remote-config
 /pkg/config/remote/meta/                @DataDog/remote-config @DataDog/sdlc-security
@@ -478,8 +478,8 @@
 /pkg/remoteconfig/                      @DataDog/remote-config
 /pkg/runtime/                           @DataDog/agent-runtimes
 /pkg/system-probe/                      @DataDog/ebpf-platform
-/pkg/system-probe/api/client/client_windows.go      @DataDog/windows-kernel-integrations
-/pkg/system-probe/api/server/listener_windows.go    @DataDog/windows-kernel-integrations
+/pkg/system-probe/api/client/client_windows.go      @DataDog/windows-agent
+/pkg/system-probe/api/server/listener_windows.go    @DataDog/windows-agent
 /pkg/system-probe/config/adjust_npm.go  @DataDog/ebpf-platform @DataDog/Networks
 /pkg/system-probe/config/adjust_usm.go  @DataDog/ebpf-platform @DataDog/universal-service-monitoring
 /pkg/system-probe/config/adjust_security.go  @DataDog/ebpf-platform @DataDog/agent-security
@@ -512,7 +512,7 @@
 /pkg/util/cgroups/                      @DataDog/container-integrations
 /pkg/util/retry/                        @DataDog/container-platform
 /pkg/util/intern/                       @DataDog/ebpf-platform
-/pkg/util/crashreport/                  @DataDog/windows-kernel-integrations
+/pkg/util/crashreport/                  @DataDog/windows-agent
 /pkg/util/pdhutil/                      @DataDog/windows-agent
 /pkg/util/winutil/                      @DataDog/windows-agent
 /pkg/util/testutil/flake                @DataDog/agent-devx
@@ -539,7 +539,7 @@
 /pkg/process/util/address*.go           @DataDog/Networks
 /pkg/process/checks/net*.go             @DataDog/Networks
 /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/metadata/parser/*windows*  @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks @DataDog/windows-agent
 /pkg/process/monitor/                   @DataDog/universal-service-monitoring
 /pkg/process/net/                       @DataDog/universal-service-monitoring @DataDog/Networks
 /pkg/proto/datadog/remoteconfig/        @DataDog/remote-config
@@ -555,28 +555,28 @@
 /pkg/orchestrator/                      @DataDog/container-app
 /pkg/network/                           @DataDog/Networks
 /pkg/network/*usm*                      @DataDog/universal-service-monitoring
-/pkg/network/*_windows*.go              @DataDog/windows-kernel-integrations
-/pkg/network/config/config_test.go      @DataDog/Networks @DataDog/universal-service-monitoring @DataDog/windows-kernel-integrations
-/pkg/network/driver_*.go                @DataDog/windows-kernel-integrations
-/pkg/network/dns/*_windows*.go          @DataDog/windows-kernel-integrations
-/pkg/network/driver/                    @DataDog/windows-kernel-integrations
+/pkg/network/*_windows*.go              @DataDog/windows-agent
+/pkg/network/config/config_test.go      @DataDog/Networks @DataDog/universal-service-monitoring @DataDog/windows-agent
+/pkg/network/driver_*.go                @DataDog/windows-agent
+/pkg/network/dns/*_windows*.go          @DataDog/windows-agent
+/pkg/network/driver/                    @DataDog/windows-agent
 /pkg/network/ebpf/c/prebuilt/usm*      @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/runtime/usm*       @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/prebuilt/shared-libraries*  @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/runtime/shared-libraries*   @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/shared-libraries/           @DataDog/universal-service-monitoring
 /pkg/network/ebpf/c/protocols/          @DataDog/universal-service-monitoring
 /pkg/network/encoding/marshal/*usm*     @DataDog/universal-service-monitoring
-/pkg/network/encoding/marshal/*_windows*.go  @DataDog/windows-kernel-integrations
+/pkg/network/encoding/marshal/*_windows*.go  @DataDog/windows-agent
 /pkg/network/go/                        @DataDog/universal-service-monitoring
 /pkg/network/protocols/                 @DataDog/universal-service-monitoring
-/pkg/network/protocols/http/driver_*.go         @DataDog/windows-kernel-integrations
-/pkg/network/protocols/http/etw*.go             @DataDog/windows-kernel-integrations
-/pkg/network/protocols/http/*_windows*.go       @DataDog/windows-kernel-integrations
+/pkg/network/protocols/http/driver_*.go         @DataDog/windows-agent
+/pkg/network/protocols/http/etw*.go             @DataDog/windows-agent
+/pkg/network/protocols/http/*_windows*.go       @DataDog/windows-agent
 /pkg/network/tracer/testutil/proxy/              @DataDog/universal-service-monitoring
-/pkg/network/tracer/*_windows*.go               @DataDog/windows-kernel-integrations
+/pkg/network/tracer/*_windows*.go               @DataDog/windows-agent
 /pkg/network/usm/                       @DataDog/universal-service-monitoring
-/pkg/network/usm/tests/*_windows*.go    @DataDog/windows-kernel-integrations
+/pkg/network/usm/tests/*_windows*.go    @DataDog/windows-agent
 /pkg/ebpf/                              @DataDog/ebpf-platform
 /pkg/ebpf/map_cleaner*.go               @DataDog/universal-service-monitoring
 /pkg/compliance/                        @DataDog/agent-cspm
@@ -586,7 +586,7 @@
 /pkg/networkdevice/                     @DataDog/ndm-core
 /pkg/snmp/                              @DataDog/ndm-core
 /pkg/tagger/                            @DataDog/container-platform
-/pkg/windowsdriver/                     @DataDog/windows-kernel-integrations
+/pkg/windowsdriver/                     @DataDog/windows-agent
 /comp/core/workloadmeta/collectors/internal/cloudfoundry  @DataDog/agent-integrations
 /comp/core/workloadmeta/collectors/internal/containerd    @DataDog/container-platform @DataDog/container-integrations
 /comp/core/workloadmeta/collectors/internal/crio          @DataDog/container-platform @DataDog/container-integrations
@@ -686,15 +686,15 @@
 /test/new-e2e/tests/ndm/netflow               @DataDog/ndm-integrations
 /test/new-e2e/tests/netpath                   @DataDog/Networks
 /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/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-agent
 /test/new-e2e/tests/orchestrator              @DataDog/container-app
 /test/new-e2e/tests/otel                      @DataDog/opentelemetry-agent
 /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/sysprobe-functional     @DataDog/windows-agent
+/test/new-e2e/tests/security-agent-functional     @DataDog/windows-agent @DataDog/agent-security
 /test/new-e2e/tests/cws                       @DataDog/agent-security
 /test/new-e2e/tests/agent-log-pipelines       @DataDog/agent-log-pipelines
-/test/new-e2e/tests/windows                   @DataDog/windows-agent @DataDog/windows-kernel-integrations
+/test/new-e2e/tests/windows                   @DataDog/windows-agent @DataDog/windows-agent
 /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
@@ -713,7 +713,7 @@
 /tools/ebpf/                            @DataDog/ebpf-platform
 /tools/gdb/                             @DataDog/agent-runtimes
 /tools/go-update/                       @DataDog/agent-runtimes
-/tools/NamedPipeCmd/                    @DataDog/windows-kernel-integrations
+/tools/NamedPipeCmd/                    @DataDog/windows-agent
 /tools/retry_file_dump/                 @DataDog/agent-metric-pipelines
 /tools/windows/                         @DataDog/windows-agent
 /tools/windows/DatadogAgentInstaller/WixSetup/localization-en-us.wxl @DataDog/windows-agent @DataDog/documentation
diff --git a/.gitlab/JOBOWNERS b/.gitlab/JOBOWNERS
@@ -20,7 +20,7 @@ fetch_openjdk                        @DataDog/agent-metric-pipelines
 tests_*                                 @DataDog/multiple
 tests_ebpf*                             @DataDog/ebpf-platform
 tests_serverless                        @DataDog/serverless
-tests_windows_sysprobe*                 @DataDog/windows-kernel-integrations
+tests_windows_sysprobe*                 @DataDog/windows-agent
 security_go_generate_check              @DataDog/agent-security
 prepare_sysprobe_ebpf_functional_tests* @DataDog/ebpf-platform
 prepare_secagent_ebpf_functional_tests* @DataDog/agent-security
diff --git a/.gitlab/e2e/e2e.yml b/.gitlab/e2e/e2e.yml
@@ -712,7 +712,7 @@ new-e2e-windows-systemprobe:
     - windows_msi_and_bosh_zip_x64-a7
   variables:
     TARGETS: ./tests/sysprobe-functional
-    TEAM: windows-kernel-integrations
+    TEAM: windows-agent
   parallel:
     matrix:
       - EXTRA_PARAMS: --run TestUSMAutoTaggingSuite
@@ -729,7 +729,7 @@ new-e2e-windows-security-agent:
     - tests_windows_secagent_x64
   variables:
     TARGETS: ./tests/security-agent-functional
-    TEAM: windows-kernel-integrations
+    TEAM: windows-agent
 
 new-e2e-otel-eks-init:
   stage: e2e_init
diff --git a/.gitlab/e2e_install_packages/windows.yml b/.gitlab/e2e_install_packages/windows.yml
@@ -70,7 +70,7 @@ new-e2e_windows_powershell_module_test:
     !reference [ .on_powershell_module_or_e2e_changes_or_manual ]
   variables:
     TARGETS: ./tests/windows/powershell-module-test
-    TEAM: windows-kernel-integrations
+    TEAM: windows-agent
   needs:
     - !reference [.needs_new_e2e_template]
 
diff --git a/comp/README.md b/comp/README.md
@@ -78,7 +78,7 @@ Package checks implements the "checks" bundle, for all of the component based ag
 
 ### [comp/checks/agentcrashdetect](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/checks/agentcrashdetect)
 
-*Datadog Team*: windows-kernel-integrations
+*Datadog Team*: windows-agent
 
 Package agentcrashdetect ... /* TODO: detailed doc comment for the component */
 
diff --git a/comp/checks/agentcrashdetect/component.go b/comp/checks/agentcrashdetect/component.go
@@ -8,7 +8,7 @@
 // Package agentcrashdetect ... /* TODO: detailed doc comment for the component */
 package agentcrashdetect
 
-// team: windows-kernel-integrations
+// team: windows-agent
 
 // Component is the component type.
 type Component interface {
diff --git a/tasks/libs/issue/model/constants.py b/tasks/libs/issue/model/constants.py
@@ -43,5 +43,4 @@
     'triage',
     'universal-service-monitoring',
     'windows-agent',
-    'windows-kernel-integrations',
 )
diff --git a/tasks/libs/pipeline/github_jira_map.yaml b/tasks/libs/pipeline/github_jira_map.yaml
@@ -28,7 +28,6 @@
 '@datadog/networks': NPM
 '@datadog/universal-service-monitoring': USMON
 '@datadog/windows-agent': WINA
-'@datadog/windows-kernel-integrations': WKINT
 '@datadog/opentelemetry': OTAGENT
 '@datadog/opentelemetry-agent': OTAGENT
 '@datadog/agent-e2e-testing': ADXT
diff --git a/tasks/libs/pipeline/github_slack_map.yaml b/tasks/libs/pipeline/github_slack_map.yaml
@@ -49,4 +49,3 @@
 '@datadog/telemetry-and-analytics': '#instrumentation-telemetry'
 '@datadog/universal-service-monitoring': '#universal-service-monitoring'
 '@datadog/windows-agent': '#windows-agent-ops'
-'@datadog/windows-kernel-integrations': '#windows-kernel-integrations-ops'
diff --git a/tasks/libs/pipeline/github_slack_review_map.yaml b/tasks/libs/pipeline/github_slack_review_map.yaml
@@ -51,4 +51,3 @@
 '@datadog/telemetry-and-analytics': '#instrumentation-telemetry'
 '@datadog/universal-service-monitoring': '#universal-service-monitoring'
 '@datadog/windows-agent': '#windows-agent-reviews'
-'@datadog/windows-kernel-integrations': '#windows-kernel-integrations-reviews'
diff --git a/tasks/unit_tests/junit_tests.py b/tasks/unit_tests/junit_tests.py
@@ -55,7 +55,7 @@ def test_without_split(self):
     def test_with_split(self):
         xml_file = Path("./tasks/unit_tests/testdata/secret.tar.gz/-go-src-datadog-agent-junit-out-base.xml")
         owners = read_owners(".github/CODEOWNERS")
-        self.assertEqual(junit.split_junitxml(xml_file.parent, xml_file, owners, {}, {}), 29)
+        self.assertEqual(junit.split_junitxml(xml_file.parent, xml_file, owners, {}, {}), 28)
 
 
 class TestGroupPerTag(unittest.TestCase):
@@ -124,4 +124,4 @@ def test_e2e(self, mock_which, mock_popen):
             "tasks/unit_tests/testdata/test_output_no_failure.json",
         )
         mock_popen.assert_called()
-        self.assertEqual(mock_popen.call_count, 31)
+        self.assertEqual(mock_popen.call_count, 30)

Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,4 @@`
`43`	`43`	`'triage',`
`44`	`44`	`'universal-service-monitoring',`
`45`	`45`	`'windows-agent',`
`46`		`- 'windows-kernel-integrations',`
`47`	`46`	`)`