[Backport 2.x] Fix build failures

[opensearch-trigger-bot[bot]]

Backport 043a7882a369399b07fead3b1d146aefc359d03a from #1315

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Comparison is base (86d3f67) 71.66% compared to head (d1916e2) 76.02%.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## 2.x #1316 +/- ## ============================================ + Coverage 71.66% 76.02% +4.36% - Complexity 983 1044 +61 ============================================ Files 141 141 Lines 4785 4784 -1 Branches 526 526 ============================================ + Hits 3429 3637 +208 + Misses 1005 793 -212 - Partials 351 354 +3 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.