-
Notifications
You must be signed in to change notification settings - Fork 814
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
Remove utils that are available in datadog_checks #3750
Conversation
6e300dc
to
6422847
Compare
f5356e9
to
044bd54
Compare
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.
Well done!
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.
reviewed very quickly, didn't notice anything wrong 👍 I'll ask for a second pair of eyes from croissant.
Do you have a plan to test these changes?
@olivielpeau I was able to build the Agent and tested the imports continue to work on Windows and Linux specifically. Could someone from croissant take another pass? Would love to get this merged for the next minor release. |
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.
LGTM!
This PR should be safe to merge because Nick has been able to confirm that:
- all checks in 5.25 are already importing from these utils from datadog_checks_base
- except wmi_check, which has been updated on master, and for which Nick's double checked the related wmi utils in datadog_checks_base are up-to-date with the ones in dd-agent
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.
Looks good! 👍
Note: Please remember to review the Datadog Contribution Guidelines
if you have not yet done so.
What does this PR do?
Remove a lot of code that is already available in datadog_checks_base.
Motivation
Keep only one set of code to make things easier to update.
Testing Guidelines
An overview on testing
is available in our contribution guidelines.
Additional Notes
The way the imports work on the datadog_checks lib means that in order to test the wmi checks, it requires the win32 extension to be available. So we now conditionally import the wmi_calculator stuff so that it will pass if it doesn't exist. This should cause the tests to fail if we are on a windows machine, but be properly skipped if we aren't (had to do this to get Travis to be 🆗 )
This PR assumes this is in datadog-checks-base DataDog/integrations-core#1897