@@ -171,8 +171,6 @@ replace (

 	github.com/armon/go-radix => github.com/armon/go-radix v0.0.0-20150105235045-e39d623f12e8

 	github.com/hashicorp/go-msgpack => github.com/hashicorp/go-msgpack v0.0.0-20140221154404-71c2886f5a67

 	github.com/hashicorp/serf => github.com/hashicorp/serf v0.7.1-0.20160317193612-598c54895cc5

-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.6.0

-	github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.11

 )

 // Removes etcd dependency

@@ -114,7 +114,9 @@ github.com/akutz/gosync v0.1.0 h1:naxPT/aDYDh79PMwM3XmencmNQeYmpNFSZy4ZE9zIW0=

 github.com/akutz/gosync v0.1.0/go.mod h1:I8I4aiqJI1nqaeYOOB1WS+CgRJVVPqhct9Y4njywM84=

 github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A=

 github.com/akutz/memconn v0.1.0/go.mod h1:Jo8rI7m0NieZyLI5e2CDlRdRqRRB4S7Xp77ukDjH+Fw=

+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=

 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=

@@ -133,6 +135,8 @@ github.com/aws/aws-sdk-go v1.31.6 h1:nKjQbpXhdImctBh1e0iLg9iQW/X297LPPuY/9f92R2k

 github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=

 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=

 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=

 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=

@@ -347,6 +351,7 @@ github.com/deckarep/golang-set v0.0.0-20141123011944-ef32fa3046d9/go.mod h1:93vs

 github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=

 github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=

 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=

 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=

 github.com/docker/cli v20.10.13+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=

@@ -425,8 +430,10 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9

 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=

 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=

 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=

+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=

 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=

 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=

+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=

 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=

 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=

 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=

@@ -469,6 +476,7 @@ github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/

 github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=

 github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=

 github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=

+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=

 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=

 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=

 github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=

@@ -661,7 +669,6 @@ github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqo

 github.com/jsimonetti/rtnetlink v0.0.0-20201110080708-d2c240429e6c/go.mod h1:huN4d1phzjhlOsNIjFsw2SVRbwIHj3fJDMEU2SDPTmg=

 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=

 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=

@@ -780,6 +787,7 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA

 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=

 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=

 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=

 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

@@ -852,6 +860,7 @@ github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee h1:P6U24L02WMfj9ym

 github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee/go.mod h1:3uODdxMgOaPYeWU7RzZLxVtJHZ/x1f/iHkBZuKJDzuY=

 github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ=

 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=

+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

 github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

@@ -860,21 +869,45 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb

 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=

 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=

-github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A=

-github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=

+github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=

+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=

+github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=

+github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=

+github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=

+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=

 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=

+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=

+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=

 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

 github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=

-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=

+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=

+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=

+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=

+github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=

 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=

 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=

 github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=

 github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=

 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=

-github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=

-github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=

+github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=

+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=

+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=

+github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=

+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=

+github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=

+github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=

+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=

+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=

+github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=

+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=

+github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=

+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=

+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=

 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=

 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=

 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

@@ -1151,6 +1184,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r

 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

 golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

@@ -1259,6 +1293,7 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w

 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

+golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

@@ -1287,12 +1322,12 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w

 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

-golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

@@ -1331,6 +1366,7 @@ golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7w

 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

 golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

 golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

@@ -1 +1 @@

