Skip to content

fix: make DayValue serialization timezone stable #1114

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.

Sign up for GitHub

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

Open
princejha95 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix: make DayValue serialization timezone stable #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fd7d66
fix: make DayValue serialization timezone stable
princejha95 Apr 24, 2026
4d59c7e
Merge branch 'master' into fix/day-test-ut
thunguo Apr 25, 2026
c9bb4ae
Merge branch 'master' into fix/day-test-ut
ssshr-66 May 23, 2026
aa954fa
Merge branch 'master' into fix/day-test-ut
ssshr-66 Jun 5, 2026
59b8168
Merge branch 'master' into fix/day-test-ut
ssshr-66 Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/dev.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

- [[#130](https://github.com/apache/incubator-seata-go/pull/130)] getty session auto close bug
- [[#991](https://github.com/apache/incubator-seata-go/issues/991)] fix connection leaks and prevent nil pointer panic in async worker
- [[#887](https://github.com/apache/incubator-seata-go/issues/887)] make DayValue serialization timezone-stable

### optimize：

Expand Down
8 changes: 6 additions & 2 deletions pkg/util/flagext/day.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ type DayValue struct {
set bool
}

func (v DayValue) utcTime() time.Time {
return v.Time.Time().UTC()
}

// NewDayValue makes a new DayValue; will round t down to the nearest midnight.
func NewDayValue(t model.Time) DayValue {
return DayValue{
Expand All @@ -42,7 +46,7 @@ func NewDayValue(t model.Time) DayValue {

// String implements flag.Value
func (v DayValue) String() string {
return v.Time.Time().Format(time.RFC3339)
return v.utcTime().Format(time.RFC3339)
}

// Set implements flag.Value
Expand Down Expand Up @@ -72,5 +76,5 @@ func (v *DayValue) UnmarshalYAML(unmarshal func(interface{}) error) error {

// MarshalYAML implements yaml.Marshaler.
func (v DayValue) MarshalYAML() (interface{}, error) {
return v.Time.Time().Format("2006-01-02"), nil
return v.utcTime().Format("2006-01-02"), nil
}
31 changes: 31 additions & 0 deletions pkg/util/flagext/day_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package flagext

import (
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -63,6 +64,36 @@ func TestDayValueYAML(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, expected, actual)

var actualStruct TestStruct
err = yaml.Unmarshal(expected, &actualStruct)
require.NoError(t, err)
assert.Equal(t, testStruct, actualStruct)
}
// Test UTC-stable string and YAML serialization in western timezones.
{
loc, err := time.LoadLocation("America/Los_Angeles")
if err != nil {
Comment on lines +72 to +75

Copilot AI Apr 25, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment says this block tests "UTC-stable string and YAML serialization", but the test only asserts YAML marshal/unmarshal output and never checks DayValue.String(). Either add an assertion for the String() output under the modified time.Local, or adjust the comment to only mention YAML serialization to keep the test intent accurate.

Copilot uses AI. Check for mistakes.
loc = time.FixedZone("UTC-8", -8*60*60)
}

originalLocal := time.Local
time.Local = loc
defer func() {
time.Local = originalLocal
}()
type TestStruct struct {
Day *DayValue `yaml:"day"`
}
var testStruct TestStruct
testStruct.Day = &DayValue{}
require.NoError(t, testStruct.Day.Set("1985-06-02"))
expected := []byte(`day: "1985-06-02"
`)

actual, err := yaml.Marshal(testStruct)
require.NoError(t, err)
assert.Equal(t, expected, actual)
Comment on lines +84 to +95

Copilot AI Apr 25, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new timezone-specific YAML test duplicates the prior "pointers of DayValue" block almost line-for-line. Consider making the pointer test table-driven (e.g., parameterize the location) or extracting a small helper to reduce duplication and make future additions (more timezones) easier.

Copilot uses AI. Check for mistakes.

var actualStruct TestStruct
err = yaml.Unmarshal(expected, &actualStruct)
require.NoError(t, err)
Expand Down
Loading