PdhExpandWildCardPathW will not expand counter paths in 32 bit windows systems #12622
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
…y exceptions in 32 bit windows systems. Awrokaround was built using PdhExpandCounterPathW function instead.
jsoriano
reviewed
Jun 20, 2019
| @@ -74,9 +75,10 @@ func NewReader(config Config) (*Reader, error) { | |||
| return nil, errors.Wrapf(err, `failed to expand counter (query="%v")`, counter.Query) | |||
| } | |||
| } | |||
| if childQueries == nil || len(childQueries) == 0 { | |||
| // check if the pdhexpandcounterpath/pdhexpandwildcardpath functions have expanded the counter successfully. | |||
| if childQueries == nil || len(childQueries) == 0 || (len(childQueries) == 1 && strings.Contains(childQueries[0], "*")) { | |||
There was a problem hiding this comment.
Is it not possible that a wildcard expands to a single path?
There was a problem hiding this comment.
@jsoriano , yes that should be possible but the path should not still contain the wildcard "*", this is why the condition (len(childQueries) == 1 && strings.Contains(childQueries[0], "*"). Am I missing something here?
There was a problem hiding this comment.
Oh ok, sorry, I misunderstood, all good.
jsoriano
approved these changes
Jun 24, 2019
Co-Authored-By: Jaime Soriano Pastor <jaime.soriano@elastic.co>
jsoriano
approved these changes
Jun 24, 2019
| query.Close() | ||
| return nil, errors.Wrapf(err, `failed to expand counter (query="%v")`, counter.Query) |
There was a problem hiding this comment.
Good catch here btw 🙂 I guess it was failing silently before? (errors.Wrap(nil) returns nil)
There was a problem hiding this comment.
@jsoriano , yes, found it while running the tests.
|
jenkins, test this |
1 similar comment
|
jenkins, test this |
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.
PdhExpandWildCardPathW will not expand wildcard counter paths in 32 bit windows systems and will not return any exceptions.
The path list will only contain the initial counter query will pass the following validation rules in reader.go.
A workaround has been built using PdhExpandCounterPathW function instead which seems to return the list of counter paths and extra validation has been added.
Will still keep using PdhExpandWildCardPathW for 62 bit systems as this function supersedes PdhExpandCounterPathW.
Also, fixed the perfmon tests failing on the 32 bit systems.
Should fix #12590