Skip to content

Commit

Permalink
chore: add changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
Vihas Splunk committed Aug 18, 2023
1 parent 4e5dead commit 1e3c11e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
27 changes: 27 additions & 0 deletions .chloggen/add-threadpool-featuregate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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: fileconsumer

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Added a new feature gate that enables a thread pool mechanism to respect the poll_interval parameter.

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

# (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:

# 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: []
3 changes: 2 additions & 1 deletion pkg/stanza/fileconsumer/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ type Manager struct {

// Following fields are used only when useThreadPool is enabled
workerWg sync.WaitGroup
_workerWg sync.WaitGroup
knownFilesLock sync.RWMutex

readerChan chan readerWrapper
Expand Down Expand Up @@ -116,11 +115,13 @@ func (m *Manager) startPoller(ctx context.Context) {
return
case <-globTicker.C:
}

m.poll(ctx)
}
}()
}

// poll checks all the watched paths for new entries
func (m *Manager) poll(ctx context.Context) {
if useThreadPool.IsEnabled() {
m.pollConcurrent(ctx)
Expand Down
3 changes: 1 addition & 2 deletions pkg/stanza/fileconsumer/file_threadpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
type readerWrapper struct {
reader *reader
fp *fingerprint.Fingerprint
path string
}

func (m *Manager) kickoffThreads(ctx context.Context) {
Expand Down Expand Up @@ -126,7 +125,7 @@ func (m *Manager) consumeConcurrent(ctx context.Context, paths []string) {
m.trieLock.Lock()
m.trie.Put(fp.FirstBytes)
m.trieLock.Unlock()
m.readerChan <- readerWrapper{reader: reader, fp: fp, path: path}
m.readerChan <- readerWrapper{reader: reader, fp: fp}
}
}
}
Expand Down

0 comments on commit 1e3c11e

Please sign in to comment.