Skip to content

fix(timeShift): dont append nil results #925

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

Merged
deniszh merged 1 commit into from
Feb 5, 2026
Merged

fix(timeShift): dont append nil results #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions expr/functions/timeShift/function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ func (f *timeShift) Do(ctx context.Context, eval interfaces.Evaluator, e parser.
if err != nil {
return nil, err
}
results := make([]*types.MetricData, len(arg))
results := make([]*types.MetricData, 0, len(arg))

for n, a := range arg {
for _, a := range arg {
r := a.CopyLink()
r.Name = "timeShift(" + a.Name + ",'" + offsStr + "'," + resetEndStr + ")"
r.StartTime = a.StartTime - int64(offs)
Expand All @@ -110,7 +110,7 @@ func (f *timeShift) Do(ctx context.Context, eval interfaces.Evaluator, e parser.
r.Values = r.Values[:length]

r.Tags["timeshift"] = fmt.Sprintf("%d", offs)
results[n] = r
results = append(results, r)

}

Expand Down
10 changes: 10 additions & 0 deletions expr/functions/timeShift/function_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ func TestTimeShift(t *testing.T) {
From: startTime,
Until: startTime + 6,
},
{
// Data starts at 205 but fetch requests 200-202, so we have no data for the series, expecting an empty result
Target: `timeShift(metric1, "+100s", true)`,
M: map[parser.MetricRequest][]*types.MetricData{
{Metric: "metric1", From: 200, Until: 202}: {types.MakeMetricData("metric1", []float64{0, 1, 2, 3, 4, 5}, 1, 205)},
},
Want: []*types.MetricData{},
From: 100,
Until: 102,
},
}

for _, tt := range tests {
Expand Down
Loading