Always build the procfs collector. #103
Merged
Conversation
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
The cgo dependency in the "procfs" package is being removed in: prometheus/procfs#4 So now it should be fine to always import the "procfs" package and have it determine dynamically at runtime whether the proc filesystem is actually there. This fixes a problem for users which were vendoring client_golang on MacOS X, but building the result on Linux (the procfs package was missing in the vendored packages).
|
Should we merge the two process_collector files now? |
|
@brian-brazil I don't feel strongly. I added a second commit to merge the files, let's see how you like it :) |
|
👍 |
2 similar comments
|
👍 |
|
👍 |
juliusv
added a commit
that referenced
this pull request
Mar 31, 2015
Always build the procfs collector.
There was a problem hiding this comment.
This indirection isn't really necessary anymore. You can replace the if processCollectSupported with the condition above.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The cgo dependency in the "procfs" package is being removed in:
prometheus/procfs#4
So now it should be fine to always import the "procfs" package and have
it determine dynamically at runtime whether the proc filesystem is
actually there.
This fixes a problem for users which were vendoring client_golang on
MacOS X, but building the result on Linux (the procfs package was
missing in the vendored packages).