Merge remote-tracking branch 'origin/main' into mwdd146980/port-confl…

…ict-windows

.copyright-overrides.yml

@@ -216,6 +216,7 @@ github.com/gogo/protobuf: ["Copyright (c) 2013, The GoGo Authors. All rights res
 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.
+github.com/moby/sys/userns: Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
 github.com/modern-go/concurrent: Copyright (c) 2018 Tao Wen
 github.com/modern-go/reflect2: Copyright (c) 2018 Tao Wen
 github.com/opencontainers/selinux/*: Copyright (c) 2017 The Authors

.github/workflows/create_rc_pr.yml

@@ -77,6 +77,7 @@ jobs:
                 ATLASSIAN_USERNAME: ${{ secrets.ATLASSIAN_USERNAME }}
                 ATLASSIAN_PASSWORD: ${{ secrets.ATLASSIAN_PASSWORD }}
               run: |
+                export SLACK_API_TOKEN="${{ secrets.SLACK_API_TOKEN }}"
                 echo "CHANGES=$(inv -e release.check-for-changes -r ${{ matrix.value }} ${{ needs.find_release_branches.outputs.warning }})" >> $GITHUB_OUTPUT
 
             - name: Create RC PR

.gitlab-ci.yml

@@ -739,9 +739,6 @@ workflow:
   - pkg/network/**/*
   - pkg/process/monitor/*
   - pkg/util/kernel/**/*
-  - test/kitchen/site-cookbooks/dd-system-probe-check/**/*
-  - test/kitchen/test/integration/win-sysprobe-test/**/*
-  - .gitlab/functional_test/system_probe_windows.yml
   - .gitlab/kernel_matrix_testing/system_probe.yml
   - .gitlab/kernel_matrix_testing/common.yml
   - test/new-e2e/system-probe/**/*
@@ -1030,6 +1027,28 @@ workflow:
   - when: manual
     allow_failure: true
 
+.on_windows_systemprobe_or_e2e_changes:
+  - !reference [.on_e2e_main_release_or_rc]
+  - changes:
+      paths:
+        - pkg/collector/corechecks/servicediscovery/module/*
+        - pkg/network/**/*
+        - pkg/process/monitor/*
+        - pkg/util/kernel/**/*
+        - test/new-e2e/tests/sysprobe-functional/**/*
+      compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
+    when: on_success
+
+.on_windows_security_or_e2e_changes:
+  - !reference [.on_e2e_main_release_or_rc]
+  - changes:
+      paths:
+        - pkg/security/**/*
+        - pkg/eventmonitor/**/*
+        - test/new-e2e/tests/security-agent-functional/**/*
+      compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
+    when: on_success
+
 .on_scheduled_main:
   - <<: *if_scheduled_main
 

.gitlab/e2e/e2e.yml

@@ -368,6 +368,32 @@ new-e2e-ndm-snmp:
     TARGETS: ./tests/ndm/snmp
     TEAM: network-device-monitoring
 
+new-e2e-windows-systemprobe:
+  extends: .new_e2e_template
+  rules:
+    - !reference [.on_windows_systemprobe_or_e2e_changes]
+    - !reference [.manual]
+  needs:
+    - !reference [.needs_new_e2e_template]
+    - deploy_windows_testing-a7
+    - tests_windows_sysprobe_x64
+  variables:
+    TARGETS: ./tests/sysprobe-functional
+    TEAM: windows-kernel-integrations
+
+new-e2e-windows-security-agent:
+  extends: .new_e2e_template
+  rules:
+    - !reference [.on_windows_security_or_e2e_changes]
+    - !reference [.manual]
+  needs:
+    - !reference [.needs_new_e2e_template]
+    - deploy_windows_testing-a7
+    - tests_windows_secagent_x64
+  variables:
+    TARGETS: ./tests/security-agent-functional
+    TEAM: windows-kernel-integrations
+
 new-e2e-otel:
   extends: .new_e2e_template
   rules:

.gitlab/functional_test/include.yml

@@ -7,7 +7,6 @@ include:
   - .gitlab/functional_test/security_agent.yml
   - .gitlab/functional_test/serverless.yml
   - .gitlab/functional_test/regression_detector.yml
-  - .gitlab/functional_test/system_probe_windows.yml
   - .gitlab/kernel_matrix_testing/common.yml
   - .gitlab/kernel_matrix_testing/system_probe.yml
   - .gitlab/kernel_matrix_testing/security_agent.yml

.gitlab/functional_test/security_agent.yml

@@ -157,25 +157,3 @@ kitchen_stress_security_agent:
     matrix:
       - KITCHEN_PLATFORM: "ubuntu"
         KITCHEN_OSVERS: "ubuntu-20-04"
-
-kitchen_test_security_agent_windows_x64:
-  extends:
-    - .kitchen_test_security_agent
-    - .kitchen_os_windows
-    - .kitchen_azure_location_north_central_us
-  rules:
-    !reference [.on_security_agent_changes_or_manual]
-  stage: functional_test
-  needs: [ "tests_windows_secagent_x64" ]
-  variables:
-    KITCHEN_ARCH: x86_64
-    KITCHEN_OSVERS: "win2016"
-    CHEF_VERSION: 14.12.9 # newer versions error out during kitchen setup of azure VM
-  before_script:
-    - export WINDOWS_DDPROCMON_DRIVER=$(inv release.get-release-json-value "$RELEASE_VERSION_7::WINDOWS_DDPROCMON_DRIVER")
-    - export WINDOWS_DDPROCMON_VERSION=$(inv release.get-release-json-value "$RELEASE_VERSION_7::WINDOWS_DDPROCMON_VERSION")
-    - export WINDOWS_DDPROCMON_SHASUM=$(inv release.get-release-json-value "$RELEASE_VERSION_7::WINDOWS_DDPROCMON_SHASUM")
-    - pushd $DD_AGENT_TESTING_DIR
-    - tasks/kitchen_setup.sh
-  script:
-    - tasks/run-test-kitchen.sh windows-secagent-test $AGENT_MAJOR_VERSION

.gitlab/source_test/linux.yml

@@ -282,3 +282,4 @@ new-e2e-unit-tests:
     KUBERNETES_MEMORY_REQUEST: 12Gi
     KUBERNETES_MEMORY_LIMIT: 16Gi
     KUBERNETES_CPU_REQUEST: 6
+  timeout: 10m

CHANGELOG-DCA.rst

@@ -2,6 +2,32 @@
 Release Notes
 =============
 
+.. _Release Notes_7.56.2:
+
+7.56.2
+======
+
+.. _Release Notes_7.56.2_Prelude:
+
+Prelude
+-------
+
+Released on: 2024-09-02
+Pinned to datadog-agent v7.56.2: `CHANGELOG <https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7562>`_.
+
+.. _Release Notes_7.56.1:
+
+7.56.1
+======
+
+.. _Release Notes_7.56.1_Prelude:
+
+Prelude
+-------
+
+Released on: 2024-08-29
+Pinned to datadog-agent v7.56.1: `CHANGELOG <https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst#7561>`_.
+
 .. _Release Notes_7.56.0:
 
 7.56.0

CHANGELOG.rst

@@ -2,6 +2,52 @@
 Release Notes
 =============
 
+.. _Release Notes_7.56.2:
+
+7.56.2
+======
+
+.. _Release Notes_7.56.2_Prelude:
+
+Prelude
+-------
+
+Release on: 2024-09-02
+
+- Please refer to the `7.56.2 tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-7562>`_ for the list of changes on the Core Checks
+
+
+.. _Release Notes_7.56.2_Bug Fixes:
+
+Bug Fixes
+---------
+
+- Fix issue causing GUI to fail when opening with Internet Explorer on Windows.
+
+
+.. _Release Notes_7.56.1:
+
+7.56.1
+======
+
+.. _Release Notes_7.56.1_Prelude:
+
+Prelude
+-------
+
+Release on: 2024-08-29
+
+- Please refer to the `7.56.1 tag on integrations-core <https://github.com/DataDog/integrations-core/blob/master/AGENT_CHANGELOG.md#datadog-agent-version-7561>`_ for the list of changes on the Core Checks
+
+
+.. _Release Notes_7.56.1_Bug Fixes:
+
+Bug Fixes
+---------
+
+- Fixed a nil pointer dereference issue in the `Tailer.DidRotate` function that was causing the Agent to panic.
+
+
 .. _Release Notes_7.56.0:
 
 7.56.0

LICENSE-3rdparty.csv

@@ -792,7 +792,6 @@ core,github.com/containerd/containerd/pkg/transfer,Apache-2.0,"Copyright 2012-20
 core,github.com/containerd/containerd/pkg/transfer/proxy,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
 core,github.com/containerd/containerd/pkg/transfer/streaming,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
 core,github.com/containerd/containerd/pkg/unpack,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
-core,github.com/containerd/containerd/pkg/userns,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
 core,github.com/containerd/containerd/platforms,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
 core,github.com/containerd/containerd/plugin,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
 core,github.com/containerd/containerd/protobuf,Apache-2.0,"Copyright 2012-2015 Docker, Inc."
@@ -1498,6 +1497,7 @@ core,github.com/moby/sys/mountinfo,Apache-2.0,Copyright (c) 2014-2018 The Docker
 core,github.com/moby/sys/sequential,Apache-2.0,Kir Kolyshkin <[email protected]>|Sebastiaan van Stijn <[email protected]>|Sebastiaan van Stijn <[email protected]>|Tibor Vass <[email protected]>|Brian Goff <[email protected]>|John Howard <[email protected]>|Victor Vieux <[email protected]>|Michael Crosby <[email protected]>|Daniel Nephin <[email protected]>|Tianon Gravi <[email protected]>|Vincent Batts <[email protected]>|Akihiro Suda <[email protected]>|Michael Crosby <[email protected]>|Yong Tang <[email protected]>|Kir Kolyshkin <[email protected]>|Christopher Jones <[email protected]>|Guillaume J. Charmes <[email protected]>|Kato Kazuyoshi <[email protected]>|Manu Gupta <[email protected]>|Michael Crosby <[email protected]>|Vincent Demeester <[email protected]>|Aleksa Sarai <[email protected]>|Amit Krishnan <[email protected]>|Arnaud Porterie <[email protected]>|Brian Goff <[email protected]>|Brian Goff <[email protected]>|Dan Walsh <[email protected]>|Michael Crosby <[email protected]>|Phil Estes <[email protected]>|Shengjing Zhu <[email protected]>|Solomon Hykes <[email protected]>|Tobias Klauser <[email protected]>|lalyos <[email protected]>|unclejack <[email protected]>|Akihiro Suda <[email protected]>|Alexander Morozov <[email protected]>|Jessica Frazelle <[email protected]>|Jessica Frazelle <[email protected]>|Jessie Frazelle <[email protected]>|Justas Brazauskas <[email protected]>|Justin Cormack <[email protected]>|Kazuyoshi Kato <[email protected]>|Naveed Jamil <[email protected]>|Vincent Demeester <[email protected]>|shuai-z <[email protected]>|Ahmet Alp Balkan <[email protected]>|Aleksa Sarai <[email protected]>|Alexander Larsson <[email protected]>|Alexander Morozov <[email protected]>|Alexandr Morozov <[email protected]>|Alexandr Morozov <[email protected]>|Antonio Murdaca <[email protected]>|Antonio Murdaca <[email protected]>|Antonio Murdaca <[email protected]>|Artem Khramov <[email protected]>|Cezar Sa Espinola <[email protected]>|Chen Hanxiao <[email protected]>|Darren Stahl <[email protected]>|David Calavera <[email protected]>|Derek McGowan <[email protected]>|Eng Zer Jun <[email protected]>|Erik Dubbelboer <[email protected]>|Fabian Kramm <[email protected]>|Guillaume Dufour <[email protected]>|Guillaume J. Charmes <[email protected]>|Hajime Tazaki <[email protected]>|Jamie Hannaford <[email protected]>|Jason A. Donenfeld <[email protected]>|Jhon Honce <[email protected]>|Josh Soref <[email protected]>|Kasper Fabæch Brandt <[email protected]>|Kathryn Baldauf <[email protected]>|Kenfe-Mickael Laventure <[email protected]>|Kirill Kolyshkin <[email protected]>|Muhammad Kaisar Arkhan <[email protected]>|Oli <[email protected]>|Olli Janatuinen <[email protected]>|Paul Nasrat <[email protected]>|Peter Bourgon <[email protected]>|Peter Waller <[email protected]>|Phil Estes <[email protected]>|Samuel Karp <[email protected]>|Stefan J. Wernli <[email protected]>|Steven Hartland <[email protected]>|Stig Larsson <[email protected]>|Tim Wang <[email protected]>|Victor Vieux <[email protected]>|Victor Vieux <[email protected]>|Yan Feng <[email protected]>|jhowardmsft <[email protected]>|liuxiaodong <[email protected]>|phineas <[email protected]>|unclejack <[email protected]>|yuexiao-wang <[email protected]>|谢致邦 (XIE Zhibang) <[email protected]>
 core,github.com/moby/sys/signal,Apache-2.0,Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
 core,github.com/moby/sys/user,Apache-2.0,Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
+core,github.com/moby/sys/userns,Apache-2.0,Copyright (c) 2014-2018 The Docker & Go Authors. All rights reserved.
 core,github.com/modern-go/concurrent,Apache-2.0,Copyright (c) 2018 Tao Wen
 core,github.com/modern-go/reflect2,Apache-2.0,Copyright (c) 2018 Tao Wen
 core,github.com/mohae/deepcopy,MIT,Copyright (c) 2014 Joel
@@ -1896,6 +1896,11 @@ core,github.com/pjbgf/sha1cd/ubc,Apache-2.0,Copyright 2023 pjbgf
 core,github.com/pkg/browser,BSD-2-Clause,"Copyright (c) 2014, Dave Cheney <[email protected]>"
 core,github.com/pkg/errors,BSD-2-Clause,"Copyright (c) 2015, Dave Cheney <[email protected]>"
 core,github.com/planetscale/vtprotobuf/protohelpers,BSD-3-Clause,"Copyright (c) 2013, The GoGo Authors. All rights reserved | Copyright (c) 2018 The Go Authors. All rights reserved | Copyright (c) 2021, PlanetScale Inc. All rights reserved"
+core,github.com/planetscale/vtprotobuf/types/known/anypb,BSD-3-Clause,"Copyright (c) 2013, The GoGo Authors. All rights reserved | Copyright (c) 2018 The Go Authors. All rights reserved | Copyright (c) 2021, PlanetScale Inc. All rights reserved"
+core,github.com/planetscale/vtprotobuf/types/known/durationpb,BSD-3-Clause,"Copyright (c) 2013, The GoGo Authors. All rights reserved | Copyright (c) 2018 The Go Authors. All rights reserved | Copyright (c) 2021, PlanetScale Inc. All rights reserved"
+core,github.com/planetscale/vtprotobuf/types/known/emptypb,BSD-3-Clause,"Copyright (c) 2013, The GoGo Authors. All rights reserved | Copyright (c) 2018 The Go Authors. All rights reserved | Copyright (c) 2021, PlanetScale Inc. All rights reserved"
+core,github.com/planetscale/vtprotobuf/types/known/structpb,BSD-3-Clause,"Copyright (c) 2013, The GoGo Authors. All rights reserved | Copyright (c) 2018 The Go Authors. All rights reserved | Copyright (c) 2021, PlanetScale Inc. All rights reserved"
+core,github.com/planetscale/vtprotobuf/types/known/wrapperspb,BSD-3-Clause,"Copyright (c) 2013, The GoGo Authors. All rights reserved | Copyright (c) 2018 The Go Authors. All rights reserved | Copyright (c) 2021, PlanetScale Inc. All rights reserved"
 core,github.com/pmezard/go-difflib/difflib,BSD-3-Clause,"Copyright (c) 2013, Patrick Mezard"
 core,github.com/power-devops/perfstat,MIT,Copyright (c) 2020 Power DevOps
 core,github.com/prometheus-community/pro-bing,MIT,Copyright 2016 Cameron Sparr and contributors | Copyright 2022 The Prometheus Authors
@@ -2796,7 +2801,9 @@ core,google.golang.org/grpc/encoding/gzip,Apache-2.0,Copyright 2014 gRPC authors
 core,google.golang.org/grpc/encoding/proto,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/examples/helloworld/helloworld,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/examples/route_guide/routeguide,Apache-2.0,Copyright 2014 gRPC authors.
+core,google.golang.org/grpc/experimental/stats,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/grpclog,Apache-2.0,Copyright 2014 gRPC authors.
+core,google.golang.org/grpc/grpclog/internal,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/health/grpc_health_v1,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/backoff,Apache-2.0,Copyright 2014 gRPC authors.
@@ -2820,12 +2827,14 @@ core,google.golang.org/grpc/internal/resolver/dns/internal,Apache-2.0,Copyright
 core,google.golang.org/grpc/internal/resolver/passthrough,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/resolver/unix,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/serviceconfig,Apache-2.0,Copyright 2014 gRPC authors.
+core,google.golang.org/grpc/internal/stats,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/status,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/syscall,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/transport,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/transport/networktype,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/internal/xds,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/keepalive,Apache-2.0,Copyright 2014 gRPC authors.
+core,google.golang.org/grpc/mem,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/metadata,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/peer,Apache-2.0,Copyright 2014 gRPC authors.
 core,google.golang.org/grpc/resolver,Apache-2.0,Copyright 2014 gRPC authors.

cmd/agent/dist/conf.d/service_discovery.d/conf.yaml.default

@@ -0,0 +1,2 @@
+instances:
+  - {}

cmd/agent/subcommands/run/command.go

@@ -338,16 +338,8 @@ func getSharedFxOption() fx.Option {
 		)),
 		core.Bundle(),
 		lsof.Module(),
-		fx.Supply(dogstatsdServer.Params{
-			Serverless: false,
-		}),
-		forwarder.BundleWithProvider(func(config config.Component, log log.Component) defaultforwarder.Params {
-			params := defaultforwarder.NewParams(config, log)
-			// Enable core agent specific features like persistence-to-disk
-			params.Options.EnabledFeatures = defaultforwarder.SetFeature(params.Options.EnabledFeatures, defaultforwarder.CoreFeatures)
-			return params
-		}),
-
+		// Enable core agent specific features like persistence-to-disk
+		forwarder.Bundle(defaultforwarder.NewParams(defaultforwarder.WithFeatures(defaultforwarder.CoreFeatures))),
 		// workloadmeta setup
 		wmcatalog.GetCatalog(),
 		workloadmetafx.Module(defaults.DefaultParams()),
@@ -386,7 +378,7 @@ func getSharedFxOption() fx.Option {
 		compressionimpl.Module(),
 		demultiplexerimpl.Module(),
 		demultiplexerendpointfx.Module(),
-		dogstatsd.Bundle(),
+		dogstatsd.Bundle(dogstatsdServer.Params{Serverless: false}),
 		fx.Provide(func(logsagent optional.Option[logsAgent.Component]) optional.Option[logsagentpipeline.Component] {
 			if la, ok := logsagent.Get(); ok {
 				return optional.NewOption[logsagentpipeline.Component](la)

cmd/agent/subcommands/run/internal/settings/runtime_settings_test.go

@@ -41,11 +41,8 @@ func TestDogstatsdMetricsStats(t *testing.T) {
 	deps := fxutil.Test[testDeps](t, fx.Options(
 		core.MockBundle(),
 		fx.Supply(core.BundleParams{}),
-		fx.Supply(server.Params{
-			Serverless: false,
-		}),
 		demultiplexerimpl.MockModule(),
-		dogstatsd.Bundle(),
+		dogstatsd.Bundle(server.Params{Serverless: false}),
 		defaultforwarder.MockModule(),
 		workloadmetafxmock.MockModule(workloadmeta.NewParams()),
 	))

cmd/agent/subcommands/snmp/command.go

@@ -190,7 +190,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 					LogParams:    log.ForOneShot(command.LoggerName, "off", true)}),
 				core.Bundle(),
 				aggregator.Bundle(),
-				forwarder.BundleWithProvider(defaultforwarder.NewParams),
+				forwarder.Bundle(defaultforwarder.NewParams()),
 				eventplatformimpl.Module(eventplatformimpl.NewDefaultParams()),
 				eventplatformreceiverimpl.Module(),
 				orchestratorimpl.Module(),

cmd/cluster-agent-cloudfoundry/subcommands/run/command.go

@@ -83,7 +83,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 					LogParams:    log.ForDaemon(command.LoggerName, "log_file", path.DefaultDCALogFile),
 				}),
 				core.Bundle(),
-				forwarder.BundleWithProvider(defaultforwarder.NewParamsWithResolvers),
+				forwarder.Bundle(defaultforwarder.NewParams(defaultforwarder.WithResolvers())),
 				compressionimpl.Module(),
 				demultiplexerimpl.Module(),
 				orchestratorForwarderImpl.Module(),