Merge "Adding more labels to Prometheus metrics"