🐛 Address review comments: restore expect.txt, fix stored fields, fix… #17124

Job	Run time
go-test	4m 12s
golangci-lint	1m 53s
go-mod	32s
Store event file	3s
golangci-lint-providers / lint	2m 32s
go-test-integration	36s
go-race	50s
go-auto-approve	0s
	10m 38s

Provide feedback