send metrics on page requst or load

DEFRA · Jan 22, 2025 · 9eecc95 · 9eecc95
1 parent 9fa313e
commit 9eecc95
Show file tree

Hide file tree

Showing 10 changed files with 218 additions and 12 deletions.
diff --git a/src/server/common/controller/generic-page-controller/index.js b/src/server/common/controller/generic-page-controller/index.js
@@ -0,0 +1,103 @@
+import {
+  createMetricsLogger,
+  Unit,
+  StorageResolution
+} from 'aws-embedded-metrics'
+import { config } from '~/src/config/config.js'
+import { createLogger } from '../../helpers/logging/logger.js'
+
+/**
+ * @import {Page} from '../../model/page/page-model.js'
+ */
+
+/**
+ * export @interface PageController {
+ *  handleGet: (req: Request, h: ResponseToolkit) => ResponseObject
+ * }
+ *
+ * export @typedef {{
+ *   request ?: boolean;
+ *   response ?: boolean;
+ * }} Metrics
+ *
+ * export @typedef {{
+ *   get ?: Metrics;
+ *   post ?: Metrics;
+ * }} MetricReports
+ */
+
+export default class GenericPageController {
+  metrics = createMetricsLogger()
+  logger = createLogger()
+
+  /**
+   * @param {Page} page
+   */
+  constructor(page) {
+    this.page = page
+  }
+
+  getHandler(req, h) {
+    let served = true
+
+    try {
+      this.sendMetric('get', 'request')
+
+      return this.handleGet(req, h)
+    } catch (e) {
+      this.logger.error(e)
+      served = false
+    } finally {
+      if (served) {
+        this.sendMetric('get', 'response')
+      }
+    }
+  }
+
+  postHandler(req, h) {
+    let served = true
+
+    try {
+      this.sendMetric('post', 'request')
+
+      return this.handlePost(req, h)
+    } catch (e) {
+      this.logger.error(e)
+      served = false
+    } finally {
+      if (served) {
+        this.sendMetric('post', 'response')
+      }
+    }
+  }
+
+  /**
+   *
+   * @param {string} method
+   * @param {string} event
+   */
+  sendMetric(method, event) {
+    if (!config.get('isProduction')) return
+
+    const sendMetric = this.page.reportMetrics[method]?.[event]
+
+    if (sendMetric) {
+      this.metrics.putMetric(
+        `${method}::${event}-${this.page.urlPath}`,
+        1,
+        Unit.Count,
+        StorageResolution.Standard
+      )
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  handleGet(req, h) {
+    throw new Error('Method not implemented')
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  handlePost(req, h) {
+    throw new Error('Method not implemented')
+  }
+}
diff --git a/src/server/common/controller/generic-page-controller/index.test.js b/src/server/common/controller/generic-page-controller/index.test.js
@@ -0,0 +1,73 @@
+import { config } from '~/src/config/config.js'
+import { Page } from '../../model/page/page-model.js'
+import GenericPageController from './index.js'
+
+class TestPage extends Page {
+  reportMetrics = {
+    get: {
+      request: false,
+      response: true
+    }
+  }
+}
+
+class TestGenericController extends GenericPageController {
+  handleGet() {
+    return 'get'
+  }
+
+  handlePost() {
+    return 'post'
+  }
+}
+
+describe('#GenricPageController', () => {
+  let controller
+
+  beforeEach(() => {
+    config.set('isProduction', true)
+  })
+
+  beforeEach(() => {
+    const page = new TestPage()
+    controller = new TestGenericController(page)
+  })
+
+  it('should output error on getHandler', () => {
+    jest.spyOn(controller, 'handleGet').mockImplementation(() => {
+      throw new Error('test error')
+    })
+
+    jest.spyOn(controller.logger, 'error').mockImplementation(() => {
+      throw new Error('test error')
+    })
+    expect(() => controller.getHandler()).toThrow()
+  })
+
+  it('should output error on postHandler', () => {
+    jest.spyOn(controller, 'handlePost').mockImplementation(() => {
+      throw new Error('test error')
+    })
+
+    jest.spyOn(controller.logger, 'error').mockImplementation(() => {
+      throw new Error('test error')
+    })
+    expect(() => controller.postHandler()).toThrow()
+  })
+
+  it('should send metric on getHandler', () => {
+    jest.spyOn(controller, 'sendMetric')
+    jest.spyOn(controller, 'handleGet').mockImplementation(() => {
+      return 'get success'
+    })
+    const metricSpy = jest.spyOn(controller.metrics, 'putMetric')
+    controller.getHandler()
+    expect(controller.sendMetric).toHaveBeenCalledWith('get', 'response')
+    expect(metricSpy).toHaveBeenCalledTimes(1)
+  })
+
+  afterEach(() => {
+    jest.clearAllMocks()
+    config.set('isProduction', false)
+  })
+})
diff --git a/src/server/common/controller/page-controller/page-controller.js b/src/server/common/controller/page-controller/page-controller.js
@@ -1,5 +1,6 @@
 import { calculateNextPage } from '../../helpers/next-page.js'
 import { ExitPage } from '../../model/page/exit-page-model.js'
+import GenericPageController from '../generic-page-controller/index.js'
 /** @import { Server, ServerRegisterPluginObject, ServerRoute, ReqRefDefaults, RouteDefMethods } from '@hapi/hapi' */
 /** @import { NextPage } from '../../helpers/next-page.js' */
 /** @import { Page } from '../../model/page/page-model.js' */
@@ -15,13 +16,17 @@ const defaultControllerOptions = {
   methods: ['GET', 'POST']
 }
 
-export class PageController {
+/**
+ * @satisfies {PageController}
+ */
+export class PageController extends GenericPageController {
   options
   /**
    * @param {Page} page
    * @param {ControllerOptions} opts
    */
   constructor(page, opts = defaultControllerOptions) {
+    super(page)
     this.page = page
 
     this.options = opts
@@ -50,7 +55,7 @@ export class PageController {
     }
   }
 
-  getHandler(req, h) {
+  handleGet(req, h) {
     return h.view(this.page.view, {
       nextPage: req.query.redirect_uri,
       pageTitle: this.page.title,
@@ -59,7 +64,7 @@ export class PageController {
     })
   }
 
-  postHandler(req, h) {
+  handlePost(req, h) {
     const payload = /** @type {NextPage} */ (req.payload)
     const nextPage = this.page.nextPage()
 

diff --git a/src/server/common/controller/question-page-controller/question-page-controller.js b/src/server/common/controller/question-page-controller/question-page-controller.js
@@ -1,15 +1,17 @@
 import { calculateNextPage } from '../../helpers/next-page.js'
 import { ExitPage } from '../../model/page/exit-page-model.js'
+import GenericPageController from '../generic-page-controller/index.js'
 /** @import { Server, ServerRegisterPluginObject } from '@hapi/hapi' */
 /** @import { NextPage } from '../../helpers/next-page.js' */
 /** @import { RawPayload } from '../../model/answer/answer-model.js' */
 /** @import { QuestionPage } from '../../model/page/question-page-model.js' */
 
-export class QuestionPageController {
+export class QuestionPageController extends GenericPageController {
   /**
    * @param {QuestionPage} page
    */
   constructor(page) {
+    super(page)
     this.page = page
   }
 
@@ -38,7 +40,7 @@ export class QuestionPageController {
     }
   }
 
-  getHandler(req, h) {
+  handleGet(req, h) {
     const sectionState = req.yar.get(this.page.sectionKey)
     const answer = this.page.Answer.fromState(
       sectionState?.[this.page.questionKey]
@@ -53,7 +55,7 @@ export class QuestionPageController {
     })
   }
 
-  postHandler(req, h) {
+  handlePost(req, h) {
     const payload = /** @type {NextPage} */ (req.payload)
     const Answer = this.page.Answer
     const answer = new Answer(/** @type {RawPayload} */ (payload))

diff --git a/...-page-controller/SummaryPageController.js → ...age-controller/summary-page-controller.js b/...-page-controller/SummaryPageController.js → ...age-controller/summary-page-controller.js
@@ -2,8 +2,9 @@
 /** @import { Server, ServerRegisterPluginObject } from '@hapi/hapi' */
 
 import { sectionToSummary } from '../../templates/macros/create-summary.js'
+import GenericPageController from '../generic-page-controller/index.js'
 
-export class SummaryPageController {
+export class SummaryPageController extends GenericPageController {
   /** @type {string} */
   indexView = 'common/controller/summary-page-controller/index.njk'
 
@@ -17,6 +18,7 @@ export class SummaryPageController {
    * @param {SummaryPage} page
    */
   constructor(page) {
+    super(page)
     this.page = page
   }
 
@@ -49,7 +51,7 @@ export class SummaryPageController {
     }
   }
 
-  getHandler(req, res) {
+  handleGet(req, res) {
     const section = this.page.sectionFactory(req.yar.get(this.page.sectionKey))
 
     const { isValid, firstInvalidPage } = section.validate()
@@ -66,7 +68,7 @@ export class SummaryPageController {
     })
   }
 
-  postHandler(_req, res) {
+  handlePost(_req, res) {
     return res.redirect('/task-list')
   }
 }
diff --git a/src/server/common/model/page/page-model.js b/src/server/common/model/page/page-model.js
@@ -1,7 +1,20 @@
 import { NotImplementedError } from '../../helpers/not-implemented-error.js'
 /** @import { AnswerModel } from '../answer/answer-model.js' */
+/** @import { MetricReports, Metrics } from '../../controller/generic-page-controller/index.js' */
 
 export class Page {
+  /** @type {MetricReports} */
+  reportMetrics = {
+    get: {
+      request: false,
+      response: false
+    },
+    post: {
+      request: false,
+      response: false
+    }
+  }
+
   /** @type {string} */
   urlPath
 

diff --git a/src/server/destination/summary/index.js b/src/server/destination/summary/index.js
@@ -1,5 +1,5 @@
 import SummaryPage from '../../common/model/page/summary-page/SummaryPageModel.js'
-import { SummaryPageController } from '../../common/controller/summary-page-controller/SummaryPageController.js'
+import { SummaryPageController } from '../../common/controller/summary-page-controller/summary-page-controller.js'
 
 import { DestinationSection } from '~/src/server/common/model/section/destination/destination.js'
 

diff --git a/src/server/licence/check-answers/index.js b/src/server/licence/check-answers/index.js
@@ -1,5 +1,5 @@
 import SummaryPage from '../../common/model/page/summary-page/SummaryPageModel.js'
-import { SummaryPageController } from '../../common/controller/summary-page-controller/SummaryPageController.js'
+import { SummaryPageController } from '../../common/controller/summary-page-controller/summary-page-controller.js'
 
 import { LicenceSection } from '~/src/server/common/model/section/licence/licence.js'
 

diff --git a/src/server/origin/summary/index.js b/src/server/origin/summary/index.js
@@ -1,5 +1,5 @@
 import SummaryPage from '../../common/model/page/summary-page/SummaryPageModel.js'
-import { SummaryPageController } from '../../common/controller/summary-page-controller/SummaryPageController.js'
+import { SummaryPageController } from '../../common/controller/summary-page-controller/summary-page-controller.js'
 
 import { OriginSection } from '~/src/server/common/model/section/origin/origin.js'
 

diff --git a/src/server/submit/confirmation/index.js b/src/server/submit/confirmation/index.js
@@ -13,6 +13,14 @@ export class ConfirmationPage extends Page {
   urlPath = '/submit/confirmation'
   view = 'submit/confirmation/index'
 
+  // sends metric that the page was served
+  reportMetrics = {
+    get: {
+      request: false,
+      response: true
+    }
+  }
+
   pageTitle = title
   pageHeading = title
 }