-
Notifications
You must be signed in to change notification settings - Fork 83
in_prometheus: do not disclosure error details for client #259
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
Open
kenhys
wants to merge
2
commits into
fluent:master
Choose a base branch
from
kenhys:suppress-exception
base: master
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.
+250
−2
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 |
|---|---|---|
|
|
@@ -36,10 +36,16 @@ class PrometheusInput < Fluent::Plugin::Input | |
| desc 'Content encoding of the exposed metrics, Currently supported encoding is identity, gzip. Ref: https://prometheus.io/docs/instrumenting/exposition_formats/#basic-info' | ||
| config_param :content_encoding, :enum, list: [:identity, :gzip], default: :identity | ||
|
|
||
| desc 'Suppress repeated error logs in a certain period of time (1h) or until message was changed' | ||
| config_param :ignore_error_log_interval, :integer, default: 3600 | ||
|
|
||
| def initialize | ||
| super | ||
| @registry = ::Prometheus::Client.registry | ||
| @secure = nil | ||
| @error_log_mutex = Mutex.new | ||
| @last_error_log_at = nil | ||
| @last_error_log = nil | ||
| end | ||
|
|
||
| def configure(conf) | ||
|
|
@@ -210,7 +216,8 @@ def start_webrick | |
| def all_metrics | ||
| response(::Prometheus::Client::Formats::Text.marshal(@registry)) | ||
| rescue => e | ||
| [500, { 'Content-Type' => 'text/plain' }, e.to_s] | ||
| log_error_throttled("in_prometheus: failed to render metrics", error: e) | ||
| [500, { 'Content-Type' => 'text/plain' }, "in_prometheus server error: <#{e.class}>"] | ||
| end | ||
|
|
||
| def all_workers_metrics | ||
|
|
@@ -223,7 +230,8 @@ def all_workers_metrics | |
| end | ||
| response(full_result.get_metrics) | ||
| rescue => e | ||
| [500, { 'Content-Type' => 'text/plain' }, e.to_s] | ||
| log_error_throttled("in_prometheus: failed to render workers metrics", error: e) | ||
| [500, { 'Content-Type' => 'text/plain' }, "in_prometheus server error: <#{e.class}>"] | ||
| end | ||
|
|
||
| def send_request_to_each_worker | ||
|
|
@@ -271,5 +279,21 @@ def response(metrics) | |
| end | ||
| [200, { 'Content-Type' => ::Prometheus::Client::Formats::Text::CONTENT_TYPE, 'Content-Encoding' => @content_encoding.to_s }, body] | ||
| end | ||
|
|
||
| def log_error_throttled(message, error:) | ||
| emit = @error_log_mutex.synchronize do | ||
| now = Fluent::Clock.now | ||
| if @last_error_log_at.nil? || | ||
| ((now - @last_error_log_at) >= @ignore_error_log_interval || | ||
| @last_error_log != [message, error.class, error.message]) | ||
| @last_error_log_at = now | ||
| @last_error_log = [message, error.class, error.message] | ||
| true | ||
| end | ||
| end | ||
| return unless emit | ||
|
|
||
| log.error message, error_class: error.class, error: error | ||
| end | ||
|
Comment on lines
+283
to
+297
Contributor
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. Since this method might be called from two places( |
||
| end | ||
| end | ||
This file contains hidden or 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.
If use
:timetype, it allow to configure withignore_error_log_interval 1hin user config file.