Cherry-pick PRs labeled for v1.30.7 release - #12040
Merged
Merged
Conversation
Update sqlparser dependency to latest commit Include latest changes in the sqlparser. - [x] built - [ ] run locally and tested manually - [ ] covered by existing tests - [ ] added new unit test(s) - [ ] added new functional test(s) (cherry picked from commit 4742842)
Bump `github.com/temporalio/ringpop-go` to `v0.1.0` and `github.com/temporalio/tchannel-go` to `v1.22.1`, replacing the previous commit pseudo-versions. Picks up ringpop-go#22 (bounds label and member resource usage on incoming membership changes, fixes a state-transition timer leak) and tchannel-go#14 (returns errors instead of panicking on malformed call frames). Pull the membership/transport robustness fixes from both forks into the server. Both forks are now tagged, so we can pin real releases instead of commit hashes. - [x] built - [x] covered by existing tests (cherry picked from commit 5407c36)
Update sqlparser to v0.1.0. It's actually no-op since it points to the same commit. Use tagged version instead of commit. - [ ] built - [ ] run locally and tested manually - [ ] covered by existing tests - [ ] added new unit test(s) - [ ] added new functional test(s) (cherry picked from commit 461c0d3)
…nanos component (#11564) Change datetime format to always include nanos component in Elasticsearch Visibility. Also added Visibility integration tests with Elasticsearch. With Elasticsearch, comparing dates without explicitly specifying all components can lead to unexpected results. Eg: `StartTime = '2023-04-05T06:07:08Z'` would match a workflow with `StartTime = '2023-04-05T06:07:08.100000000Z'`. This behavior is unexpected and can mess up with pagination. This PR fixes it so missing nanos components is always specified (in the example, it would be filled with 0s). - [x] built - [x] run locally and tested manually - [ ] covered by existing tests - [x] added new unit test(s) - [x] added new functional test(s) (cherry picked from commit adaa8f0) Backport notes: - The CI change is adapted: release/v1.30.x starts containers through the integration-test job's compose service list, so elasticsearch is added there rather than to a CONTAINERS env var. - tests/testcore/test_cluster.go keeps this branch's esConfig field and archiver wiring; only the index setup/teardown helpers move to persistence-tests. - The visibility suite uses require.EventuallyWithT instead of common/testing/await, searchattribute.EncodeValue instead of sadefs.MustEncodeValue, and drops the serializer argument to visibility.NewManager, none of which exist on this branch. - The errors.AsType refactor in visibility_store.go is left as errors.As, since this branch targets Go 1.25. - persistencetests.SetupEsIndex keeps this branch's PutMapping call for searchattribute.TestEsNameTypeMap().Custom(). main's copy of that helper no longer registers the custom search attributes, and without them the ES and OpenSearch functional tests query fields the index does not map.
## What changed? `GetWorkflowExecutionHistory` and `GetWorkflowExecutionHistoryReverse` now check `branch_token` in the page token against the token in mutable state. ## Why? To confirm if it is still the correct branch after conflict resolution. ## How did you test it? - [x] built - [x] run locally and tested manually - [x] covered by existing tests - [x] added new unit test(s) - [x] added new functional test(s) (cherry picked from commit ceb1cc1) Backport notes: - The two functional tests added to tests/gethistory_test.go are omitted. They need testcore.WithHistoryShardCount and the GetHistorySuite TestEnv wiring, neither of which exists on release/v1.30.x. The unit tests in service/history/api/token_test.go and service/history/history_engine_test.go cover the validation logic. - The tests construct persistence.HistoryBranchUtilImpl directly, since persistence.NewHistoryBranchUtil does not exist on this branch. - TestGetWorkflowExecutionHistory_RawHistoryWithTransientDecision now mocks GetWorkflowExecution. On this branch its page token has IsWorkflowRunning unset, so the read takes the new validation path.
simvlad
force-pushed
the
simvlad/cherrypick-1-30-7
branch
from
September 12, 2026 05:00
d142337 to
a08ae2d
Compare
yycptt
approved these changes
Sep 13, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What changed?
Cherry-picks the PRs labeled
release/1.30.7ontorelease/v1.30.x, excluding #11014, which will be cherry picked independentlyList of PRs:
Conflicts were in the dependency pins in
go.mod/go.sum, in test and CI code, and in one production file:service/history/configs/config.go-NewConfigonmainhas aSendRawHistoryBytesToMatchingServiceentry that does not exist on this branch. Kept this branch's twoSendRaw*entries and added onlyEnablePaginationTokenBranchValidationandEnablePaginationTokenBranchValidationShadowMode.Two production edits were also needed where git reported no conflict:
common/persistence/visibility/store/elasticsearch/visibility_store.go- [Visibility][Elasticsearch] Change datetime format to always include nanos component in pagination filter #11564 carries anincidental refactor to
errors.AsType[*query.ConverterError], a Go 1.26 stdlib API. Thisbranch's
godirective is 1.25.11, so those two call sites are left aserrors.As..github/workflows/run-tests.yml- [Visibility][Elasticsearch] Change datetime format to always include nanos component in pagination filter #11564 addselasticsearchto aCONTAINERSenv var thatdoes not exist here.
Why?
Security and reliability patch release for 1.30.7.
How did you test it?
Potential risks
EnablePaginationTokenBranchValidationdefaults totrue, so #11723's rejection path is live assoon as this ships.