chore: Go 1.24, and mockery, x/tools, sqlite to support it #7244

Groxx · 2025-09-09T01:06:36Z

After much yamling of files, Go 1.24 support is ready!
This is the non-WIP version of #7111 which got kicked off due to #7093 (but it does not contain those changes, this is just roughly the minimum needed for 1.24).

Library changes

This migrates a relative few mocks to github.com/vektra/mockery/v3, because v2 doesn't support Go 1.24+.
The good news is that it's MUCH faster now, and more flexible, though only for a few types.

If vektra/mockery#1030 gets accepted, we could do the same for our go.uber.org/mock mocks, but currently the license is questionable in the fork (for CNCF purposes) and the changes are non-trivial. So getting mockery to accept it (which might involve go.uber.org/mock accepting it) is likely the best route, for a variety of reasons.

go.uber.org/mock's upgrade seems mostly harmless and I was hoping it'd solve some of the test failures (it did not), so I've just left it in. Unfortunately it actually makes mock-codegen worse, ~1 arg per mock function on some types is renamed from something useful to arg0 or arg4 (position varies). I have no idea why that happens, but it doesn't seem too critical to maintain, and it's stable so it's not a codegen concern.

github.com/ncruces/go-sqlite3 has a minimal upgrade to support go 1.24, as we were getting segfaults and wasm panics without the upgrade. We could upgrade it to latest, but I'm holding off on that for the moment because it might be harder to achieve in our monorepo :| (apologies to OSS folks)

Groxx · 2025-09-09T04:39:22Z

