@deliciousmonster/datadog-agent-binary 7.82.1-next.4 → 7.82.1-next.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@deliciousmonster/datadog-agent-binary",
-	"version": "7.82.1-next.4",
+	"version": "7.82.1-next.6",
 	"description": "Harper component that runs the Datadog trace-agent and core-agent alongside a node, with pre-built binaries installed per platform",
 	"type": "module",
 	"scripts": {
@@ -68,10 +68,10 @@
 	},
 	"homepage": "https://github.com/deliciousmonster/datadog-agent-binary#readme",
 	"optionalDependencies": {
-		"@deliciousmonster/datadog-agent-binary-linux-x86_64": "7.82.1-next.4",
-		"@deliciousmonster/datadog-agent-binary-linux-arm64": "7.82.1-next.4",
-		"@deliciousmonster/datadog-agent-binary-macos-arm64": "7.82.1-next.4",
-		"@deliciousmonster/datadog-agent-binary-windows-x86_64": "7.82.1-next.4"
+		"@deliciousmonster/datadog-agent-binary-linux-x86_64": "7.82.1-next.6",
+		"@deliciousmonster/datadog-agent-binary-linux-arm64": "7.82.1-next.6",
+		"@deliciousmonster/datadog-agent-binary-macos-arm64": "7.82.1-next.6",
+		"@deliciousmonster/datadog-agent-binary-windows-x86_64": "7.82.1-next.6"
 	},
 	"lint-staged": {
 		"*.{ts,js,json}": [

package/runtime/config.js

@@ -78,6 +78,12 @@ function renderDatadogYaml(paths, ports) {
 		"# Pinned because the core-agent verify reads expvar off this port. Measured on 7.82.1: the environment",
 		"# outranks this file, so a set DD_EXPVAR_PORT wins and this only pins the port against a default that moves.",
 		`expvar_port: ${ports.expvar}`,
+		"# Live Processes: every process on the node with its CPU, memory and command line, Harper and the agents",
+		"# included. Go, so it runs in this Python-free build; DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED=false",
+		"# turns it off, since the environment outranks this file.",
+		"process_config:",
+		"  process_collection:",
+		"    enabled: true",
 		"apm_config:",
 		"  enabled: true",
 		`  receiver_port: ${ports.receiver}`,
@@ -94,16 +100,27 @@ function renderDatadogYaml(paths, ports) {
 
 const HARPER_LOG_CHECK = "harper.d";
 
-/** A logs source for Harper's own log file: `logging.root` is `log` under the root path unless a node moved it. */
-function renderHarperLogSource(logFile) {
+/**
+ * Log sources for what runs on this node: every log Harper writes under its log directory (`logging.root`
+ * is `log` under the root path unless a node moved it; the HTTP request log `http.logging` enables lands
+ * there too, under its own name), and the two agents' and the reaper's, which are the first thing an
+ * operator wants when the node stops reporting. Tailed only while logs are enabled (DD_LOGS_ENABLED=true).
+ */
+function renderLogSources(harperLog, paths) {
+	const source = (path, service, source) => [
+		"  - type: file",
+		`    path: ${yamlString(path)}`,
+		`    service: ${service}`,
+		`    source: ${source}`,
+	];
 	return [
 		"# GENERATED by resources.js on every Harper worker start. Edits are overwritten.",
 		"# Tailed only while logs are enabled (DD_LOGS_ENABLED=true).",
 		"logs:",
-		"  - type: file",
-		`    path: ${yamlString(logFile)}`,
-		"    service: harper",
-		"    source: harper",
+		...source(join(dirname(harperLog), "*.log"), "harper", "harper"),
+		...source(paths.coreLog, "datadog-agent", "datadog-agent"),
+		...source(paths.traceLog, "datadog-trace-agent", "datadog-agent"),
+		...source(paths.reaperLog, "datadog-agent-reaper", "harper-process-guard"),
 		"",
 	].join("\n");
 }
@@ -179,11 +196,12 @@ export function prepareRuntime(componentDir, { ports, log }) {
 				check.body;
 		}
 		const owned = new Set(checks.map((check) => check.dir));
-		// Harper's own log as a log source, written whenever the root is known. The agent tails it only
-		// when logs are on, which is DD_LOGS_ENABLED=true in the environment; off, this file costs nothing.
+		// Harper's own log and the agents' as log sources, written whenever the root is known. The agent
+		// tails them only when logs are on, which is DD_LOGS_ENABLED=true in the environment; off, this
+		// file costs nothing.
 		if (root) {
 			configFiles[join(paths.confd, HARPER_LOG_CHECK, "conf.yaml.default")] =
-				renderHarperLogSource(join(root, "log", "hdb.log"));
+				renderLogSources(join(root, "log", "hdb.log"), paths);
 			owned.add(HARPER_LOG_CHECK);
 		}
 		removeStaleDefaults(paths.confd, owned);