-See [![go-doc](https://godoc.org/github.com/prometheus/client_golang/prometheus?status.svg)](https://godoc.org/github.com/prometheus/client_golang/prometheus).

+See [![Go Reference](https://pkg.go.dev/badge/github.com/prometheus/client_golang/prometheus.svg)](https://pkg.go.dev/github.com/prometheus/client_golang/prometheus).

deleted file mode 100644

@@ -1,29 +0,0 @@

-// Copyright 2019 The Prometheus Authors

-// Licensed under the Apache License, Version 2.0 (the "License");

-// you may not use this file except in compliance with the License.

-// You may obtain a copy of the License at

-//

-// http://www.apache.org/licenses/LICENSE-2.0

-//

-// Unless required by applicable law or agreed to in writing, software

-// distributed under the License is distributed on an "AS IS" BASIS,

-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-// See the License for the specific language governing permissions and

-// limitations under the License.

-

-// +build go1.12

-

-package prometheus

-

-import "runtime/debug"

-

-// readBuildInfo is a wrapper around debug.ReadBuildInfo for Go 1.12+.

-func readBuildInfo() (path, version, sum string) {

-	path, version, sum = "unknown", "unknown", "unknown"

-	if bi, ok := debug.ReadBuildInfo(); ok {

-		path = bi.Main.Path

-		version = bi.Main.Version

-		sum = bi.Main.Sum

-	}

-	return

-}

new file mode 100644

@@ -0,0 +1,38 @@

+// Copyright 2021 The Prometheus Authors

+// Licensed under the Apache License, Version 2.0 (the "License");

+// you may not use this file except in compliance with the License.

+// You may obtain a copy of the License at

+//

+// http://www.apache.org/licenses/LICENSE-2.0

+//

+// Unless required by applicable law or agreed to in writing, software

+// distributed under the License is distributed on an "AS IS" BASIS,

+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+// See the License for the specific language governing permissions and

+// limitations under the License.

+

+package prometheus

+

+import "runtime/debug"

+

+// NewBuildInfoCollector is the obsolete version of collectors.NewBuildInfoCollector.

+// See there for documentation.

+//

+// Deprecated: Use collectors.NewBuildInfoCollector instead.

+func NewBuildInfoCollector() Collector {

+	path, version, sum := "unknown", "unknown", "unknown"

+	if bi, ok := debug.ReadBuildInfo(); ok {

+		path = bi.Main.Path

+		version = bi.Main.Version

+		sum = bi.Main.Sum

+	}

+	c := &selfCollector{MustNewConstMetric(

+		NewDesc(

+			"go_build_info",

+			"Build information about the main Go module.",

+			nil, Labels{"path": path, "version": version, "checksum": sum},

+		),

+		GaugeValue, 1)}

+	c.init(c.self)

+	return c

+}

deleted file mode 100644

@@ -1,22 +0,0 @@

-// Copyright 2019 The Prometheus Authors

-// Licensed under the Apache License, Version 2.0 (the "License");

-// you may not use this file except in compliance with the License.

-// You may obtain a copy of the License at

-//

-// http://www.apache.org/licenses/LICENSE-2.0

-//

-// Unless required by applicable law or agreed to in writing, software

-// distributed under the License is distributed on an "AS IS" BASIS,

-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-// See the License for the specific language governing permissions and

-// limitations under the License.

-

-// +build !go1.12

-

-package prometheus

-

-// readBuildInfo is a wrapper around debug.ReadBuildInfo for Go versions before

-// 1.12. Remove this whole file once the minimum supported Go version is 1.12.

-func readBuildInfo() (path, version, sum string) {

-	return "unknown", "unknown", "unknown"

-}

@@ -118,3 +118,11 @@ func (c *selfCollector) Describe(ch chan<- *Desc) {

 func (c *selfCollector) Collect(ch chan<- Metric) {

 	ch <- c.self

 }

+

+// collectorMetric is a metric that is also a collector.

+// Because of selfCollector, most (if not all) Metrics in

+// this package are also collectors.

+type collectorMetric interface {

+	Metric

+	Collector

+}

@@ -133,10 +133,14 @@ func (c *counter) Inc() {

 	atomic.AddUint64(&c.valInt, 1)

 }

-func (c *counter) Write(out *dto.Metric) error {

+func (c *counter) get() float64 {

 	fval := math.Float64frombits(atomic.LoadUint64(&c.valBits))

 	ival := atomic.LoadUint64(&c.valInt)

-	val := fval + float64(ival)

+	return fval + float64(ival)

+}

+

+func (c *counter) Write(out *dto.Metric) error {

+	val := c.get()

 	var exemplar *dto.Exemplar

 	if e := c.exemplar.Load(); e != nil {

@@ -163,7 +167,7 @@ func (c *counter) updateExemplar(v float64, l Labels) {

 // (e.g. number of HTTP requests, partitioned by response code and

 // method). Create instances with NewCounterVec.

 type CounterVec struct {

-	*metricVec

+	*MetricVec

 }

 // NewCounterVec creates a new CounterVec based on the provided CounterOpts and

@@ -176,11 +180,11 @@ func NewCounterVec(opts CounterOpts, labelNames []string) *CounterVec {

 		opts.ConstLabels,

 	)

 	return &CounterVec{

-		metricVec: newMetricVec(desc, func(lvs ...string) Metric {

+		MetricVec: NewMetricVec(desc, func(lvs ...string) Metric {

 			if len(lvs) != len(desc.variableLabels) {

 				panic(makeInconsistentCardinalityError(desc.fqName, desc.variableLabels, lvs))

 			}

-			result := &counter{desc: desc, labelPairs: makeLabelPairs(desc, lvs), now: time.Now}

+			result := &counter{desc: desc, labelPairs: MakeLabelPairs(desc, lvs), now: time.Now}

 			result.init(result) // Init self-collection.

 			return result

 		}),

@@ -188,7 +192,7 @@ func NewCounterVec(opts CounterOpts, labelNames []string) *CounterVec {

 }

 // GetMetricWithLabelValues returns the Counter for the given slice of label

-// values (same order as the VariableLabels in Desc). If that combination of

+// values (same order as the variable labels in Desc). If that combination of

 // label values is accessed for the first time, a new Counter is created.

 //

 // It is possible to call this method without using the returned Counter to only

@@ -202,7 +206,7 @@ func NewCounterVec(opts CounterOpts, labelNames []string) *CounterVec {

 // Counter with the same label values is created later.

 //

 // An error is returned if the number of label values is not the same as the

-// number of VariableLabels in Desc (minus any curried labels).

+// number of variable labels in Desc (minus any curried labels).

 //

 // Note that for more than one label value, this method is prone to mistakes

 // caused by an incorrect order of arguments. Consider GetMetricWith(Labels) as

@@ -211,7 +215,7 @@ func NewCounterVec(opts CounterOpts, labelNames []string) *CounterVec {

 // with a performance overhead (for creating and processing the Labels map).

 // See also the GaugeVec example.

 func (v *CounterVec) GetMetricWithLabelValues(lvs ...string) (Counter, error) {

-	metric, err := v.metricVec.getMetricWithLabelValues(lvs...)

+	metric, err := v.MetricVec.GetMetricWithLabelValues(lvs...)

 	if metric != nil {

 		return metric.(Counter), err

 	}

@@ -219,19 +223,19 @@ func (v *CounterVec) GetMetricWithLabelValues(lvs ...string) (Counter, error) {

 }

 // GetMetricWith returns the Counter for the given Labels map (the label names

-// must match those of the VariableLabels in Desc). If that label map is

+// must match those of the variable labels in Desc). If that label map is

 // accessed for the first time, a new Counter is created. Implications of

 // creating a Counter without using it and keeping the Counter for later use are

 // the same as for GetMetricWithLabelValues.

 //

 // An error is returned if the number and names of the Labels are inconsistent

-// with those of the VariableLabels in Desc (minus any curried labels).

+// with those of the variable labels in Desc (minus any curried labels).

 //

 // This method is used for the same purpose as

 // GetMetricWithLabelValues(...string). See there for pros and cons of the two

 // methods.

 func (v *CounterVec) GetMetricWith(labels Labels) (Counter, error) {

-	metric, err := v.metricVec.getMetricWith(labels)

+	metric, err := v.MetricVec.GetMetricWith(labels)

 	if metric != nil {

 		return metric.(Counter), err

 	}

@@ -275,7 +279,7 @@ func (v *CounterVec) With(labels Labels) Counter {

 // registered with a given registry (usually the uncurried version). The Reset

 // method deletes all metrics, even if called on a curried vector.

 func (v *CounterVec) CurryWith(labels Labels) (*CounterVec, error) {

-	vec, err := v.curryWith(labels)

+	vec, err := v.MetricVec.CurryWith(labels)

 	if vec != nil {

 		return &CounterVec{vec}, err

 	}

@@ -20,6 +20,7 @@ import (

 	"strings"

 	"github.com/cespare/xxhash/v2"

+	//nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.

 	"github.com/golang/protobuf/proto"

 	"github.com/prometheus/common/model"

@@ -50,7 +51,7 @@ type Desc struct {

 	// constLabelPairs contains precalculated DTO label pairs based on

 	// the constant labels.

 	constLabelPairs []*dto.LabelPair

-	// VariableLabels contains names of labels for which the metric

+	// variableLabels contains names of labels for which the metric

 	// maintains variable values.

 	variableLabels []string

 	// id is a hash of the values of the ConstLabels and fqName. This

@@ -22,43 +22,10 @@ type expvarCollector struct {

 	exports map[string]*Desc

 }

-// NewExpvarCollector returns a newly allocated expvar Collector that still has

-// to be registered with a Prometheus registry.

+// NewExpvarCollector is the obsolete version of collectors.NewExpvarCollector.

+// See there for documentation.

 //

-// An expvar Collector collects metrics from the expvar interface. It provides a

-// quick way to expose numeric values that are already exported via expvar as

-// Prometheus metrics. Note that the data models of expvar and Prometheus are

-// fundamentally different, and that the expvar Collector is inherently slower

-// than native Prometheus metrics. Thus, the expvar Collector is probably great

-// for experiments and prototying, but you should seriously consider a more

-// direct implementation of Prometheus metrics for monitoring production

-// systems.

-//

-// The exports map has the following meaning:

-//

-// The keys in the map correspond to expvar keys, i.e. for every expvar key you

-// want to export as Prometheus metric, you need an entry in the exports

-// map. The descriptor mapped to each key describes how to export the expvar

-// value. It defines the name and the help string of the Prometheus metric

-// proxying the expvar value. The type will always be Untyped.

-//

-// For descriptors without variable labels, the expvar value must be a number or

-// a bool. The number is then directly exported as the Prometheus sample

-// value. (For a bool, 'false' translates to 0 and 'true' to 1). Expvar values

-// that are not numbers or bools are silently ignored.

-//

-// If the descriptor has one variable label, the expvar value must be an expvar

-// map. The keys in the expvar map become the various values of the one

-// Prometheus label. The values in the expvar map must be numbers or bools again

-// as above.

-//

-// For descriptors with more than one variable label, the expvar must be a

-// nested expvar map, i.e. where the values of the topmost map are maps again

-// etc. until a depth is reached that corresponds to the number of labels. The

-// leaves of that structure must be numbers or bools as above to serve as the

-// sample values.

-//

-// Anything that does not fit into the scheme above is silently ignored.

+// Deprecated: Use collectors.NewExpvarCollector instead.

 func NewExpvarCollector(exports map[string]*Desc) Collector {

 	return &expvarCollector{

 		exports: exports,

@@ -132,7 +132,7 @@ func (g *gauge) Write(out *dto.Metric) error {

 // (e.g. number of operations queued, partitioned by user and operation

 // type). Create instances with NewGaugeVec.

 type GaugeVec struct {

-	*metricVec

+	*MetricVec

 }

 // NewGaugeVec creates a new GaugeVec based on the provided GaugeOpts and

@@ -145,11 +145,11 @@ func NewGaugeVec(opts GaugeOpts, labelNames []string) *GaugeVec {

 		opts.ConstLabels,

 	)

 	return &GaugeVec{

-		metricVec: newMetricVec(desc, func(lvs ...string) Metric {

+		MetricVec: NewMetricVec(desc, func(lvs ...string) Metric {

 			if len(lvs) != len(desc.variableLabels) {

 				panic(makeInconsistentCardinalityError(desc.fqName, desc.variableLabels, lvs))

 			}

-			result := &gauge{desc: desc, labelPairs: makeLabelPairs(desc, lvs)}

+			result := &gauge{desc: desc, labelPairs: MakeLabelPairs(desc, lvs)}

 			result.init(result) // Init self-collection.

 			return result

 		}),

@@ -157,7 +157,7 @@ func NewGaugeVec(opts GaugeOpts, labelNames []string) *GaugeVec {

 }

 // GetMetricWithLabelValues returns the Gauge for the given slice of label

-// values (same order as the VariableLabels in Desc). If that combination of

+// values (same order as the variable labels in Desc). If that combination of

 // label values is accessed for the first time, a new Gauge is created.

 //

 // It is possible to call this method without using the returned Gauge to only

@@ -172,7 +172,7 @@ func NewGaugeVec(opts GaugeOpts, labelNames []string) *GaugeVec {

 // example.

 //

 // An error is returned if the number of label values is not the same as the

-// number of VariableLabels in Desc (minus any curried labels).

+// number of variable labels in Desc (minus any curried labels).

 //

 // Note that for more than one label value, this method is prone to mistakes

 // caused by an incorrect order of arguments. Consider GetMetricWith(Labels) as

@@ -180,7 +180,7 @@ func NewGaugeVec(opts GaugeOpts, labelNames []string) *GaugeVec {

 // latter has a much more readable (albeit more verbose) syntax, but it comes

 // with a performance overhead (for creating and processing the Labels map).

 func (v *GaugeVec) GetMetricWithLabelValues(lvs ...string) (Gauge, error) {

-	metric, err := v.metricVec.getMetricWithLabelValues(lvs...)

+	metric, err := v.MetricVec.GetMetricWithLabelValues(lvs...)

 	if metric != nil {

 		return metric.(Gauge), err

 	}

@@ -188,19 +188,19 @@ func (v *GaugeVec) GetMetricWithLabelValues(lvs ...string) (Gauge, error) {

 }

 // GetMetricWith returns the Gauge for the given Labels map (the label names

-// must match those of the VariableLabels in Desc). If that label map is

+// must match those of the variable labels in Desc). If that label map is

 // accessed for the first time, a new Gauge is created. Implications of

 // creating a Gauge without using it and keeping the Gauge for later use are

 // the same as for GetMetricWithLabelValues.

 //

 // An error is returned if the number and names of the Labels are inconsistent

-// with those of the VariableLabels in Desc (minus any curried labels).

+// with those of the variable labels in Desc (minus any curried labels).

 //

 // This method is used for the same purpose as

 // GetMetricWithLabelValues(...string). See there for pros and cons of the two

 // methods.

 func (v *GaugeVec) GetMetricWith(labels Labels) (Gauge, error) {

-	metric, err := v.metricVec.getMetricWith(labels)

+	metric, err := v.MetricVec.GetMetricWith(labels)

 	if metric != nil {

 		return metric.(Gauge), err

 	}

@@ -244,7 +244,7 @@ func (v *GaugeVec) With(labels Labels) Gauge {

 // registered with a given registry (usually the uncurried version). The Reset

 // method deletes all metrics, even if called on a curried vector.

 func (v *GaugeVec) CurryWith(labels Labels) (*GaugeVec, error) {

-	vec, err := v.curryWith(labels)

+	vec, err := v.MetricVec.CurryWith(labels)

 	if vec != nil {

 		return &GaugeVec{vec}, err

 	}

@@ -16,53 +16,209 @@ package prometheus

 import (

 	"runtime"

 	"runtime/debug"

-	"sync"

 	"time"

 )

-type goCollector struct {

+func goRuntimeMemStats() memStatsMetrics {

+	return memStatsMetrics{

+		{

+			desc: NewDesc(

+				memstatNamespace("alloc_bytes"),

+				"Number of bytes allocated and still in use.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Alloc) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("alloc_bytes_total"),

+				"Total number of bytes allocated, even if freed.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.TotalAlloc) },

+			valType: CounterValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("sys_bytes"),

+				"Number of bytes obtained from system.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Sys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("lookups_total"),

+				"Total number of pointer lookups.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Lookups) },

+			valType: CounterValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("mallocs_total"),

+				"Total number of mallocs.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Mallocs) },

+			valType: CounterValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("frees_total"),

+				"Total number of frees.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Frees) },

+			valType: CounterValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("heap_alloc_bytes"),

+				"Number of heap bytes allocated and still in use.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapAlloc) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("heap_sys_bytes"),

+				"Number of heap bytes obtained from system.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapSys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("heap_idle_bytes"),

+				"Number of heap bytes waiting to be used.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapIdle) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("heap_inuse_bytes"),

+				"Number of heap bytes that are in use.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapInuse) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("heap_released_bytes"),

+				"Number of heap bytes released to OS.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapReleased) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("heap_objects"),

+				"Number of allocated objects.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapObjects) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("stack_inuse_bytes"),

+				"Number of bytes in use by the stack allocator.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.StackInuse) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("stack_sys_bytes"),

+				"Number of bytes obtained from system for stack allocator.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.StackSys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("mspan_inuse_bytes"),

+				"Number of bytes in use by mspan structures.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MSpanInuse) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("mspan_sys_bytes"),

+				"Number of bytes used for mspan structures obtained from system.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MSpanSys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("mcache_inuse_bytes"),

+				"Number of bytes in use by mcache structures.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MCacheInuse) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("mcache_sys_bytes"),

+				"Number of bytes used for mcache structures obtained from system.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.MCacheSys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("buck_hash_sys_bytes"),

+				"Number of bytes used by the profiling bucket hash table.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.BuckHashSys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("gc_sys_bytes"),

+				"Number of bytes used for garbage collection system metadata.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.GCSys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("other_sys_bytes"),

+				"Number of bytes used for other system allocations.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.OtherSys) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("next_gc_bytes"),

+				"Number of heap bytes when next garbage collection will take place.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return float64(ms.NextGC) },

+			valType: GaugeValue,

+		}, {

+			desc: NewDesc(

+				memstatNamespace("gc_cpu_fraction"),

+				"The fraction of this program's available CPU time used by the GC since the program started.",

+				nil, nil,

+			),

+			eval:    func(ms *runtime.MemStats) float64 { return ms.GCCPUFraction },

+			valType: GaugeValue,

+		},

+	}

+}

+

+type baseGoCollector struct {

 	goroutinesDesc *Desc

 	threadsDesc    *Desc

 	gcDesc         *Desc

+	gcLastTimeDesc *Desc

 	goInfoDesc     *Desc

-

-	// ms... are memstats related.

-	msLast          *runtime.MemStats // Previously collected memstats.

-	msLastTimestamp time.Time

-	msMtx           sync.Mutex // Protects msLast and msLastTimestamp.

-	msMetrics       memStatsMetrics

-	msRead          func(*runtime.MemStats) // For mocking in tests.

-	msMaxWait       time.Duration           // Wait time for fresh memstats.

-	msMaxAge        time.Duration           // Maximum allowed age of old memstats.

 }

-// NewGoCollector returns a collector that exports metrics about the current Go

-// process. This includes memory stats. To collect those, runtime.ReadMemStats

-// is called. This requires to “stop the world”, which usually only happens for

-// garbage collection (GC). Take the following implications into account when

-// deciding whether to use the Go collector:

-//

-// 1. The performance impact of stopping the world is the more relevant the more

-// frequently metrics are collected. However, with Go1.9 or later the

-// stop-the-world time per metrics collection is very short (~25µs) so that the

-// performance impact will only matter in rare cases. However, with older Go

-// versions, the stop-the-world duration depends on the heap size and can be

-// quite significant (~1.7 ms/GiB as per

-// https://go-review.googlesource.com/c/go/+/34937).

-//

-// 2. During an ongoing GC, nothing else can stop the world. Therefore, if the

-// metrics collection happens to coincide with GC, it will only complete after

-// GC has finished. Usually, GC is fast enough to not cause problems. However,

-// with a very large heap, GC might take multiple seconds, which is enough to

-// cause scrape timeouts in common setups. To avoid this problem, the Go

-// collector will use the memstats from a previous collection if

-// runtime.ReadMemStats takes more than 1s. However, if there are no previously

-// collected memstats, or their collection is more than 5m ago, the collection

-// will block until runtime.ReadMemStats succeeds. (The problem might be solved

-// in Go1.13, see https://github.com/golang/go/issues/19812 for the related Go

-// issue.)

-func NewGoCollector() Collector {

-	return &goCollector{

+func newBaseGoCollector() baseGoCollector {

+	return baseGoCollector{

 		goroutinesDesc: NewDesc(

 			"go_goroutines",

 			"Number of goroutines that currently exist.",

@@ -75,243 +231,28 @@ func NewGoCollector() Collector {

 			"go_gc_duration_seconds",

 			"A summary of the pause duration of garbage collection cycles.",

 			nil, nil),

+		gcLastTimeDesc: NewDesc(

+			memstatNamespace("last_gc_time_seconds"),

+			"Number of seconds since 1970 of last garbage collection.",

+			nil, nil),

 		goInfoDesc: NewDesc(

 			"go_info",

 			"Information about the Go environment.",

 			nil, Labels{"version": runtime.Version()}),

-		msLast:    &runtime.MemStats{},

-		msRead:    runtime.ReadMemStats,

-		msMaxWait: time.Second,

-		msMaxAge:  5 * time.Minute,

-		msMetrics: memStatsMetrics{

-			{

-				desc: NewDesc(

-					memstatNamespace("alloc_bytes"),

-					"Number of bytes allocated and still in use.",

-					nil, nil,

-				),

-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Alloc) },

-				valType: GaugeValue,

-			}, {

-				desc: NewDesc(

-					memstatNamespace("alloc_bytes_total"),

-					"Total number of bytes allocated, even if freed.",

-					nil, nil,

-				),

-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.TotalAlloc) },

-				valType: CounterValue,

-			}, {

-				desc: NewDesc(

-					memstatNamespace("sys_bytes"),

-					"Number of bytes obtained from system.",

-					nil, nil,

-				),

-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Sys) },

-				valType: GaugeValue,

-			}, {

-				desc: NewDesc(

-					memstatNamespace("lookups_total"),

-					"Total number of pointer lookups.",

-					nil, nil,

-				),

-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Lookups) },

-				valType: CounterValue,

-			}, {

-				desc: NewDesc(

-					memstatNamespace("mallocs_total"),

-					"Total number of mallocs.",

-					nil, nil,

-				),

-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Mallocs) },

-				valType: CounterValue,

-			}, {

-				desc: NewDesc(

-					memstatNamespace("frees_total"),

-					"Total number of frees.",

-					nil, nil,

-				),

-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.Frees) },

-				valType: CounterValue,

-			}, {

-				desc: NewDesc(

-					memstatNamespace("heap_alloc_bytes"),

-					"Number of heap bytes allocated and still in use.",

-					nil, nil,

-				),

-				eval:    func(ms *runtime.MemStats) float64 { return float64(ms.HeapAlloc) },

-				valType: GaugeValue,

-			}, {

-				desc: NewDesc(

-					memstatNamespace("heap_sys_bytes"),