bench/load/signal/workflow.go

 				signalDelayCount++
 				if signalDelayCount > params.MaxSignalDelayCount {
-					return fmt.Errorf(fmt.Sprintf("received %v signals are longer than %v seconds.", params.MaxSignalDelayCount, params.MaxSignalDelayInSeconds))
+					return fmt.Errorf("received %v signals are longer than %v seconds", params.MaxSignalDelayCount, params.MaxSignalDelayInSeconds)


new vet check, required to compile tests.

Groxx · 2025-09-09T04:44:26Z

common/messaging/metrics_producer_test.go

 				metricsScope := &mocks.Scope{}
 				metricsClient.
-					On("Scope", metrics.MessagingClientPublishScope, metrics.TopicTag("test-topic-1")).
+					On("Scope", metrics.MessagingClientPublishScope, []metrics.Tag{metrics.TopicTag("test-topic-1")}).


pickier about types, it seems.
this doesn't change between On and EXPECT().Method.

given that the codegen knows this is a varargs, I think this is probably a codegen/mock-library gap that should be fixed. but we have few uses so it's really not a blocker for us.

Groxx · 2025-09-09T04:45:05Z

common/reconciliation/invariant/stale_workflow.go

 	})
 	if err != nil {
-		return false, c.failed("failed to get concrete execution record", err.Error())
+		return false, c.failed("failed to get concrete execution record", "%v", err)


also forced by the new vet check. it detects calls through funcs! neat.

Groxx · 2025-09-09T04:45:33Z

docker/github_actions/Dockerfile

    && rm -rf /var/lib/apt/lists/*

-RUN pip install cqlsh
+RUN pip install cqlsh --break-system-packages


so glad python started forcing this

Groxx · 2025-09-09T04:47:34Z

service/history/execution/mutable_state_task_generator_test.go

-	seed := int64(1)
-	rand.Seed(seed)


https://tip.golang.org/doc/go1.24#mathrandpkgmathrand

Calls to the deprecated top-level Seed function no longer have any effect. To restore the old behavior use GODEBUG setting randseednop=0. For more background see proposal #67273.

we have a few other seed calls, but they don't seem to be load-bearing like the ones in this test were.
so I just worked around this with a custom (sadly verbose) matcher.

Groxx · 2025-09-09T04:48:41Z

Dockerfile


 # Build Cadence binaries
-FROM golang:1.23.4-alpine3.21 AS builder
+FROM golang:1.24.7-alpine3.21 AS builder


I tried a bit to convert our github-action to alpine too, but hit too many barriers and gave up fairly quickly :|

probably doesn't matter if the actions/setup-go ones are debian/ubuntu? though.

yeah, as long as the images are cached, debian's honestly usually a little easier to work with

Groxx · 2025-09-09T04:50:30Z

Makefile


 # lints that go modules are as expected, e.g. parent does not import submodule.
 # tool builds that need to be in sync with the parent are partially checked through go_mod_build_tool, but should probably be checked here too
-$(BUILD)/gomod-lint: go.mod internal/tools/go.mod common/archiver/gcloud/go.mod | $(BUILD)


was missing a couple

Groxx · 2025-09-09T04:51:44Z

Makefile

-	$Q # tidy in dependency order
+	$Q # tidy needs to run in dependency order:
+	$Q # everything depends on the main module, server depends on everything else so it should be last.
+	$Q # but we can just tidy everything 2x, which should be stable as our dependency tree is only 2 deep.


tried to come up with a different approach, but nothing seemed more reliable than "just run it twice lol". and we can easily increase it if we ever have a 3-deep chain, still without caring about their dependency orders - reruns are generally less than a second so it hardly matters.

Groxx · 2025-09-09T04:55:41Z

common/resource/resource_mock.go


 // GetRemoteAdminClient mocks base method.
-func (m *MockResource) GetRemoteAdminClient(cluster string) (admin.Client, error) {
+func (m *MockResource) GetRemoteAdminClient(arg0 string) (admin.Client, error) {


this is one of those "worse codegen from gomock" cases

Groxx · 2025-09-09T04:56:57Z

service/history/shard/context_mock.go


 // UpdateTimerProcessingQueueStates mocks base method.
-func (m *MockContext) UpdateTimerProcessingQueueStates(cluster string, states []*types.ProcessingQueueState) error {
+func (m *MockContext) UpdateTimerProcessingQueueStates(arg0 string, states []*types.ProcessingQueueState) error {


see, this one changes the first, not the second, while others change the second but not the first.

if it wasn't stable, I'd be concerned, but it re-gens the same every time so...

Groxx · 2025-09-09T04:59:28Z

service/history/shard/context_mock.go


 // GetQueueClusterAckLevel mocks base method.
-func (m *MockContext) GetQueueClusterAckLevel(category persistence.HistoryTaskCategory, cluster string) persistence.HistoryTaskKey {
+func (m *MockContext) GetQueueClusterAckLevel(category persistence.HistoryTaskCategory, arg1 string) persistence.HistoryTaskKey {


changes the second, not the first

Signed-off-by: Steven L <[email protected]>

davidporter-id-au · 2025-09-12T18:00:12Z

.mockery.yml

@@ -0,0 +1,85 @@
+all: false


nice, is this intended to be comprehensive or it's just some problematic ones?

"all" is for whether it'll generate mocks of every interface it discovers, or if it's an explicit list (below). e.g. you could use it for "all" in a subdir, if it always contained interfaces you wanted to mock (like an "interfaces" dir).

I don't think we'll ever get even close to wanting that tho :)

davidporter-id-au · 2025-09-12T18:03:51Z

Makefile

-	$Q cd common/archiver/gcloud; go mod tidy || (echo "failed to tidy gcloud plugin, try manually copying go.mod contents into common/archiver/gcloud/go.mod and rerunning" >&2; exit 1)
-	$Q cd cmd/server; go mod tidy || (echo "failed to tidy main server module, try manually copying go.mod and common/archiver/gcloud/go.mod contents into cmd/server/go.mod and rerunning" >&2; exit 1)
+	$Q $(foreach sub,$(SUBMODULE_PATHS), \
+		$Q cd $(sub); go mod tidy || $$(>&2 echo "failed to tidy $(sub) plugin, try manually copying go.mod contents into $(sub)/go.mod and rerunning by hand"; exit 1)$(NEWLINE) \


no change requested, but this is getting into probably-should-be-a-script territory in future.

davidporter-id-au · 2025-09-12T18:05:03Z

cmd/tools/copyright/licensegen.go

-// to the source files. Usage as follows:
-//
-//	./cmd/tools/copyright/licensegen.go
-func main() {


what's the story with this? I wasn't following along, do we not need it?

mostly just leftovers from #6882 which isn't very descriptive. but it has been completely disabled since that point.

AFAICT legal finally got back to us and said

yea you just need a LICENSE file, stuff on each file never had any legal impact
(aside from cases where you need to carry along attribution/etc).

so it was just legal-cargo-culting all along.

davidporter-id-au

lgtm, just wondering what the deal is with the license gen helper, we don't need it?

davidporter-id-au · 2025-09-12T18:11:43Z

also there's some check stuff failing, but unsure what the deal was there

common/blobstore/client_mock.go

common/archiver/provider/provider_mock.go

required changing a couple mocks and regenerating a bit, but nothing major Signed-off-by: Steven L <[email protected]>

Signed-off-by: Steven L <[email protected]>

Groxx requested review from Shaddoll, neil-xie, davidporter-id-au, shijiesheng, jakobht, 3vilhamster, sankari165, dkrotx, taylanisikdemir and demirkayaender as code owners September 9, 2025 01:06

Groxx force-pushed the mockery-v3 branch from f33bf7e to 8af0c51 Compare September 9, 2025 02:11

Groxx commented Sep 9, 2025

View reviewed changes

re-commit to sign for DCO

a8f5caa

Signed-off-by: Steven L <[email protected]>

Groxx force-pushed the mockery-v3 branch from 2cd5585 to a8f5caa Compare September 12, 2025 00:42

davidporter-id-au reviewed Sep 12, 2025

View reviewed changes

davidporter-id-au approved these changes Sep 12, 2025

View reviewed changes

Groxx commented Sep 24, 2025

View reviewed changes

common/blobstore/client_mock.go Show resolved Hide resolved

Groxx commented Sep 24, 2025

View reviewed changes

common/archiver/provider/provider_mock.go Show resolved Hide resolved

Groxx added 2 commits September 24, 2025 16:24

Merge branch 'master' into mockery-v3

63732d4

required changing a couple mocks and regenerating a bit, but nothing major Signed-off-by: Steven L <[email protected]>

apparently I had forgotten to commit before that experiment, oops

c530841

Signed-off-by: Steven L <[email protected]>

Groxx force-pushed the mockery-v3 branch from 8ed6924 to c530841 Compare September 24, 2025 21:25

Groxx added 2 commits September 24, 2025 16:33

fix makefile for non-direnv setups

80742ad

Signed-off-by: Steven L <[email protected]>

undoing two mock generator changes, not relevant

617128f

Signed-off-by: Steven L <[email protected]>

Groxx force-pushed the mockery-v3 branch from 5658797 to 617128f Compare September 24, 2025 22:35

upgrade sqlite/wazero, lots of memory corruptions it seems

184813a

Signed-off-by: Steven L <[email protected]>

Groxx force-pushed the mockery-v3 branch from 37daaff to 184813a Compare September 24, 2025 23:38

Merge branch 'master' into mockery-v3-old

86ce064

Groxx changed the title ~~Upgrade Go to 1.24, and upgrade mockery, x/tools~~ Upgrade Go to 1.24, and upgrade mockery, x/tools, sqlite Sep 25, 2025

Groxx requested a review from davidporter-id-au September 30, 2025 18:07

Merge branch 'master' into mockery-v3-old

7569570

Groxx changed the title ~~Upgrade Go to 1.24, and upgrade mockery, x/tools, sqlite~~ upgrade: Go 1.24, and mockery, x/tools, sqlite to support it Sep 30, 2025

Groxx changed the title ~~upgrade: Go 1.24, and mockery, x/tools, sqlite to support it~~ chore: Go 1.24, and mockery, x/tools, sqlite to support it Sep 30, 2025

davidporter-id-au approved these changes Oct 1, 2025

View reviewed changes

chore: Go 1.24, and mockery, x/tools, sqlite to support it #7244

Are you sure you want to change the base?

chore: Go 1.24, and mockery, x/tools, sqlite to support it #7244

Uh oh!

Conversation

Groxx commented Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Library changes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Groxx Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Groxx Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Groxx Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Groxx Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Groxx Sep 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Groxx Sep 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

davidporter-id-au left a comment

Choose a reason for hiding this comment

Uh oh!

davidporter-id-au commented Sep 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Groxx commented Sep 9, 2025 •

edited

Loading

Groxx Sep 9, 2025 •

edited

Loading

Groxx Sep 9, 2025 •

edited

Loading

Groxx Sep 9, 2025 •

edited

Loading

Groxx Sep 9, 2025 •

edited

Loading

Groxx Sep 24, 2025 •

edited

Loading

Groxx Sep 24, 2025 •

edited

Loading