Query instrumentation Minor Enhancements

[deshsidd]

Description

Minor enhancements to query categorization based on local testing.

1. Make sure query type and aggregation type are 2 separate tags/attributes and do not overlap
2. Change the unit type for histograms for latency, cpu and memory

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.

[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/query-insights/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/query-insights/backport-2.x
# Create a new branch
git switch --create backport/backport-73-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c6a46f512d6cf05699bfbc0ee4d00713b24eecb1
# Push it to GitHub
git push --set-upstream origin backport/backport-73-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/query-insights/backport-2.x

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