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

chore: backport #11587 #11777

Merged
merged 1 commit into from
Apr 27, 2022
Merged

chore: backport #11587 #11777

merged 1 commit into from
Apr 27, 2022

Conversation

robert-zaremba
Copy link
Collaborator

@robert-zaremba robert-zaremba commented Apr 26, 2022

Backporting #11587

This feature is not breaking but requested by few teams.

We can't do it with mergifyio because we renamed the branch (see comments in #11646 (comment))


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@alexanderbez
Copy link
Contributor

@robert-zaremba why is the diff here so different from the original #11646 PR?

@robert-zaremba robert-zaremba changed the base branch from main to release/v0.46.x April 26, 2022 22:34
@robert-zaremba
Copy link
Collaborator Author

@alexanderbez I forgot to change the target for this PR (was set automatically to main rather than the release branch). Updated.

@alexanderbez alexanderbez changed the title Robert/tracekv chore: backport #11587 Apr 27, 2022
@alexanderbez
Copy link
Contributor

alexanderbez commented Apr 27, 2022

@robert-zaremba I think CI is stuck for some reason. Mind forcing a commit to jump start it?

@robert-zaremba
Copy link
Collaborator Author

@alexanderbez some "artificial" commit?

* feature: Clone and Merge methods on TraceContext

* chore: use TraceContext.Merge method in SetTracingContext

* feature: add Store name in TraceContext during execution

* chore: update rootmulti Store TraceContext on *Store after Merge()
@alexanderbez
Copy link
Contributor

@alexanderbez alexanderbez merged commit 9f3afcd into release/v0.46.x Apr 27, 2022
@alexanderbez alexanderbez deleted the robert/tracekv branch April 27, 2022 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. C:Store
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants