refactor and fix curl metrics

[sbiscigl]

Issue #, if available:

issues/2883

Description of changes:

There were some more inconsistencies in curl metrics not initially brought up in the ticket, this fixes them

Check all that applies:

• [x] Did a review by yourself.
• [x] Added proper tests to cover this PR. (If tests are not applicable, explain.)
• [x] Checked if this PR is a breaking (APIs have been changed) change.
• [x] Checked if this PR will not introduce cross-platform inconsistent behavior.
• [x] Checked if this PR would require a ReadMe/Wiki update.

Check which platforms you have built SDK on to verify the correctness of this PR.

• [x] Linux
• [x] Windows
• [ ] Android
• [x] MacOS
• [ ] IOS
• [ ] Other Platforms

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.