Clean up runtime-created directories in the package scripts

Author: nathan-b

comp/api/api/apiimpl/listener/listener_nix_test.go

@@ -23,8 +23,7 @@ func TestLinuxGetIPCServerPath(t *testing.T) {
 
 		path, enabled := GetIPCServerPath()
 		require.True(t, enabled)
-		// Default run path is {InstallPath}/run for container compatibility
-		// (containers mount volumes at /opt/datadog-agent/run, not /var/run/datadog)
+		// Default run path is {InstallPath}/run for consistency with other runtime files
 		require.Equal(t, "/opt/datadog-agent/run/agent_ipc.socket", path)
 	})
 }

omnibus/package-scripts/agent-deb/postrm

@@ -21,6 +21,10 @@ case "$1" in
         rm -rf $LOG_DIR
         rm -rf $CONFIG_DIR
     ;;
+    remove)
+        # Clean up runtime-created directories (sockets, pid files, etc.)
+        rm -rf "$INSTALL_DIR/run" || true
+    ;;
     *)
     ;;
 esac

omnibus/package-scripts/dogstatsd-deb/postrm

@@ -24,6 +24,10 @@ case "$1" in
         rm -rf $LOG_DIR
         rm -rf $CONFIG_DIR
     ;;
+    remove)
+        # Clean up runtime-created directories (sockets, pid files, etc.)
+        rm -rf "$INSTALL_DIR/run" || true
+    ;;
     *)
     ;;
 esac

omnibus/package-scripts/dogstatsd-rpm/postrm

@@ -7,10 +7,14 @@
 # Remove the symlink to the binary.
 rm -f "/usr/bin/datadog-dogstatsd"
 
+INSTALL_DIR=/opt/datadog-dogstatsd
+
 case "$*" in
     0)
         # We're uninstalling.
         # We don't delete the dd-agent user/group (see https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Allocation_Strategies)
+        # Clean up runtime-created directories (sockets, pid files, etc.)
+        rm -rf "$INSTALL_DIR/run" || true
     ;;
     1)
         # We're upgrading.

omnibus/package-scripts/iot-agent-deb/postrm

@@ -26,6 +26,8 @@ case "$1" in
     ;;
     remove)
         rm "$CONFIG_DIR/install_info" || true
+        # Clean up runtime-created directories (sockets, pid files, etc.)
+        rm -rf "$INSTALL_DIR/run" || true
     ;;
     *)
     ;;

omnibus/package-scripts/iot-agent-rpm/postrm

@@ -9,11 +9,15 @@ CONFIG_DIR=/etc/datadog-agent
 # Remove the symlink to the binary.
 rm -f "/usr/bin/datadog-agent"
 
+INSTALL_DIR=/opt/datadog-agent
+
 case "$*" in
     0)
         # We're uninstalling.
         # We don't delete the dd-agent user/group (see https://fedoraproject.org/wiki/Packaging:UsersAndGroups#Allocation_Strategies)
         rm "$CONFIG_DIR/install_info" || true
+        # Clean up runtime-created directories (sockets, pid files, etc.)
+        rm -rf "$INSTALL_DIR/run" || true
     ;;
     1)
         # We're upgrading.

pkg/util/defaultpaths/go.mod

@@ -14,6 +14,8 @@ require (
 	github.com/DataDog/datadog-agent/pkg/template v0.64.1 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.64.1 // indirect
 	github.com/DataDog/datadog-agent/pkg/version v0.62.3 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

pkg/util/defaultpaths/path_nix.go

@@ -43,9 +43,7 @@ const (
 	checkFlareDirectory = "/var/log/datadog/checks/"
 	jmxFlareDirectory   = "/var/log/datadog/jmxinfo/"
 
-	// Socket paths - these constants are used for config registration defaults.
-	// The actual runtime paths derive from GetRunPath() which uses {InstallPath}/run.
-	// Containers mount volumes at /opt/datadog-agent/run, not /var/run/datadog.
+	// Socket paths - use {InstallPath}/run for consistency with other runtime files
 	defaultStatsdSocket   = "/opt/datadog-agent/run/dsd.socket"
 	defaultReceiverSocket = "/opt/datadog-agent/run/apm.socket"