Fix compilation issues in main

[pranikum]

Description

Fixing compilation issues in main due to packages changes in opensearch branch

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

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.

[codecov]

Codecov Report

❗ No coverage uploaded for pull request base (main@2143b03). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head ec0e042 differs from pull request most recent head 3f38cd4. Consider uploading reports for the commit 3f38cd4 to get more accurate results

@@           Coverage Diff           @@
##             main     #292   +/-   ##
=======================================
  Coverage        ?   83.91%           
  Complexity      ?      556           
=======================================
  Files           ?       61           
  Lines           ?     2046           
  Branches        ?      146           
=======================================
  Hits            ?     1717           
  Misses          ?      232           
  Partials        ?       97