From 4daa586489638c5f6df38499f0f6fa69cb182967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo.beauzee@datadoghq.com>
Date: Fri, 6 Dec 2024 15:16:42 +0100
Subject: [PATCH] omnibus: reorder depencencies (#31802)

---
 omnibus/config/projects/agent.rb              | 29 ++++----------
 omnibus/config/software/agent-dependencies.rb | 22 -----------
 .../software/datadog-agent-dependencies.rb    | 38 ++++++++++++++++++-
 omnibus/config/software/datadog-agent.rb      |  1 -
 omnibus/config/software/snmp-traps.rb         |  1 -
 5 files changed, 45 insertions(+), 46 deletions(-)
 delete mode 100644 omnibus/config/software/agent-dependencies.rb

diff --git a/omnibus/config/projects/agent.rb b/omnibus/config/projects/agent.rb
index 62a6afb6deaf7..b3ab9c10ae1ad 100644
--- a/omnibus/config/projects/agent.rb
+++ b/omnibus/config/projects/agent.rb
@@ -221,9 +221,17 @@
 # ------------------------------------
 
 if do_build
+  # Include traps db file in snmp.d/traps_db/
+  dependency 'snmp-traps'
+
   # Datadog agent
   dependency 'datadog-agent'
 
+  # This depends on the agent and must be added after it
+  if ENV['WINDOWS_DDPROCMON_DRIVER'] and not ENV['WINDOWS_DDPROCMON_DRIVER'].empty?
+    dependency 'datadog-security-agent-policies'
+  end
+
   # System-probe
   if sysprobe_enabled?
     dependency 'system-probe'
@@ -237,27 +245,6 @@
 
   if linux_target?
     dependency 'datadog-security-agent-policies'
-    if fips_mode?
-      dependency 'openssl-fips-provider'
-    end
-  end
-
-  # Include traps db file in snmp.d/traps_db/
-  dependency 'snmp-traps'
-
-  # Additional software
-  if windows_target?
-    if ENV['WINDOWS_DDNPM_DRIVER'] and not ENV['WINDOWS_DDNPM_DRIVER'].empty?
-      dependency 'datadog-windows-filter-driver'
-    end
-    if ENV['WINDOWS_APMINJECT_MODULE'] and not ENV['WINDOWS_APMINJECT_MODULE'].empty?
-      dependency 'datadog-windows-apminject'
-    end
-    if ENV['WINDOWS_DDPROCMON_DRIVER'] and not ENV['WINDOWS_DDPROCMON_DRIVER'].empty?
-      dependency 'datadog-windows-procmon-driver'
-      ## this is a duplicate of the above dependency in linux
-      dependency 'datadog-security-agent-policies'
-    end
   end
 
   # this dependency puts few files out of the omnibus install dir and move them
diff --git a/omnibus/config/software/agent-dependencies.rb b/omnibus/config/software/agent-dependencies.rb
deleted file mode 100644
index 125fd7a9525f0..0000000000000
--- a/omnibus/config/software/agent-dependencies.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-name 'agent-dependencies'
-
-# Linux-specific dependencies
-if linux_target?
-  dependency 'procps-ng'
-  dependency 'curl'
-end
-
-# Bundled cacerts file (is this a good idea?)
-dependency 'cacerts'
-
-# External agents
-dependency 'jmxfetch'
-
-if linux_target?
-  dependency 'sds'
-end
-
-# version manifest file
-dependency 'version-manifest'
-
-
diff --git a/omnibus/config/software/datadog-agent-dependencies.rb b/omnibus/config/software/datadog-agent-dependencies.rb
index 3cac114d0578e..fd6712983b10b 100644
--- a/omnibus/config/software/datadog-agent-dependencies.rb
+++ b/omnibus/config/software/datadog-agent-dependencies.rb
@@ -2,6 +2,28 @@
 
 description "Enforce building dependencies as soon as possible so they can be cached"
 
+# Linux-specific dependencies
+if linux_target?
+  dependency 'procps-ng'
+  dependency 'curl'
+  if fips_mode?
+    dependency 'openssl-fips-provider'
+  end
+end
+
+# Bundled cacerts file (is this a good idea?)
+dependency 'cacerts'
+
+# External agents
+dependency 'jmxfetch'
+
+if linux_target?
+  dependency 'sds'
+end
+
+# version manifest file
+dependency 'version-manifest'
+
 # Used for memory profiling with the `status py` agent subcommand
 dependency 'pympler'
 
@@ -9,4 +31,18 @@
 
 dependency "systemd" if linux_target?
 
-dependency 'libpcap' if linux_target? and !heroku_target? # system-probe dependency
\ No newline at end of file
+dependency 'libpcap' if linux_target? and !heroku_target? # system-probe dependency
+
+# Additional software
+if windows_target?
+  if ENV['WINDOWS_DDNPM_DRIVER'] and not ENV['WINDOWS_DDNPM_DRIVER'].empty?
+    dependency 'datadog-windows-filter-driver'
+  end
+  if ENV['WINDOWS_APMINJECT_MODULE'] and not ENV['WINDOWS_APMINJECT_MODULE'].empty?
+    dependency 'datadog-windows-apminject'
+  end
+  if ENV['WINDOWS_DDPROCMON_DRIVER'] and not ENV['WINDOWS_DDPROCMON_DRIVER'].empty?
+    dependency 'datadog-windows-procmon-driver'
+  end
+end
+
diff --git a/omnibus/config/software/datadog-agent.rb b/omnibus/config/software/datadog-agent.rb
index ecfe7cb0d4c7c..8f24178d2c07e 100644
--- a/omnibus/config/software/datadog-agent.rb
+++ b/omnibus/config/software/datadog-agent.rb
@@ -20,7 +20,6 @@
 # especially at higher thread counts.
 dependency "libjemalloc" if linux_target?
 
-dependency 'agent-dependencies'
 dependency 'datadog-agent-dependencies'
 
 source path: '..'
diff --git a/omnibus/config/software/snmp-traps.rb b/omnibus/config/software/snmp-traps.rb
index 1dc01d61b1680..5a021b01ed8d4 100644
--- a/omnibus/config/software/snmp-traps.rb
+++ b/omnibus/config/software/snmp-traps.rb
@@ -3,7 +3,6 @@
 
 # Needs the configuration folder as created in datadog-agent
 dependency 'datadog-agent'
-always_build true  # For cache related purposes, it comes after datadog-agent
 
 source :url => "https://s3.amazonaws.com/dd-agent-omnibus/snmp_traps_db/dd_traps_db-#{version}.json.gz",
        :sha256 => "04fb9d43754c2656edf35f08fbad11ba8dc20d52654962933f3dd8f4d463b42c",