-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
graphite: refactor error handling #1263
Draft
ifireice
wants to merge
6
commits into
prometheus:main
Choose a base branch
from
ifireice:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
707a767
graphite: refactor error handling
ifireice c18237f
remove line
ifireice b64fe48
fix test
ifireice a7ff852
fix test
ifireice 8bc9621
added support backward compatibility
ifireice b801f06
fix ErrorCallbackFunc
ifireice 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
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 |
---|---|---|
|
@@ -79,6 +79,9 @@ type Config struct { | |
// logged regardless of the configured ErrorHandling provided Logger | ||
// is not nil. | ||
ErrorHandling HandlerErrorHandling | ||
|
||
// ErrorCallbackFunc is a callback function that can be executed when error is occurred | ||
ErrorCallbackFunc ErrorCallbackFunc | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍🏽 |
||
} | ||
|
||
// Bridge pushes metrics to the configured Graphite server. | ||
|
@@ -89,8 +92,9 @@ type Bridge struct { | |
interval time.Duration | ||
timeout time.Duration | ||
|
||
errorHandling HandlerErrorHandling | ||
logger Logger | ||
errorHandling HandlerErrorHandling | ||
errorCallbackFunc ErrorCallbackFunc | ||
logger Logger | ||
|
||
g prometheus.Gatherer | ||
} | ||
|
@@ -102,6 +106,9 @@ type Logger interface { | |
Println(v ...interface{}) | ||
} | ||
|
||
// ErrorCallbackFunc is a special type for callback functions | ||
type ErrorCallbackFunc func(error) | ||
|
||
// NewBridge returns a pointer to a new Bridge struct. | ||
func NewBridge(c *Config) (*Bridge, error) { | ||
b := &Bridge{} | ||
|
@@ -142,6 +149,10 @@ func NewBridge(c *Config) (*Bridge, error) { | |
|
||
b.errorHandling = c.ErrorHandling | ||
|
||
if c.ErrorCallbackFunc != nil { | ||
b.errorCallbackFunc = c.ErrorCallbackFunc | ||
} | ||
|
||
return b, nil | ||
} | ||
|
||
|
@@ -164,19 +175,29 @@ func (b *Bridge) Run(ctx context.Context) { | |
|
||
// Push pushes Prometheus metrics to the configured Graphite server. | ||
func (b *Bridge) Push() error { | ||
mfs, err := b.g.Gather() | ||
if err != nil || len(mfs) == 0 { | ||
switch b.errorHandling { | ||
case AbortOnError: | ||
return err | ||
case ContinueOnError: | ||
if b.logger != nil { | ||
b.logger.Println("continue on error:", err) | ||
} | ||
default: | ||
panic("unrecognized error handling value") | ||
err := b.push() | ||
if b.errorCallbackFunc != nil { | ||
b.errorCallbackFunc(err) | ||
} | ||
switch b.errorHandling { | ||
case AbortOnError: | ||
return err | ||
case ContinueOnError: | ||
if b.logger != nil { | ||
b.logger.Println("continue on error:", err) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it would be safe to leave that panic in, especially if we would add validation to NewBridge for it, WDYT? |
||
} | ||
} | ||
return nil | ||
} | ||
|
||
func (b *Bridge) push() error { | ||
mfs, err := b.g.Gather() | ||
if err != nil { | ||
return err | ||
} | ||
if len(mfs) == 0 { | ||
return nil | ||
} | ||
|
||
conn, err := net.DialTimeout("tcp", b.url, b.timeout) | ||
if err != nil { | ||
|
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
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.
Hm, we can't have another package main here 🤔