Skip to content
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

refactor: removed concurrent retry for failed log messages #58

Merged
merged 1 commit into from
Oct 28, 2021
Merged

refactor: removed concurrent retry for failed log messages #58

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
14 changes: 1 addition & 13 deletions telemetry/fluent-bit/fluent_bit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"context"
"net/http"
"sync"
"time"

"github.com/containerish/OpenRegistry/config"
Expand All @@ -17,10 +16,8 @@ type (
}

fluentBit struct {
wg sync.WaitGroup
client *http.Client
retryMessages map[string]retryLogMsg
gate chan struct{}
config *config.RegistryConfig
}

Expand All @@ -39,8 +36,6 @@ func New(config *config.RegistryConfig) (FluentBit, error) {
fbClient := &fluentBit{
client: httpClient,
config: config,
wg: sync.WaitGroup{},
gate: make(chan struct{}, 5),
retryMessages: make(map[string]retryLogMsg),
}

Expand Down Expand Up @@ -101,19 +96,12 @@ func (fb *fluentBit) retry() {
// lets not do more than 5 req/second just to not flood our free instance of grafana cloud
for range ticker.C {
for id, logMsg := range fb.retryMessages {
fb.gate <- struct{}{}
fb.wg.Add(1)
go fb.retrier(logMsg.content, id)
fb.retrier(logMsg.content, id)
}
}
}

func (fb *fluentBit) retrier(logBytes []byte, id string) {
defer func() {
fb.wg.Done()
<-fb.gate
}()

// TODO - (@jay-dee7) what to do then? maybe have a different way to ship these logs? like via promtail?
if msg, ok := fb.retryMessages[id]; ok && msg.count > 3 {
delete(fb.retryMessages, id)
Expand Down