=tes #15228 backport - metricskit fix for racy graphite client (for validation)

Port of #15228 from master to 2.3-dev