github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

refactor(FluentLogsIngestService): improve code readability by formatting function arguments and object properties

Browse Source
This commit is contained in:
Nawaz Dhandala
2026-02-09 13:14:39 +00:00
parent 6b8dd9e8b5
commit a7c38dcbf2
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Telemetry/Services/FluentLogsIngestService.ts
View File

@@ -156,8 +156,9 @@ export default class FluentLogsIngestService extends OtelIngestBaseService {
): Promise<void> {
try {
const projectId: ObjectID = (req as TelemetryRequest).projectId;
const entries: Array<JSONObject> =
this.extractEntriesFromRequest(req.body);
const entries: Array<JSONObject> = this.extractEntriesFromRequest(
req.body,
);
if (entries.length === 0) {
logger.warn("Fluent logs ingest: no entries to process.");
@@ -213,9 +214,7 @@ export default class FluentLogsIngestService extends OtelIngestBaseService {
AttributeType | Array<AttributeType>
> = this.buildFluentAttributes(entry);
const attributes: Dictionary<
AttributeType | Array<AttributeType>
> = {
const attributes: Dictionary<AttributeType | Array<AttributeType>> = {
...baseAttributes,
...entryAttributes,
};
@@ -276,9 +275,7 @@ export default class FluentLogsIngestService extends OtelIngestBaseService {
}
}
private static extractEntriesFromRequest(
body: unknown,
): Array<JSONObject> {
private static extractEntriesFromRequest(body: unknown): Array<JSONObject> {
if (!body || typeof body !== "object") {
return [];
}
@@ -307,11 +304,9 @@ export default class FluentLogsIngestService extends OtelIngestBaseService {
return { message: String(item) } as JSONObject;
})
.filter(
(item: JSONObject | undefined): item is JSONObject => {
return item !== undefined;
},
);
.filter((item: JSONObject | undefined): item is JSONObject => {
return item !== undefined;
});
}
return this.normalizeLogEntries(entries);

36
Telemetry/Tests/Services/FluentLogsIngestService.test.ts
View File

@@ -18,9 +18,9 @@ describe("FluentLogsIngestService", () => {
},
};
const entries: Array<JSONObject> = service[
"normalizeLogEntries"
](payload) as Array<JSONObject>;
const entries: Array<JSONObject> = service["normalizeLogEntries"](
payload,
) as Array<JSONObject>;
expect(entries).toHaveLength(1);
expect(entries[0]).toEqual(payload);
@@ -32,9 +32,9 @@ describe("FluentLogsIngestService", () => {
{ message: "log 2", stream: "stderr" },
];
const entries: Array<JSONObject> = service[
"normalizeLogEntries"
](payload) as Array<JSONObject>;
const entries: Array<JSONObject> = service["normalizeLogEntries"](
payload,
) as Array<JSONObject>;
expect(entries).toHaveLength(2);
expect(entries[0]!["message"]).toBe("log 1");
@@ -51,9 +51,9 @@ describe("FluentLogsIngestService", () => {
},
};
const entries: Array<JSONObject> = service[
"normalizeLogEntries"
](payload) as Array<JSONObject>;
const entries: Array<JSONObject> = service["normalizeLogEntries"](
payload,
) as Array<JSONObject>;
expect(entries).toHaveLength(1);
expect(entries[0]!["message"]).toBe("inner log");
@@ -70,9 +70,9 @@ describe("FluentLogsIngestService", () => {
],
};
const entries: Array<JSONObject> = service[
"normalizeLogEntries"
](payload) as Array<JSONObject>;
const entries: Array<JSONObject> = service["normalizeLogEntries"](
payload,
) as Array<JSONObject>;
expect(entries).toHaveLength(2);
expect(entries[0]!["host"]).toBe("node-1");
@@ -481,9 +481,9 @@ describe("FluentLogsIngestService", () => {
"a1b2c3d4-e5f6-7890-abcd-ef1234567890",
);
expect(attrs["fluentd.kubernetes.labels.app"]).toBe("api-server");
expect(
attrs["fluentd.kubernetes.labels.app.kubernetes.io/version"],
).toBe("2.1.0");
expect(attrs["fluentd.kubernetes.labels.app.kubernetes.io/version"]).toBe(
"2.1.0",
);
expect(attrs["fluentd.kubernetes.labels.team"]).toBe("platform");
expect(attrs["fluentd.kubernetes.host"]).toBe("node-pool-1-abc");
});
@@ -506,9 +506,9 @@ describe("FluentLogsIngestService", () => {
) as Array<JSONObject>;
expect(entries).toHaveLength(1);
expect(entries[0]!["log"]).toBe("Application started successfully");
expect(
(entries[0]!["kubernetes"] as JSONObject)["namespace_name"],
).toBe("staging");
expect((entries[0]!["kubernetes"] as JSONObject)["namespace_name"]).toBe(
"staging",
);
});
test("handles batch of Fluentd log entries", () => {