@camstack/system 1.2.18 → 1.2.19

package/dist/builtins/loki-logging/index.js

@@ -50,6 +50,12 @@ function formatLokiLine(entry) {
 * Group a batch into one stream per distinct label set, and sort each stream's
 * values by timestamp.
 *
+* The `node` label is resolved PER ENTRY from `tags.agentId` (the emitting
+* agent, falling back to `labels.node` when absent), so a batch that mixes
+* hub-local lines with forwarded agent lines fans out into one stream per
+* origin node — the whole point of shipping the cluster's logs through the hub
+* without flattening every line onto `node="hub"`.
+*
 * The sort is not cosmetic. Loki historically rejected a stream whose entries
 * were not in ascending time order, and even with out-of-order ingestion enabled
 * it is bounded by a window. Entries reach a destination from several concurrent
@@ -58,21 +64,26 @@ function formatLokiLine(entry) {
 */
 function buildPushBody(entries, labels) {
 	if (entries.length === 0) return null;
-	const base = {
-		job: labels.job,
-		node: labels.node
-	};
+	const base = { job: labels.job };
 	for (const [key, value] of Object.entries(labels.extra ?? {})) base[key] = value;
-	const byLevel = /* @__PURE__ */ new Map();
+	const byStream = /* @__PURE__ */ new Map();
 	for (const entry of entries) {
-		const values = byLevel.get(entry.level) ?? [];
-		values.push([toUnixNano(entry.timestamp), formatLokiLine(entry)]);
-		byLevel.set(entry.level, values);
+		const agentId = entry.tags?.agentId;
+		const node = typeof agentId === "string" && agentId.length > 0 ? agentId : labels.node;
+		const key = `${node}\u0000${entry.level}`;
+		const bucket = byStream.get(key) ?? {
+			node,
+			level: entry.level,
+			values: []
+		};
+		bucket.values.push([toUnixNano(entry.timestamp), formatLokiLine(entry)]);
+		byStream.set(key, bucket);
 	}
 	const streams = [];
-	for (const [level, values] of byLevel) streams.push({
+	for (const { node, level, values } of byStream.values()) streams.push({
 		stream: {
 			...base,
+			node,
 			level
 		},
 		values: values.toSorted((a, b) => a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0)

package/dist/builtins/loki-logging/index.mjs

@@ -45,6 +45,12 @@ function formatLokiLine(entry) {
 * Group a batch into one stream per distinct label set, and sort each stream's
 * values by timestamp.
 *
+* The `node` label is resolved PER ENTRY from `tags.agentId` (the emitting
+* agent, falling back to `labels.node` when absent), so a batch that mixes
+* hub-local lines with forwarded agent lines fans out into one stream per
+* origin node — the whole point of shipping the cluster's logs through the hub
+* without flattening every line onto `node="hub"`.
+*
 * The sort is not cosmetic. Loki historically rejected a stream whose entries
 * were not in ascending time order, and even with out-of-order ingestion enabled
 * it is bounded by a window. Entries reach a destination from several concurrent
@@ -53,21 +59,26 @@ function formatLokiLine(entry) {
 */
 function buildPushBody(entries, labels) {
 	if (entries.length === 0) return null;
-	const base = {
-		job: labels.job,
-		node: labels.node
-	};
+	const base = { job: labels.job };
 	for (const [key, value] of Object.entries(labels.extra ?? {})) base[key] = value;
-	const byLevel = /* @__PURE__ */ new Map();
+	const byStream = /* @__PURE__ */ new Map();
 	for (const entry of entries) {
-		const values = byLevel.get(entry.level) ?? [];
-		values.push([toUnixNano(entry.timestamp), formatLokiLine(entry)]);
-		byLevel.set(entry.level, values);
+		const agentId = entry.tags?.agentId;
+		const node = typeof agentId === "string" && agentId.length > 0 ? agentId : labels.node;
+		const key = `${node}\u0000${entry.level}`;
+		const bucket = byStream.get(key) ?? {
+			node,
+			level: entry.level,
+			values: []
+		};
+		bucket.values.push([toUnixNano(entry.timestamp), formatLokiLine(entry)]);
+		byStream.set(key, bucket);
 	}
 	const streams = [];
-	for (const [level, values] of byLevel) streams.push({
+	for (const { node, level, values } of byStream.values()) streams.push({
 		stream: {
 			...base,
+			node,
 			level
 		},
 		values: values.toSorted((a, b) => a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0)

package/dist/builtins/loki-logging/loki-payload.d.ts

@@ -11,7 +11,12 @@ export interface LokiPushBody {
 export interface LokiLabelInput {
     /** Fixed `job` label. Bounded by configuration, never per-entry. */
     readonly job: string;
-    /** This node's id. Bounded by cluster size. */
+    /**
+     * Fallback node id for entries that carry no `tags.agentId` origin — the
+     * id of the node running this destination. The per-entry origin
+     * (`tags.agentId`) is preferred so forwarded agent logs are attributed to
+     * their source node rather than the hub that ships them.
+     */
     readonly node: string;
     /** Extra static labels from configuration. Values must be low-cardinality. */
     readonly extra?: Readonly<Record<string, string>>;
@@ -37,6 +42,12 @@ export declare function formatLokiLine(entry: LogEntry): string;
  * Group a batch into one stream per distinct label set, and sort each stream's
  * values by timestamp.
  *
+ * The `node` label is resolved PER ENTRY from `tags.agentId` (the emitting
+ * agent, falling back to `labels.node` when absent), so a batch that mixes
+ * hub-local lines with forwarded agent lines fans out into one stream per
+ * origin node — the whole point of shipping the cluster's logs through the hub
+ * without flattening every line onto `node="hub"`.
+ *
  * The sort is not cosmetic. Loki historically rejected a stream whose entries
  * were not in ascending time order, and even with out-of-order ingestion enabled
  * it is bounded by a window. Entries reach a destination from several concurrent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/system",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "description": "Core addon for CamStack — builtins, pipeline, process management, auth, logging, events",
   "keywords": [
     "camstack",