KMS-660: More PR feedback

Author: Christopher D. Gokey

cdk/app/lib/helper/KeywordSyncMonitoringSetup.ts

@@ -7,6 +7,7 @@ import { Construct } from 'constructs'
 
 const KEYWORD_SYNC_METRIC_NAMESPACE = 'KMS/KeywordSync'
 const KEYWORD_EVENT_PUBLISH_FAILURES_METRIC = 'KeywordEventPublishFailures'
+const PUBLISH_FAILURE_ALARM_PERIOD = cdk.Duration.days(1)
 
 export interface KeywordSyncMonitoringSetupProps {
   prefix: string
@@ -33,7 +34,7 @@ export class KeywordSyncMonitoringSetup {
       namespace: KEYWORD_SYNC_METRIC_NAMESPACE,
       metricName: KEYWORD_EVENT_PUBLISH_FAILURES_METRIC,
       statistic: 'Sum',
-      period: cdk.Duration.minutes(5)
+      period: PUBLISH_FAILURE_ALARM_PERIOD
     })
 
     this.publishFailuresAlarm = new cloudwatch.Alarm(scope, 'KeywordSyncPublishFailuresAlarm', {

serverless/src/publisher/__tests__/handler.test.js

@@ -978,26 +978,17 @@ describe('publisher handler', () => {
         postPublishFailures: []
       })
 
-      expect(emitPublisherMetrics).toHaveBeenNthCalledWith(1, {
+      expect(emitPublisherMetrics).toHaveBeenCalledTimes(1)
+      expect(emitPublisherMetrics).toHaveBeenCalledWith({
         metrics: [
           {
             metricName: PUBLISHER_METRIC_NAMES.KEYWORD_CHANGES_DETECTED,
             value: 1
-          }
-        ]
-      })
-
-      expect(emitPublisherMetrics).toHaveBeenNthCalledWith(2, {
-        metrics: [
+          },
           {
             metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_GENERATED,
             value: 1
-          }
-        ]
-      })
-
-      expect(emitPublisherMetrics).toHaveBeenNthCalledWith(3, {
-        metrics: [
+          },
           {
             metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_PUBLISHED,
             value: 1
@@ -1187,8 +1178,17 @@ describe('publisher handler', () => {
         postPublishFailures: []
       })
 
-      expect(emitPublisherMetrics).toHaveBeenNthCalledWith(3, {
+      expect(emitPublisherMetrics).toHaveBeenCalledTimes(1)
+      expect(emitPublisherMetrics).toHaveBeenCalledWith({
         metrics: [
+          {
+            metricName: PUBLISHER_METRIC_NAMES.KEYWORD_CHANGES_DETECTED,
+            value: 0
+          },
+          {
+            metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_GENERATED,
+            value: 0
+          },
           {
             metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_PUBLISHED,
             value: 0
@@ -1573,6 +1573,14 @@ describe('publisher handler', () => {
 
       expect(emitPublisherMetrics).toHaveBeenLastCalledWith({
         metrics: [
+          {
+            metricName: PUBLISHER_METRIC_NAMES.KEYWORD_CHANGES_DETECTED,
+            value: 2
+          },
+          {
+            metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_GENERATED,
+            value: 2
+          },
           {
             metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_PUBLISHED,
             value: 1
@@ -1659,7 +1667,7 @@ describe('publisher handler', () => {
 
       expect(result.status).toBe('success')
       expect(logger.error).toHaveBeenCalledWith(
-        expect.stringContaining('[publisher] Failed to emit keyword sync metrics for keyword change detection.')
+        expect.stringContaining('[publisher] Failed to emit keyword sync metrics for keyword sync summary.')
       )
     })
 

serverless/src/publisher/handler.js

@@ -491,32 +491,12 @@ export const publisher = async (event) => {
     const totalSchemes = keywordChanges.size
     logger.info(`[publisher] Analysis completed. Processed ${totalSchemes} concept schemes.`)
 
-    await emitPublisherMetricsSafely(
-      [
-        {
-          metricName: PUBLISHER_METRIC_NAMES.KEYWORD_CHANGES_DETECTED,
-          value: keywordChangesDetected
-        }
-      ],
-      'keyword change detection'
-    )
-
     const keywordEvents = createKeywordEvents(keywordChanges)
     const keywordEventsGenerated = keywordEvents.length
 
     logger.info(`[publisher] Created ${keywordEvents.length} keyword events`)
     logger.info('[publisher] Keyword Events:', keywordEvents)
 
-    await emitPublisherMetricsSafely(
-      [
-        {
-          metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_GENERATED,
-          value: keywordEventsGenerated
-        }
-      ],
-      'keyword event generation'
-    )
-
     // Execute the publish operation
     logger.info(`[publisher] Executing publish update for version=${versionName}`)
     const publishQuery = getPublishUpdateQuery(versionName, publishDate)
@@ -577,6 +557,14 @@ export const publisher = async (event) => {
 
     await emitPublisherMetricsSafely(
       [
+        {
+          metricName: PUBLISHER_METRIC_NAMES.KEYWORD_CHANGES_DETECTED,
+          value: keywordChangesDetected
+        },
+        {
+          metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_GENERATED,
+          value: keywordEventsGenerated
+        },
         {
           metricName: PUBLISHER_METRIC_NAMES.KEYWORD_EVENTS_PUBLISHED,
           value: keywordEventsPublished
@@ -586,7 +574,7 @@ export const publisher = async (event) => {
           value: keywordEventPublishFailures
         }
       ],
-      'keyword event publish summary'
+      'keyword sync summary'
     )
 
     // Emit event for cache-prime to consume