Merge branch 'next-server' into main #737
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!--- Note to EXTERNAL Contributors --> <!-- Thanks for opening a PR! If it is a significant code change, please **make sure there is an open issue** for this. We work best with you when we have accepted the idea first before you code. --> <!--- For ALL Contributors 👇 --> ## What was changed <!-- Describe what has changed in this PR --> Fix register search attributes when starting server ## Why? <!-- Tell your future self why have you made these changes --> Currently, search attributes are registered after the server is ready, which can cause race condition with other processes waiting for the server to become ready too. This PR fixes this by registering the search attributes together with the namespaces. Address temporalio/temporal#6195 ## Checklist <!--- add/delete as needed ---> 1. Closes <!-- add issue number here --> 2. How was this tested: <!--- Please describe how you tested your changes/how we can test them --> 3. Any docs updates needed? <!--- update README if applicable or point out where to update docs.temporal.io -->
…back (#706) <!--- Note to EXTERNAL Contributors --> <!-- Thanks for opening a PR! If it is a significant code change, please **make sure there is an open issue** for this. We work best with you when we have accepted the idea first before you code. --> <!--- For ALL Contributors 👇 --> ## What was changed <!-- Describe what has changed in this PR --> Show BLOCKED state for pending nexus operation, cancelation, and callback. ## Why? <!-- Tell your future self why have you made these changes --> ## Checklist <!--- add/delete as needed ---> 1. Closes <!-- add issue number here --> 2. How was this tested: <!--- Please describe how you tested your changes/how we can test them --> 3. Any docs updates needed? <!--- update README if applicable or point out where to update docs.temporal.io -->
<!--- Note to EXTERNAL Contributors --> <!-- Thanks for opening a PR! If it is a significant code change, please **make sure there is an open issue** for this. We work best with you when we have accepted the idea first before you code. --> <!--- For ALL Contributors 👇 --> ## What was changed <!-- Describe what has changed in this PR --> Add update-options to the CLI (note - I closed previous PR for main) ## Why? <!-- Tell your future self why have you made these changes --> To support UpdateActivity API ## Checklist <!--- add/delete as needed ---> 1. Closes <!-- add issue number here --> 2. How was this tested: <!--- Please describe how you tested your changes/how we can test them --> Add tests. 3. Any docs updates needed? <!--- update README if applicable or point out where to update docs.temporal.io --> Yes, but not in this PR. --------- Co-authored-by: Chad Retz <chad@temporal.io>
<!--- Note to EXTERNAL Contributors -->
<!-- Thanks for opening a PR!
If it is a significant code change, please **make sure there is an open
issue** for this.
We work best with you when we have accepted the idea first before you
code. -->
<!--- For ALL Contributors 👇 -->
## What was changed
<!-- Describe what has changed in this PR -->
Add pause/unpause activity API.
## Why?
<!-- Tell your future self why have you made these changes -->
Part of the activity API work.
## Checklist
<!--- add/delete as needed --->
1. Closes <!-- add issue number here -->
2. How was this tested:
<!--- Please describe how you tested your changes/how we can test them
-->
3. Any docs updates needed?
<!--- update README if applicable
or point out where to update docs.temporal.io -->
---------
Co-authored-by: Josh Berry <josh.berry@temporal.io>
Co-authored-by: Chad Retz <chad@temporal.io>
Also upgrade server to `v1.26.2-rc.0`. The server depends on the Nexus SDK, which expects an `slog.Logger`, the server will do best effort conversion from `common/log.Log` to `slog.Logger` but providing access to the underlying `slog.Logger` gives better control that the default shim provided by the server.
<!--- Note to EXTERNAL Contributors --> <!-- Thanks for opening a PR! If it is a significant code change, please **make sure there is an open issue** for this. We work best with you when we have accepted the idea first before you code. --> <!--- For ALL Contributors 👇 --> ## What was changed <!-- Describe what has changed in this PR --> Add CLI support for Reset activity API ## Why? <!-- Tell your future self why have you made these changes --> Part of the activity API work. --------- Co-authored-by: Chad Retz <chad@temporal.io>
The only semantically-notable conflicts were version bumps in `go.mod`. Everything else was cosmetic and this was otherwise a very clean merge. Closes #737.
josh-berry
force-pushed
the
josh/merge-next-server
branch
from
1cfaccd to
911a786
Compare
|
(Note: I plan to merge this manually/without squashing so we keep a record of the individual commits in next-server in main's history.) |
Sushisource
approved these changes
Jan 13, 2025
cretz
approved these changes
Jan 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The only semantically-notable conflicts were version bumps in
go.mod.Everything else was cosmetic and this was otherwise a very clean merge.