chore: bump datadog dependency and fix the update script

Signed-off-by: Andrea Terzolo <[email protected]>

Author: Andreagit97

go.mod

@@ -539,4 +539,4 @@ require (
 
 replace github.com/moby/buildkit v0.11.0 => github.com/moby/buildkit v0.12.5
 
-replace github.com/DataDog/datadog-agent => github.com/StackVista/datadog-agent-upstream-for-process-agent v0.0.0-20250319151048-be348c0f6c9a
+replace github.com/DataDog/datadog-agent => github.com/StackVista/datadog-agent-upstream-for-process-agent v0.0.0-20250320133125-5b2b83ced2c0

go.sum

@@ -325,8 +325,8 @@ github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQA
 github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
 github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
-github.com/StackVista/datadog-agent-upstream-for-process-agent v0.0.0-20250319151048-be348c0f6c9a h1:sWDzxVoXVKMYmWOAUx00E9igSsRWcVKNE7uDtNXWg90=
-github.com/StackVista/datadog-agent-upstream-for-process-agent v0.0.0-20250319151048-be348c0f6c9a/go.mod h1:ouLSAUPgAZplxpo8ylN9sx9cXUjdsFnO3IT3QDq+ag0=
+github.com/StackVista/datadog-agent-upstream-for-process-agent v0.0.0-20250320133125-5b2b83ced2c0 h1:NKP6Dg3DGXY/zZUgQwKYqqceuwus12Rs6mwvxe9jTHg=
+github.com/StackVista/datadog-agent-upstream-for-process-agent v0.0.0-20250320133125-5b2b83ced2c0/go.mod h1:ouLSAUPgAZplxpo8ylN9sx9cXUjdsFnO3IT3QDq+ag0=
 github.com/StackVista/netlink v0.0.0-20231207101142-91d41874606b h1:9UZEx5+IBk26JfiMnUrNwE7J5bcC5zYtWwI4O8Q540I=
 github.com/StackVista/netlink v0.0.0-20231207101142-91d41874606b/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
 github.com/StackVista/sketches-go v1.2.0-pre h1:04QAbYurRVq5LY6VK0KbFPUi4YhJcpEi5AansGdLdMw=

update-datadog-dependency.sh

@@ -37,7 +37,8 @@ while [ $# -gt 0 ]; do
 
       # Branch names that contains a slash are not valid in go.mod, so we need to use the commit hash
       # See: https://github.com/golang/go/issues/32955
-      COMMIT=$(git ls-remote https://github.com/StackVista/datadog-agent-upstream-for-process-agent.git "${BRANCH}" | awk '{print $1}')
+      # We need the `tail -n 1` because in case of merge commits we could have 2 commit hashes in the output, just take the last one.
+      COMMIT=$(git ls-remote https://github.com/StackVista/datadog-agent-upstream-for-process-agent.git "${BRANCH}" | tail -n 1 | awk '{print $1}')
       if [ -z "${COMMIT}" ]; then
         echo "Error: commit not found for ${BRANCH}"
         exit 1