Fix breaking changes of #15409

[ltaragi]

Description

Fix breaking changes of #15409

Related Issues

Resolves #15463

Check List

• Functionality includes testing.
• API changes companion pull request created, if applicable.
• Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[github-actions]

❕ Gradle check result for 8e83f3a: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

[ltaragi]

❕ Gradle check result for 8e83f3a: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Flaky tests #14294

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.77%. Comparing base (7a9cb35) to head (8e83f3a).
Report is 6 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #15624      +/-   ##
============================================
- Coverage     71.83%   71.77%   -0.06%     
+ Complexity    63932    63920      -12     
============================================
  Files          5258     5258              
  Lines        299329   299358      +29     
  Branches      43259    43260       +1     
============================================
- Hits         215010   214872     -138     
- Misses        66587    66816     +229     
+ Partials      17732    17670      -62     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[opensearch-trigger-bot]

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-15624-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a60b668ad98a52ee8e42ace52de3f68caff36276
# Push it to GitHub
git push --set-upstream origin backport/backport-15624-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-15624-to-2.x.