Skip to content

Commit 54cd5b3

Browse files
authored
exp/metrics: evict only stale (#33265)
**Description:** fixes broken check in eviction behavior such that it only evicts actually stale metrics. this was already attempted in #33015, but was insufficient **Testing:** tests were added
1 parent f7be511 commit 54cd5b3

File tree

3 files changed

+66
-1
lines changed

3 files changed

+66
-1
lines changed

.chloggen/fix-staleness-evict.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: exp/metrics
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: fixes staleness.Evict such that it only ever evicts actually stale metrics
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [33265]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user,api]

internal/exp/metrics/staleness/staleness.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (s *Staleness[T]) Next() time.Time {
9090

9191
func (s *Staleness[T]) Evict() (identity.Stream, bool) {
9292
_, ts := s.pq.Peek()
93-
if ts.Add(s.Max).Before(time.Now()) {
93+
if NowFunc().Sub(ts) < s.Max {
9494
return identity.Stream{}, false
9595
}
9696

internal/exp/metrics/staleness/staleness_test.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,41 @@ func validateStalenessMapEntries(t *testing.T, expected map[identity.Stream]int,
9292
})
9393
require.Equal(t, expected, actual)
9494
}
95+
96+
func TestEvict(t *testing.T) {
97+
now := 0
98+
NowFunc = func() time.Time {
99+
return time.Unix(int64(now), 0)
100+
}
101+
102+
stale := NewStaleness(1*time.Minute, make(streams.HashMap[int]))
103+
104+
now = 10
105+
idA := generateStreamID(t, map[string]any{"aaa": "123"})
106+
err := stale.Store(idA, 0)
107+
require.NoError(t, err)
108+
109+
now = 20
110+
idB := generateStreamID(t, map[string]any{"bbb": "456"})
111+
err = stale.Store(idB, 1)
112+
require.NoError(t, err)
113+
114+
require.Equal(t, 2, stale.Len())
115+
116+
// nothing stale yet, must not evict
117+
_, ok := stale.Evict()
118+
require.False(t, ok)
119+
require.Equal(t, 2, stale.Len())
120+
121+
// idA stale
122+
now = 71
123+
gone, ok := stale.Evict()
124+
require.True(t, ok)
125+
require.NotZero(t, gone)
126+
require.Equal(t, 1, stale.Len())
127+
128+
// idB not yet stale
129+
_, ok = stale.Evict()
130+
require.False(t, ok)
131+
require.Equal(t, 1, stale.Len())
132+
}

0 commit comments

Comments
 (0)