-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.
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
[processor/deltatocumulative]: expire stale series #31337
Merged
jpkrohling
merged 23 commits into
open-telemetry:main
from
sh0rez:deltatocumulative-stale
Mar 5, 2024
Merged
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
e2d6090
deltatocumulative: use exp/metrics/identity
sh0rez 3657ffa
deltatocumulative: use exp/metrics/streams.Map
sh0rez d596be2
*: cherry-pick staleness
sh0rez 1d98dca
deltatocumulative: staleness map
sh0rez 7745b7e
metrics/staleness: synchronization
sh0rez 502f602
deltatocumulative: expire stale series
sh0rez 4fcb984
deltatocumulative: context lifecycle
sh0rez 479c2db
stale: separate tracking, expiry and locking
sh0rez d13d239
*: forward to main
sh0rez fdc6dd5
*: post-merge fixes
sh0rez c7a21d0
*: forward to main
sh0rez 613e62c
staleness: remove errornous time.Now
sh0rez 1f7d219
*: linter fixes
sh0rez 764b61c
*: docs
sh0rez 031543a
*: linter fixes
sh0rez 918fd06
*: changelog
sh0rez 495d14f
*: high-level locking
sh0rez 2df76bf
*: linter fixes
sh0rez 52962cf
staleness: linter fixes
sh0rez 6eef719
streams: TestExpiry
sh0rez 2165561
*: forward to main
sh0rez 7da74c8
*: forward to main
sh0rez 9b6a61e
clock: sync fake
sh0rez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# Use this changelog template to create an entry for release notes. | ||
|
||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
change_type: "enhancement" | ||
|
||
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) | ||
component: "deltatocumulativeprocessor" | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: expire stale series | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [30705, 31016] | ||
|
||
# (Optional) One or more lines of additional information to render under the primary note. | ||
# These lines will be padded with 2 spaces and then inserted directly into the document. | ||
# Use pipe (|) for multiline entries. | ||
subtext: | | ||
Adds `max_stale` option that allows to set an interval (default = `5min`) | ||
after which a series that no longer receives new samples is removed from | ||
tracking. | ||
|
||
# If your change doesn't affect end users or the exported elements of any package, | ||
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
# Optional: The change log or logs in which this entry should be included. | ||
# e.g. '[user]' or '[user, api]' | ||
# Include 'user' if the change is relevant to end users. | ||
# Include 'api' if there is a change to a library API. | ||
# Default: '[user]' | ||
change_logs: [user] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package streams // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/streams" | ||
|
||
import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/identity" | ||
|
||
// Sequence of streams that can be iterated upon | ||
type Seq[T any] func(yield func(identity.Stream, T) bool) bool | ||
|
||
// Map defines a collection of items tracked by a stream-id and the operations | ||
// on it | ||
type Map[T any] interface { | ||
Load(identity.Stream) (T, bool) | ||
Store(identity.Stream, T) error | ||
Delete(identity.Stream) | ||
Items() func(yield func(identity.Stream, T) bool) bool | ||
Len() int | ||
} | ||
|
||
var _ Map[any] = HashMap[any](nil) | ||
|
||
type HashMap[T any] map[identity.Stream]T | ||
|
||
func (m HashMap[T]) Load(id identity.Stream) (T, bool) { | ||
v, ok := (map[identity.Stream]T)(m)[id] | ||
return v, ok | ||
} | ||
|
||
func (m HashMap[T]) Store(id identity.Stream, v T) error { | ||
(map[identity.Stream]T)(m)[id] = v | ||
return nil | ||
} | ||
|
||
func (m HashMap[T]) Delete(id identity.Stream) { | ||
delete((map[identity.Stream]T)(m), id) | ||
} | ||
|
||
func (m HashMap[T]) Items() func(yield func(identity.Stream, T) bool) bool { | ||
return func(yield func(identity.Stream, T) bool) bool { | ||
for id, v := range (map[identity.Stream]T)(m) { | ||
if !yield(id, v) { | ||
break | ||
} | ||
} | ||
return false | ||
} | ||
} | ||
|
||
func (m HashMap[T]) Len() int { | ||
return len((map[identity.Stream]T)(m)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch