Merge "Update metrics to use weaved's client library"