Use SdkClient for persistence in 4 transport actions by manaswini1920 · Pull Request #2060 · opensearch-project/alerting

manaswini1920 · 2026-03-26T18:38:11Z

Description

Use SdkClient for persistence in 4 transport actions:

TransportDeleteMonitorAction: sdkClient.getDataObject() in getMonitor()
TransportSearchMonitorAction: sdkClient.searchDataObjectAsync() in search()
TransportGetDestinationsAction: sdkClient.searchDataObjectAsync() in search()
TransportSearchAlertingCommentAction: sdkClient.searchDataObjectAsync() in search()

Walk full cause chain for IndexNotFoundException handling.
Add unit tests for SearchMonitor and GetDestinations SDK paths.

Related Issues

Follows pattern from #2053

Check List

New functionality includes testing.
Commits are signed per the DCO using --signoff.

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt

eirsep

we need to ensure we finish loop after listener.onResponse/Failure statements.

and transversely we need to make sure listener.onResponse/Failure statements. is present everywhere

we have had a lot of pain with this in past ... plz add unit tests with 100% coverage for action classes.

rest changes are LGTM

manaswini1920 · 2026-03-27T22:19:27Z

we need to ensure we finish loop after listener.onResponse/Failure statements.

and transversely we need to make sure listener.onResponse/Failure statements. is present everywhere

we have had a lot of pain with this in past ... plz add unit tests with 100% coverage for action classes.

rest changes are LGTM

Fixed both issues:

getMonitor() — changed actionListener.onFailure() without return to throw, which is caught by the caller's try/catch. This also prevents the NPE on getResponse!! that would have occurred when falling through.
resolveUserAndStart() — added explicit return after onFailure for the workflow delegate check.
│ Audited all 4 actions — SearchMonitor, GetDestinations, and SearchComments already

Added more unit tests for coverage in the next revision.

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt

engechas · 2026-03-30T17:31:20Z

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt

