ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2024-12-27 07:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Be more verbose in error messages

Browse Source
This commit is contained in:
Holger Obermaier 2023-10-05 17:22:30 +02:00
parent 9dae829f9d
commit 94c88f23df
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sinks/httpSink.go
View File

@ -153,7 +153,7 @@ func (s *HttpSink) Write(m lp.CCMetric) error {
// Check that encoding worked // Check that encoding worked
if err != nil { if err != nil {
cclog.ComponentError(s.name, "encoding failed:", err.Error()) cclog.ComponentError(s.name, "Write(): Encoding failed:", err)
return err return err
} }
@ -168,7 +168,7 @@ func (s *HttpSink) Write(m lp.CCMetric) error {
// Stop flush timer if possible // Stop flush timer if possible
if s.flushTimer != nil { if s.flushTimer != nil {
if ok := s.flushTimer.Stop(); ok { if ok := s.flushTimer.Stop(); ok {
cclog.ComponentDebug(s.name, "Stopped flush timer. Batch size limit reached before flush delay") cclog.ComponentDebug(s.name, "Write(): Stopped flush timer. Batch size limit reached before flush delay")
s.timerLock.Unlock() s.timerLock.Unlock()
} }
} }
@ -187,12 +187,12 @@ func (s *HttpSink) Write(m lp.CCMetric) error {
if s.flushTimer != nil { if s.flushTimer != nil {
// Restarting existing flush timer // Restarting existing flush timer
cclog.ComponentDebug(s.name, "Restarting flush timer") cclog.ComponentDebug(s.name, "Write(): Restarting flush timer")
s.flushTimer.Reset(s.config.flushDelay) s.flushTimer.Reset(s.config.flushDelay)
} else { } else {
// Creating and starting flush timer // Creating and starting flush timer
cclog.ComponentDebug(s.name, "Starting new flush timer") cclog.ComponentDebug(s.name, "Write(): Starting new flush timer")
s.flushTimer = time.AfterFunc( s.flushTimer = time.AfterFunc(
s.config.flushDelay, s.config.flushDelay,
func() { func() {
@ -228,14 +228,14 @@ func (s *HttpSink) Flush() error {
return nil return nil
} }
cclog.ComponentDebug(s.name, "Flushing", recordCount, "records") cclog.ComponentDebug(s.name, "Flush(): Flushing", recordCount, "records")
var res *http.Response var res *http.Response
for i := 0; i < s.config.MaxRetries; i++ { for i := 0; i < s.config.MaxRetries; i++ {
// Create new request to send buffer // Create new request to send buffer
req, err := http.NewRequest(http.MethodPost, s.config.URL, bytes.NewReader(buf)) req, err := http.NewRequest(http.MethodPost, s.config.URL, bytes.NewReader(buf))
if err != nil { if err != nil {
cclog.ComponentError(s.name, "failed to create request:", err.Error()) cclog.ComponentError(s.name, "Flush(): Failed to create HTTP request:", err)
return err return err
} }
@ -252,7 +252,7 @@ func (s *HttpSink) Flush() error {
// Do request // Do request
res, err = s.client.Do(req) res, err = s.client.Do(req)
if err != nil { if err != nil {
cclog.ComponentError(s.name, "transport/tcp error:", err.Error()) cclog.ComponentError(s.name, "Flush(): transport/tcp error:", err)
// Wait between retries // Wait between retries
time.Sleep(time.Duration(i+1) * (time.Second / 2)) time.Sleep(time.Duration(i+1) * (time.Second / 2))
continue continue
@ -268,7 +268,7 @@ func (s *HttpSink) Flush() error {
// Handle application errors // Handle application errors
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
err := errors.New(res.Status) err := errors.New(res.Status)
cclog.ComponentError(s.name, "application error:", err.Error()) cclog.ComponentError(s.name, "Flush(): Application error:", err)
return err return err
} }
@ -283,7 +283,7 @@ func (s *HttpSink) Close() {
} }
} }
if err := s.Flush(); err != nil { if err := s.Flush(); err != nil {
cclog.ComponentError(s.name, "flush failed:", err.Error()) cclog.ComponentError(s.name, "Close(): Flush failed:", err)
} }
// Wait for flush operations to finish // Wait for flush operations to finish
@ -303,7 +303,7 @@ func NewHttpSink(name string, config json.RawMessage) (Sink, error) {
s.config.BatchSize = 1000 s.config.BatchSize = 1000
s.config.FlushDelay = "5s" s.config.FlushDelay = "5s"
s.config.MaxRetries = 3 s.config.MaxRetries = 3
cclog.ComponentDebug(s.name, "init") cclog.ComponentDebug(s.name, "Init()")
// Read config // Read config
if len(config) > 0 { if len(config) > 0 {
@ -330,7 +330,7 @@ func NewHttpSink(name string, config json.RawMessage) (Sink, error) {
if len(s.config.IdleConnTimeout) > 0 { if len(s.config.IdleConnTimeout) > 0 {
t, err := time.ParseDuration(s.config.IdleConnTimeout) t, err := time.ParseDuration(s.config.IdleConnTimeout)
if err == nil { if err == nil {
cclog.ComponentDebug(s.name, "idleConnTimeout", t) cclog.ComponentDebug(s.name, "Init(): idleConnTimeout", t)
s.config.idleConnTimeout = t s.config.idleConnTimeout = t
} }
} }
@ -338,14 +338,14 @@ func NewHttpSink(name string, config json.RawMessage) (Sink, error) {
t, err := time.ParseDuration(s.config.Timeout) t, err := time.ParseDuration(s.config.Timeout)
if err == nil { if err == nil {
s.config.timeout = t s.config.timeout = t
cclog.ComponentDebug(s.name, "timeout", t) cclog.ComponentDebug(s.name, "Init(): timeout", t)
} }
} }
if len(s.config.FlushDelay) > 0 { if len(s.config.FlushDelay) > 0 {
t, err := time.ParseDuration(s.config.FlushDelay) t, err := time.ParseDuration(s.config.FlushDelay)
if err == nil { if err == nil {
s.config.flushDelay = t s.config.flushDelay = t
cclog.ComponentDebug(s.name, "flushDelay", t) cclog.ComponentDebug(s.name, "Init(): flushDelay", t)
} }
} }
@ -362,5 +362,6 @@ func NewHttpSink(name string, config json.RawMessage) (Sink, error) {
s.encoder.SetPrecision(influx.Nanosecond) s.encoder.SetPrecision(influx.Nanosecond)
s.encoderRecordCount = 0 s.encoderRecordCount = 0
s.extended_tag_list = make([]key_value_pair, 0) s.extended_tag_list = make([]key_value_pair, 0)
return s, nil return s, nil
} }