address comments

opensearch-project · Aug 7, 2023 · a0512d5 · a0512d5
1 parent 68e7685
commit a0512d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/AlertService.kt b/alerting/src/main/kotlin/org/opensearch/alerting/AlertService.kt
@@ -347,7 +347,7 @@ class AlertService(
             else Alert.State.ERROR
             Alert(
                 startTime = Instant.now(),
-                lastNotificationTime = Instant.now(),
+                lastNotificationTime = currentTime,
                 state = Alert.State.ACTIVE,
                 errorMessage = null, schemaVersion = -1,
                 chainedAlertTrigger = ctx.trigger,

diff --git a/...ing/src/main/kotlin/org/opensearch/alerting/script/ChainedAlertTriggerExecutionContext.kt b/...ing/src/main/kotlin/org/opensearch/alerting/script/ChainedAlertTriggerExecutionContext.kt
@@ -23,26 +23,6 @@ data class ChainedAlertTriggerExecutionContext(
     val alert: Alert? = null
 ) {
 
-    constructor(
-        workflow: Workflow,
-        workflowRunResult: WorkflowRunResult,
-        trigger: ChainedAlertTrigger,
-        alertGeneratingMonitors: Set<String>,
-        monitorIdToAlertIdsMap: Map<String, Set<String>>,
-        alert: Alert? = null
-    ) :
-        this(
-            workflow,
-            workflowRunResult,
-            workflowRunResult.executionStartTime,
-            workflowRunResult.executionEndTime,
-            workflowRunResult.error,
-            trigger,
-            alertGeneratingMonitors,
-            monitorIdToAlertIdsMap,
-            alert
-        )
-
     /**
      * Mustache templates need special permissions to reflectively introspect field names. To avoid doing this we
      * translate the context to a Map of Strings to primitive types, which can be accessed without reflection.

diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/workflow/CompositeWorkflowRunner.kt b/alerting/src/main/kotlin/org/opensearch/alerting/workflow/CompositeWorkflowRunner.kt
@@ -171,6 +171,8 @@ object CompositeWorkflowRunner : WorkflowRunner() {
                 val triggerCtx = ChainedAlertTriggerExecutionContext(
                     workflow = workflow,
                     workflowRunResult = workflowRunResult,
+                    periodStart = workflowRunResult.executionStartTime,
+                    periodEnd = workflowRunResult.executionEndTime,
                     trigger = caTrigger,
                     alertGeneratingMonitors = monitorIdToAlertIdsMap.keys,
                     monitorIdToAlertIdsMap = monitorIdToAlertIdsMap,