Skip to content

Commit

Permalink
[processor/deltatocumulative]: timer-based expiry (#31625)
Browse files Browse the repository at this point in the history
**Description:** Moves from complex preemptive expiry to a plain 1
minute timer

**Link to tracking Issue:**
#31615 (comment)

Resolves
#31615
  • Loading branch information
sh0rez authored Mar 6, 2024
1 parent 2f614ef commit 9929562
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 304 deletions.
28 changes: 28 additions & 0 deletions .chloggen/deltatocumulative-timer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: "bug_fix"

# 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: timer-based expiry

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [31615]

# (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: |
converts expiry to 1m timer, eliminating a race condition and failing test
# 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]
94 changes: 0 additions & 94 deletions processor/deltatocumulativeprocessor/internal/clock/clock.go

This file was deleted.

32 changes: 0 additions & 32 deletions processor/deltatocumulativeprocessor/internal/clock/clock_test.go

This file was deleted.

60 changes: 0 additions & 60 deletions processor/deltatocumulativeprocessor/internal/streams/expiry.go

This file was deleted.

100 changes: 0 additions & 100 deletions processor/deltatocumulativeprocessor/internal/streams/expiry_test.go

This file was deleted.

39 changes: 21 additions & 18 deletions processor/deltatocumulativeprocessor/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import (
"context"
"errors"
"sync"
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/processor"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics/staleness"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/data"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/delta"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/metrics"
Expand All @@ -29,8 +31,8 @@ type Processor struct {
ctx context.Context
cancel context.CancelFunc

aggr streams.Aggregator[data.Number]
exp *streams.Expiry[data.Number]
aggr streams.Aggregator[data.Number]
stale *staleness.Staleness[data.Number]

mtx sync.Mutex
}
Expand All @@ -49,32 +51,33 @@ func newProcessor(cfg *Config, log *zap.Logger, next consumer.Metrics) *Processo
dps = delta.New[data.Number]()

if cfg.MaxStale > 0 {
exp := streams.ExpireAfter(dps, cfg.MaxStale)
proc.exp = &exp
dps = &exp
stale := staleness.NewStaleness(cfg.MaxStale, dps)
proc.stale = stale
dps = stale
}

proc.aggr = streams.IntoAggregator(dps)
return &proc
}

func (p *Processor) Start(_ context.Context, _ component.Host) error {
if p.exp != nil {
go func() {
for {
if p.stale == nil {
return nil
}

go func() {
tick := time.NewTicker(time.Minute)
for {
select {
case <-p.ctx.Done():
return
case <-tick.C:
p.mtx.Lock()
next := p.exp.ExpireOldEntries()
p.stale.ExpireOldEntries()
p.mtx.Unlock()

select {
case <-next:
case <-p.ctx.Done():
return
}
}
}()
}

}
}()
return nil
}

Expand Down

0 comments on commit 9929562

Please sign in to comment.