diff --git a/Telemetry/Services/FluentLogsIngestService.ts b/Telemetry/Services/FluentLogsIngestService.ts index 6457d4fc12..6e20aaeca9 100644 --- a/Telemetry/Services/FluentLogsIngestService.ts +++ b/Telemetry/Services/FluentLogsIngestService.ts @@ -156,8 +156,9 @@ export default class FluentLogsIngestService extends OtelIngestBaseService { ): Promise { try { const projectId: ObjectID = (req as TelemetryRequest).projectId; - const entries: Array = - this.extractEntriesFromRequest(req.body); + const entries: Array = 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 > = this.buildFluentAttributes(entry); - const attributes: Dictionary< - AttributeType | Array - > = { + const attributes: Dictionary> = { ...baseAttributes, ...entryAttributes, }; @@ -276,9 +275,7 @@ export default class FluentLogsIngestService extends OtelIngestBaseService { } } - private static extractEntriesFromRequest( - body: unknown, - ): Array { + private static extractEntriesFromRequest(body: unknown): Array { 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); diff --git a/Telemetry/Tests/Services/FluentLogsIngestService.test.ts b/Telemetry/Tests/Services/FluentLogsIngestService.test.ts index 48fb80666c..a764d527ba 100644 --- a/Telemetry/Tests/Services/FluentLogsIngestService.test.ts +++ b/Telemetry/Tests/Services/FluentLogsIngestService.test.ts @@ -18,9 +18,9 @@ describe("FluentLogsIngestService", () => { }, }; - const entries: Array = service[ - "normalizeLogEntries" - ](payload) as Array; + const entries: Array = service["normalizeLogEntries"]( + payload, + ) as Array; expect(entries).toHaveLength(1); expect(entries[0]).toEqual(payload); @@ -32,9 +32,9 @@ describe("FluentLogsIngestService", () => { { message: "log 2", stream: "stderr" }, ]; - const entries: Array = service[ - "normalizeLogEntries" - ](payload) as Array; + const entries: Array = service["normalizeLogEntries"]( + payload, + ) as Array; expect(entries).toHaveLength(2); expect(entries[0]!["message"]).toBe("log 1"); @@ -51,9 +51,9 @@ describe("FluentLogsIngestService", () => { }, }; - const entries: Array = service[ - "normalizeLogEntries" - ](payload) as Array; + const entries: Array = service["normalizeLogEntries"]( + payload, + ) as Array; expect(entries).toHaveLength(1); expect(entries[0]!["message"]).toBe("inner log"); @@ -70,9 +70,9 @@ describe("FluentLogsIngestService", () => { ], }; - const entries: Array = service[ - "normalizeLogEntries" - ](payload) as Array; + const entries: Array = service["normalizeLogEntries"]( + payload, + ) as Array; 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; 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", () => {