Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing Tracers #951

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Add missing Tracers #951

merged 1 commit into from
Oct 5, 2023

Conversation

msfroh
Copy link
Contributor

@msfroh msfroh commented Oct 5, 2023

Changes to core added Tracer constructor arg to Netty4Transport.

PR in core: opensearch-project/OpenSearch#10143

Issues Resolved

N/A

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.

Changes to core added Tracer constructor arg to Netty4Transport.

Signed-off-by: Michael Froh <froh@amazon.com>
Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this changes!

@dblock dblock merged commit b6ccc75 into opensearch-project:main Oct 5, 2023
9 checks passed
@opensearch-trigger-bot
Copy link

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

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

@dbwiddis
Copy link
Member

dbwiddis commented Oct 8, 2023

Backport needs to be done manually @msfroh @owaiskazi19

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants