From 73bb91a546915d17bb7be6d3052c660731a83a31 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 20 Jun 2025 16:30:51 -0600
Subject: [PATCH] datadog-agent: 7.56.2 -> 7.70.2

https://github.com/DataDog/datadog-agent/releases/tag/7.70.2
Diff: https://github.com/DataDog/datadog-agent/compare/7.56.2...7.70.2
---
 .../networking/dd-agent/datadog-agent.nix     | 22 +++++++++----------
 .../networking/dd-agent/integrations-core.nix | 16 +++++---------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index 9f4da6aa77d6..edd4ed74468f 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -18,17 +18,17 @@
 
 let
   # keep this in sync with github.com/DataDog/agent-payload dependency
-  payloadVersion = "5.0.124";
+  payloadVersion = "5.0.164";
   python = pythonPackages.python;
   owner = "DataDog";
   repo = "datadog-agent";
   goPackagePath = "github.com/${owner}/${repo}";
-  version = "7.56.2";
+  version = "7.70.2";
 
   src = fetchFromGitHub {
     inherit owner repo;
-    rev = version;
-    hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ=";
+    tag = version;
+    hash = "sha256-yXtybHWrm+6kWW396FLlRZI0YVuThGuLfSYzoNXAEBU=";
   };
   rtloader = stdenv.mkDerivation {
     pname = "datadog-agent-rtloader";
@@ -49,11 +49,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  vendorHash =
-    if stdenv.hostPlatform.isDarwin then
-      "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc="
-    else
-      "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw=";
+  vendorHash = "sha256-iWOwhfSI7mLmDy6yewV0h9Y4pjYAV6Tz6TxsINOxYMg=";
 
   subPackages = [
     "cmd/agent"
@@ -67,10 +63,14 @@ buildGoModule rec {
     makeWrapper
   ];
   buildInputs = [ rtloader ] ++ lib.optionals withSystemd [ systemd ];
-  PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
+
+  proxyVendor = true;
+
+  env.PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
 
   tags = [
     "ec2"
+    "kubelet"
     "python"
     "process"
     "log"
@@ -97,7 +97,7 @@ buildGoModule rec {
   postPatch = ''
     sed -e "s|PyChecksPath =.*|PyChecksPath = filepath.Join(_here, \"..\", \"${python.sitePackages}\")|" \
         -e "s|distPath =.*|distPath = filepath.Join(_here, \"..\", \"share\", \"datadog-agent\")|" \
-        -i cmd/agent/common/path/path_nix.go
+        -i pkg/util/defaultpaths/path_nix.go
     sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \
         -i pkg/util/hostname/fqdn_nix.go
   '';
diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index 263b5f51d277..5cd012ad4434 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -42,14 +42,14 @@
 
 let
   inherit (lib) attrValues mapAttrs;
+  version = "7.70.2";
 
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "integrations-core";
-    rev = version;
-    sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk=";
+    tag = version;
+    hash = "sha256-3H8nQpy/m53ZjtDfe6s89yowBXnPt+1ARfWxcx+JwQM=";
   };
-  version = "7.56.2";
 
   # Build helper to build a single datadog integration package.
   buildIntegration =
@@ -75,19 +75,13 @@ let
     pname = "checks-base";
     sourceRoot = "datadog_checks_base";
 
-    # Make setuptools build the 'base' and 'checks' modules.
-    postPatch = ''
-      substituteInPlace setup.py \
-        --replace "from setuptools import setup" "from setuptools import find_packages, setup" \
-        --replace "packages=['datadog_checks']" "packages=find_packages()"
-    '';
-
-    propagatedBuildInputs = with python3Packages; [
+    dependencies = with python3Packages; [
       binary
       cachetools
       cryptography
       immutables
       jellyfish
+      lazy-loader
       prometheus-client
       protobuf
       pydantic