use metrics from internal helpers folder

Author: Vlasis-Perdikidis

lambdas/api-handler/src/handlers/get-letter-data.ts

@@ -1,13 +1,13 @@
 import { APIGatewayProxyHandler } from "aws-lambda";
 import { MetricsLogger, metricScope } from "aws-embedded-metrics";
+import { MetricStatus, emitForSingleSupplier } from "@internal/helpers";
 import { assertNotEmpty } from "../utils/validation";
 import { extractCommonIds } from "../utils/common-ids";
 import { ApiErrorDetail } from "../contracts/errors";
 import { processError } from "../mappers/error-mapper";
 import ValidationError from "../errors/validation-error";
 import { getLetterDataUrl } from "../services/letter-operations";
 import type { Deps } from "../config/deps";
-import { MetricStatus, emitForSingleSupplier } from "../utils/metrics";
 
 export default function createGetLetterDataHandler(
   deps: Deps,

lambdas/api-handler/src/handlers/get-letter.ts

@@ -1,5 +1,6 @@
 import { APIGatewayProxyHandler } from "aws-lambda";
 import { MetricsLogger, metricScope } from "aws-embedded-metrics";
+import { MetricStatus, emitForSingleSupplier } from "@internal/helpers";
 import { assertNotEmpty } from "../utils/validation";
 import { extractCommonIds } from "../utils/common-ids";
 import ValidationError from "../errors/validation-error";
@@ -8,7 +9,6 @@ import { getLetterById } from "../services/letter-operations";
 import { processError } from "../mappers/error-mapper";
 import { mapToGetLetterResponse } from "../mappers/letter-mapper";
 import { Deps } from "../config/deps";
-import { MetricStatus, emitForSingleSupplier } from "../utils/metrics";
 
 // Get letter data
 export default function createGetLetterHandler(

lambdas/api-handler/src/handlers/get-letters.ts

@@ -4,6 +4,7 @@ import {
 } from "aws-lambda";
 import { Logger } from "pino";
 import { MetricsLogger, metricScope } from "aws-embedded-metrics";
+import { MetricStatus, emitForSingleSupplier } from "@internal/helpers";
 import { getLettersForSupplier } from "../services/letter-operations";
 import { extractCommonIds } from "../utils/common-ids";
 import { requireEnvVar } from "../utils/validation";
@@ -12,7 +13,6 @@ import { processError } from "../mappers/error-mapper";
 import ValidationError from "../errors/validation-error";
 import { mapToGetLettersResponse } from "../mappers/letter-mapper";
 import type { Deps } from "../config/deps";
-import { MetricStatus, emitForSingleSupplier } from "../utils/metrics";
 
 // The endpoint should only return pending letters for now
 const status = "PENDING";

lambdas/api-handler/src/handlers/patch-letter.ts

@@ -1,5 +1,6 @@
 import { APIGatewayProxyHandler } from "aws-lambda";
 import { MetricsLogger, Unit, metricScope } from "aws-embedded-metrics";
+import { MetricStatus } from "@internal/helpers";
 import { enqueueLetterUpdateRequests } from "../services/letter-operations";
 import {
   PatchLetterRequest,
@@ -13,7 +14,6 @@ import { assertNotEmpty } from "../utils/validation";
 import { extractCommonIds } from "../utils/common-ids";
 import { mapToUpdateCommand } from "../mappers/letter-mapper";
 import type { Deps } from "../config/deps";
-import { MetricStatus } from "../utils/metrics";
 
 export default function createPatchLetterHandler(
   deps: Deps,

lambdas/api-handler/src/handlers/post-mi.ts

@@ -1,6 +1,7 @@
 import { APIGatewayProxyHandler } from "aws-lambda";
 import { Unit } from "aws-embedded-metrics";
 import pino from "pino";
+import { MetricEntry, MetricStatus, buildEMFObject } from "@internal/helpers";
 import postMIOperation from "../services/mi-operations";
 import { ApiErrorDetail } from "../contracts/errors";
 import ValidationError from "../errors/validation-error";
@@ -10,7 +11,6 @@ import { extractCommonIds } from "../utils/common-ids";
 import { PostMIRequest, PostMIRequestSchema } from "../contracts/mi";
 import { mapToMI } from "../mappers/mi-mapper";
 import { Deps } from "../config/deps";
-import { MetricEntry, MetricStatus, buildEMFObject } from "../utils/metrics";
 
 export default function createPostMIHandler(
   deps: Deps,

lambdas/api-handler/src/utils/metrics.ts

@@ -14,6 +14,7 @@ import { mapLetterToCloudEvent } from "@nhsdigital/nhs-notify-event-schemas-supp
 import { Letter, LetterSchema } from "@internal/datastore";
 import { Unit } from "aws-embedded-metrics";
 import pino from "pino";
+import { MetricEntry, buildEMFObject } from "internal/helpers/src";
 import { Deps } from "./deps";
 
 // SNS PublishBatchCommand supports up to 10 messages per batch
@@ -67,28 +68,15 @@ function populateEventTypeMap(cloudEvents: LetterEvent[]) {
 }
 
 function emitMetrics(logger: pino.Logger, eventTypeCount: Map<string, number>) {
-  const namespace =
-    process.env.AWS_LAMBDA_FUNCTION_NAME || "letter-updates-transformer";
-
+  const namespace = "letter-updates-transformer";
   for (const [type, count] of eventTypeCount) {
-    const emf = {
-      LogGroup: namespace,
-      ServiceName: namespace,
-      eventType: type,
-      _aws: {
-        Timestamp: Date.now(),
-        CloudWatchMetrics: [
-          {
-            Namespace: namespace,
-            Dimensions: [["eventType", "ServiceName", "LogGroup"]],
-            Metrics: [
-              { Name: "events published", Value: count, Unit: Unit.Count },
-            ],
-          },
-        ],
-      },
-      "events published": count,
+    const dimensions: Record<string, string> = { eventType: type };
+    const metric: MetricEntry = {
+      key: "Events published",
+      value: count,
+      unit: Unit.Count,
     };
+    const emf = buildEMFObject(namespace, dimensions, metric);
     logger.info(emf);
   }
 }

lambdas/letter-updates-transformer/src/letter-updates-transformer.ts

@@ -13,6 +13,7 @@ import {
 import { MISubmittedEvent } from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src";
 import { Unit } from "aws-embedded-metrics";
 import pino from "pino";
+import { MetricEntry, buildEMFObject } from "internal/helpers/src";
 import { mapMIToCloudEvent } from "./mappers/mi-mapper";
 import { Deps } from "./deps";
 
@@ -52,27 +53,15 @@ function extractMIData(record: DynamoDBRecord): MI {
 }
 
 function emitMetrics(logger: pino.Logger, eventTypeCount: Map<string, number>) {
-  const namespace =
-    process.env.AWS_LAMBDA_FUNCTION_NAME || "mi-updates-transformer";
+  const namespace = "mi-updates-transformer";
   for (const [type, count] of eventTypeCount) {
-    const emf = {
-      LogGroup: namespace,
-      ServiceName: namespace,
-      eventType: type,
-      _aws: {
-        Timestamp: Date.now(),
-        CloudWatchMetrics: [
-          {
-            Namespace: namespace,
-            Dimensions: [["LogGroup", "ServiceName", "eventType"]],
-            Metrics: [
-              { Name: "events published", Value: count, Unit: Unit.Count },
-            ],
-          },
-        ],
-      },
-      "events published": count,
+    const dimensions: Record<string, string> = { eventType: type };
+    const metric: MetricEntry = {
+      key: "Events published",
+      value: count,
+      unit: Unit.Count,
     };
+    const emf = buildEMFObject(namespace, dimensions, metric);
     logger.info(emf);
   }
 }