@deliciousmonster/datadog-agent-binary 7.82.1-next.2 → 7.82.1-next.3

package/README.md

@@ -43,6 +43,7 @@ Configuration is the environment; `datadog.yaml` is rewritten on every start, so
 | `DD_ENV` | The `env` tag on everything sent. |
 | `DD_APM_RECEIVER_PORT` | Where `dd-trace` posts spans. Default 8126. |
 | `DD_EXPVAR_PORT`, `DD_APM_DEBUG_PORT` | The agents' expvar ports, 5000 and 5012. Verification reads them; `0` turns one off and verification refuses. |
+| `DD_LOGS_ENABLED` | `true` ships Harper's own log, `<rootPath>/log/hdb.log`, as service `harper`. Off by default. |
 
 `GET /DatadogStatus/`, under Harper's own auth, reports which supervision is in charge, whether the API key is set, whether each agent verified and why not, and how far a span got: `delivery.verdict` is `delivering`, `rejected`, `traces-unconfirmed` or `idle`. Its counters are the trace-agent's own one-minute window, so read it twice.
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@deliciousmonster/datadog-agent-binary",
-	"version": "7.82.1-next.2",
+	"version": "7.82.1-next.3",
 	"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": {
@@ -27,7 +27,7 @@
 		"test:windows": "npm run build && node scripts/windows-gate.mjs",
 		"test:live": "npm run build && node --test \"test/live/**/*.test.js\"",
 		"// test:binaries": "requires real binaries already built at build/<platform>/bin, from a prior `npm run build-agent` or a CI step that already built them; this script itself only runs `npm run build` (tsc), same as test:live for the same real-binaries dependency; excluded from `test` for that reason",
-		"test:binaries": "npm run build && node --test \"test/binaries/**/*.test.js\""
+		"test:binaries": "npm run build && node --test --test-concurrency=1 --test-timeout=120000 \"test/binaries/**/*.test.js\""
 	},
 	"keywords": [
 		"datadog",
@@ -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.2",
-		"@deliciousmonster/datadog-agent-binary-linux-arm64": "7.82.1-next.2",
-		"@deliciousmonster/datadog-agent-binary-macos-arm64": "7.82.1-next.2",
-		"@deliciousmonster/datadog-agent-binary-windows-x86_64": "7.82.1-next.2"
+		"@deliciousmonster/datadog-agent-binary-linux-x86_64": "7.82.1-next.3",
+		"@deliciousmonster/datadog-agent-binary-linux-arm64": "7.82.1-next.3",
+		"@deliciousmonster/datadog-agent-binary-macos-arm64": "7.82.1-next.3",
+		"@deliciousmonster/datadog-agent-binary-windows-x86_64": "7.82.1-next.3"
 	},
 	"lint-staged": {
 		"*.{ts,js,json}": [

package/runtime/config.js

@@ -92,6 +92,22 @@ function renderDatadogYaml(paths, ports) {
 	].join("\n");
 }
 
+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) {
+	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",
+		"",
+	].join("\n");
+}
+
 /** The shipped core checks that apply here; an optional `platforms` file beside a check gates it, absent means everywhere. */
 function collectCoreChecks(packageConfd) {
 	const checks = [];
@@ -162,7 +178,15 @@ export function prepareRuntime(componentDir, { ports, log }) {
 			configFiles[join(paths.confd, check.dir, "conf.yaml.default")] =
 				check.body;
 		}
-		removeStaleDefaults(paths.confd, new Set(checks.map((check) => check.dir)));
+		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.
+		if (root) {
+			configFiles[join(paths.confd, HARPER_LOG_CHECK, "conf.yaml.default")] =
+				renderHarperLogSource(join(root, "log", "hdb.log"));
+			owned.add(HARPER_LOG_CHECK);
+		}
+		removeStaleDefaults(paths.confd, owned);
 	} catch (error) {
 		log.warn(
 			`Datadog supervisor: no core check configuration was collected (${error.message}), so the agent ` +