Prevent caching of PDH counter instances by default #2654
Merged
Conversation
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
Codecov Report
@@ Coverage Diff @@
## master #2654 +/- ##
==========================================
- Coverage 84.72% 76.42% -8.31%
==========================================
Files 662 45 -617
Lines 37611 3313 -34298
Branches 4507 387 -4120
==========================================
- Hits 31867 2532 -29335
+ Misses 4428 684 -3744
+ Partials 1316 97 -1219 |
|
About the benchmarks:
|
Closed
gzussa
reviewed
Dec 28, 2018
| @@ -182,3 +138,51 @@ def check(self, instance): | |||
| except Exception as e: | |||
| # don't give up on all of the metrics because one failed | |||
| self.log.error("Failed to get data for %s %s: %s" % (inst_name, dd_name, str(e))) | |||
|
|
|||
| def _make_counters(self, key, counter_data): | |||
| @@ -167,8 +115,16 @@ def __init__(self, name, init_config, agentConfig, instances, counter_list): | |||
| def check(self, instance): | |||
| self.log.debug("PDHBaseCheck: check()") | |||
| key = hash_mutable(instance) | |||
| refresh_counters = is_affirmative(instance.get('refresh_counters', True)) | |||
|
|
|||
| if refresh_counters: | |||
There was a problem hiding this comment.
Why are we having this in the check method now?
There was a problem hiding this comment.
behind flag in case someone encounters perf issues
|
|
||
| entry = [inst_name, dd_name, m, obj] | ||
| self.log.debug('{}: {}'.format(message, entry)) | ||
| self._metrics[key].append(entry) |
There was a problem hiding this comment.
Because of this method usage at https://github.com/DataDog/integrations-core/pull/2654/files#diff-14769541de478cc114862b41f3cdcfe2R122 , isn't it a risk that the key won't exist?
There was a problem hiding this comment.
Key will always exist
gzussa
approved these changes
Dec 28, 2018
ofek
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
Some checks' counters may change frequently e.g. active VMs
Benchmarks
https://ci.appveyor.com/project/Datadog/integrations-core/builds/20973815#L868
It looks like the change has near linear scaling: on mocks and real setups it's about up to 3 times slower compared to caching everything forever. The timing for each case seems to simply depend on the number of counter instances.
hyperv w/ 2 VMs running:
active_directory w/ our mocks
aspdotnet w/ our mocks
dotnetclr w/ our mocks
exchange_server w/ our mocks
iis on appveyor
pdh_check w/ our mocks