-                actionListener.onFailure(
-                    AlertingException.wrap(


Do we no longer need to notify the action listener or wrap the exception type as alerting with the remote SDK?

We still do — getMonitor() throws on failure, which is caught by resolveUserAndStart()'s catch block (L116) where actionListener.onFailure(AlertingException.wrap(t)) is called. The previous code called
onFailure directly in getMonitor() but didn't return after, causing an NPE on the next line. Moving to throw/catch fixes that while keeping the same listener notification and AlertingException wrapping.

engechas · 2026-03-30T17:34:03Z

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetDestinationsAction.kt

+            }
+            try {
+                val searchResponse = response.searchResponse()
+                if (searchResponse == null) {


When would the search response be null? Wondering if this should be an error case rather than defaulting to an empty list

SDK's SearchDataObjectResponse.searchResponse() returns nullable. It can be null if the SDK fails to deserialize the response from the storage backend. Returning empty is defensive. Happy to change to an error if you think that's better for debugging.

Got it - that sounds like an error case to me but we can reevaluate later

Given it's just a list of destinations it should be fine to have an empty list for now

engechas · 2026-03-30T17:38:42Z

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt


        private suspend fun getMonitor(): Monitor {
-            val getRequest = GetRequest(ScheduledJob.SCHEDULED_JOBS_INDEX, monitorId)
+            val tenantId = client.threadPool().threadContext.getHeader(AlertingPlugin.TENANT_ID_HEADER)


What is the behavior if this header is not present?

If the header is absent, tenantId is null. In local mode, multi-tenancy is disabled in the SDK, so null tenantId is fine — no tenant filtering is applied. In remote mode, the upstream service always sets the
x-tenant-id header, so it's never absent. If it were absent with multi-tenancy enabled, the SDK would reject the request with a 400 error

…ons, SearchComments Replace direct client.get/search calls with sdkClient equivalents: - TransportDeleteMonitorAction: sdkClient.getDataObject() in getMonitor() - TransportSearchMonitorAction: sdkClient.searchDataObjectAsync() in search() - TransportGetDestinationsAction: sdkClient.searchDataObjectAsync() in search() - TransportSearchAlertingCommentAction: sdkClient.searchDataObjectAsync() in search() Walk full cause chain for IndexNotFoundException handling. Add unit tests for SearchMonitor and GetDestinations SDK paths. Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>

engechas · 2026-04-02T20:26:54Z

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetDestinationsAction.kt

+            }
+            try {
+                val searchResponse = response.searchResponse()
+                if (searchResponse == null) {


Got it - that sounds like an error case to me but we can reevaluate later

Given it's just a list of destinations it should be fine to have an empty list for now

manaswini1920 requested review from AWSHurneyt, amsiglan, bowenlan-amzn, eirsep, engechas, getsaurabh02, goyamegh, jowg-amazon, lezzago, praveensameneni, rishabhmaurya, riysaxen-amzn, sbcd90 and toepkerd as code owners March 26, 2026 18:38

manaswini1920 force-pushed the feature/sdk-persistence-batch2 branch 2 times, most recently from 033be42 to 64ca2df Compare March 26, 2026 18:52

eirsep reviewed Mar 26, 2026

View reviewed changes

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt Show resolved Hide resolved

manaswini1920 changed the base branch from main to remote-metadata-support March 26, 2026 18:54

manaswini1920 force-pushed the feature/sdk-persistence-batch2 branch from 64ca2df to ec7c4c7 Compare March 26, 2026 18:55

manaswini1920 mentioned this pull request Mar 26, 2026

Use SdkClient for persistence in GetAlerts, DeleteComment, GetWorkflo… #2061

Merged

2 tasks

eirsep reviewed Mar 26, 2026

View reviewed changes

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt Outdated Show resolved Hide resolved

eirsep reviewed Mar 26, 2026

View reviewed changes

manaswini1920 force-pushed the feature/sdk-persistence-batch2 branch 2 times, most recently from 16e447d to 5b2292b Compare March 28, 2026 03:41

engechas reviewed Mar 30, 2026

View reviewed changes

manaswini1920 force-pushed the feature/sdk-persistence-batch2 branch from 5b2292b to 0cce1e4 Compare March 30, 2026 23:10

eirsep approved these changes Mar 31, 2026

View reviewed changes

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteMonitorAction.kt Outdated Show resolved Hide resolved

manaswini1920 mentioned this pull request Apr 2, 2026

Use SdkClient for persistence in IndexAlertingComment, IndexMonitor #2081

Merged

2 tasks

manaswini1920 force-pushed the feature/sdk-persistence-batch2 branch from a988701 to f4e8ee5 Compare April 2, 2026 18:07

chore: retrigger CI

6800612

Signed-off-by: Manaswini Ragamouni <ragamanu@amazon.com>

manaswini1920 force-pushed the feature/sdk-persistence-batch2 branch from f4e8ee5 to 6800612 Compare April 2, 2026 19:14

engechas approved these changes Apr 2, 2026

View reviewed changes

engechas merged commit c622dc4 into opensearch-project:remote-metadata-support Apr 2, 2026
18 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use SdkClient for persistence in 4 transport actions#2060

Use SdkClient for persistence in 4 transport actions#2060
engechas merged 2 commits intoopensearch-project:remote-metadata-supportfrom
manaswini1920:feature/sdk-persistence-batch2

manaswini1920 commented Mar 26, 2026

Uh oh!

Uh oh!

Uh oh!

eirsep left a comment

Uh oh!

manaswini1920 commented Mar 27, 2026

Uh oh!

Uh oh!

engechas Mar 30, 2026

Uh oh!

manaswini1920 Mar 30, 2026

Uh oh!

engechas Mar 30, 2026

Uh oh!

manaswini1920 Mar 30, 2026

Uh oh!

engechas Apr 2, 2026

Uh oh!

engechas Mar 30, 2026

Uh oh!

manaswini1920 Mar 30, 2026

Uh oh!

Uh oh!

engechas Apr 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

manaswini1920 commented Mar 26, 2026

Description

Related Issues

Check List

Uh oh!

Uh oh!

Uh oh!

eirsep left a comment

Choose a reason for hiding this comment

Uh oh!

manaswini1920 commented Mar 27, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants