Merge pull request #432 from prometheus/beorn7/release

Cut v1.4.2

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.4.2 / 2021-10-11
+
+* [BUGFIX] Do not log an error upon graceful shutdown. #428
+* [BUGFIX] Update dependencies to pull in possibly relevant bugfixes.
+
 ## 1.4.1 / 2021-05-28
 
 * [BUGFIX] Persist labels properly when draining. #404

VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

asset/asset.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build dev
 // +build dev
 
 package asset

asset/asset_generate.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

asset/assets_vfsdata.go

@@ -1,5 +1,6 @@
 // Code generated by vfsgen; DO NOT EDIT.
 
+//go:build !dev
 // +build !dev
 
 package asset
@@ -25,7 +26,7 @@ var Assets = func() http.FileSystem {
 		},
 		"/static": &vfsgen۰DirInfo{
 			name:    "static",
-			modTime: time.Date(2020, 12, 16, 0, 33, 55, 795241510, time.UTC),
+			modTime: time.Date(2020, 12, 16, 19, 57, 32, 548492620, time.UTC),
 		},
 		"/static/bootstrap-4.3.1-dist": &vfsgen۰DirInfo{
 			name:    "bootstrap-4.3.1-dist",
@@ -380,7 +381,7 @@ var Assets = func() http.FileSystem {
 		},
 		"/static/functions.js": &vfsgen۰CompressedFileInfo{
 			name:             "functions.js",
-			modTime:          time.Date(2020, 12, 16, 0, 33, 55, 783241514, time.UTC),
+			modTime:          time.Date(2020, 12, 16, 19, 57, 32, 548492620, time.UTC),
 			uncompressedSize: 3788,
 
 			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xbc\x56\x6d\x6f\xdb\x36\x10\xfe\x1c\xff\x8a\x6b\x16\x94\x12\x62\x4b\x2d\x30\x0c\x58\x32\x6f\xeb\x9a\x60\x2b\xb0\x0e\x45\xd7\x02\x03\x8a\x0c\xa0\xc5\xb3\xa5\x8c\x26\x35\x92\xb2\x6b\x04\xfe\xef\x03\x49\xbd\x50\x2f\x0e\x92\x2f\xd3\x87\x38\x20\x8f\xf7\xf2\x3c\xcf\x1d\x99\xa6\xf0\x07\xdd\xa2\x2e\x69\x86\xc9\x6c\x47\x15\x94\x95\xce\x37\xd4\xe0\x9e\x1e\x60\x09\x0f\xc7\xeb\xd9\x2c\x58\x4a\x38\x5d\x21\xd7\xf5\x4e\xb8\x51\x52\x81\x1c\x96\x20\x2a\xce\x07\x67\xf4\xbe\x30\x59\xfe\x49\xbe\x47\xa3\x8a\xcc\x1e\x5e\x57\x22\x33\x85\x14\x51\xfc\x30\x03\x00\xb8\x88\xc8\x37\x5b\xbf\xbb\x60\xc5\x8e\xc4\x89\xce\xe5\x3e\x8a\xaf\xdb\x5d\x6d\xa8\xa9\x9a\xcd\xbc\x60\x18\x6e\x36\x47\x79\x41\xe2\x84\x32\xf6\x96\x53\xad\x23\x42\x33\x53\xec\x90\x8c\xbd\x38\x3b\x85\x5b\xb9\xc3\x91\xe9\x71\x3a\xf7\x3f\xdd\xc9\x27\xa5\x3e\xcc\xae\x97\xfa\xb0\xae\x5e\xea\x27\x52\x9a\xca\x7e\xaa\xca\x61\xea\xb9\xdc\xdf\x20\x7f\x2f\x19\xe5\x61\xe2\x9e\xc2\x39\xf8\xdf\x5b\x91\x49\x86\x6c\x0e\x8e\xc0\x77\x37\x73\xc0\x1d\x0a\x53\x57\xe7\xfe\x4f\xb4\x91\xe5\x07\x25\x4b\xba\xa1\xbe\xf4\x6b\x48\x53\xb8\x91\x82\x18\x30\xaa\xd8\x6c\x50\x01\xcd\x32\xa9\x58\x21\x05\x64\x92\x73\x5a\x6a\x4c\x9c\x87\x49\xf1\xf4\x42\x5f\x8f\xec\x1a\x2d\xd9\xa2\x09\x5c\x36\xa9\xc5\x49\x49\x15\x0a\x63\xf1\x73\x67\xac\x5e\x33\xb9\x2d\xa5\x40\x61\xac\xdf\x2f\x77\xde\xd9\x5a\x2a\x88\xec\x2e\x17\x50\x88\x3a\x5c\x0c\x0f\xb3\xb3\xce\x3c\xb1\x11\x23\x2e\xe0\x12\xc8\xf2\xdc\x86\xf1\x66\x5f\xb8\xb8\xb3\x6b\xe7\x24\x76\xbe\x8e\xee\x6f\x4b\x02\x43\xbe\xd8\x5a\x48\x17\x5b\xbd\x21\x71\x62\xf0\xab\x89\x66\x67\xe4\x46\xc2\x41\x56\xa0\x90\x72\x7e\x80\x3d\x15\x06\x8c\x04\x86\x1c\x0d\x02\xe5\x1c\x6a\xa6\x41\xae\x61\xa3\x64\x55\xc2\x83\x8d\x19\xe4\x73\x2f\x0b\x11\x91\x39\x90\xd8\x86\x3f\xfe\x44\x5c\xcc\x80\xff\x36\x34\x89\x13\xf7\x1b\x11\xcb\xf1\x69\xea\xdf\xf0\x31\xfb\x35\xb1\xc5\x1a\xa2\x17\x17\x11\x59\x55\xc6\x48\xe1\x5c\x53\x6e\x1d\xe7\x54\xd7\xc2\x62\x85\xa6\x2b\x8e\x8c\xc4\x16\x39\xa8\xbf\x3e\x06\x94\xf7\x71\x80\xe0\x7b\x3a\x24\x6b\x25\xb7\xc1\x82\xc7\x47\xd7\x00\x04\x20\x84\xf1\x5d\xe4\x69\x30\x3c\x6b\x03\x48\x7c\xd8\x5f\x1d\xf2\x63\x38\xdc\xe4\xa3\x26\xbf\xe5\xb8\x7d\x5c\x4b\x63\x3d\x3b\x5d\x59\x3c\xb9\x80\x17\x4b\x20\xf7\x72\x45\xdc\x9a\x93\x75\xe0\xd4\x2b\x0e\x9d\xea\x3f\x7f\x7c\xf7\xb6\xa1\x3e\xe2\xe2\x92\xfc\xbc\xa2\x1a\xbf\xfb\x96\xc4\xf1\xb5\x3f\x99\xa6\xf0\x86\xef\xe9\x41\x03\x65\x0c\x28\x94\x94\xb1\x42\x6c\x80\x2c\x89\x85\x11\x85\xae\x14\x02\x6e\x4b\x73\xf0\xca\x85\x1d\xe5\x15\x6a\xd8\x4b\xf5\x4f\xf2\x8c\xe8\xe3\x8a\x6c\x0b\x5c\x92\xa5\xcf\xe5\x18\x74\x81\x85\xc1\x91\xf3\x81\x9a\x1c\x96\x7d\xff\x5e\xbf\x69\xc3\x80\x45\xa4\xb5\x4d\x38\x8a\x8d\xc9\xe1\x47\x78\xe5\xa0\x09\x9d\x90\xd4\x36\x42\xbb\x72\x3d\xea\xba\x84\xde\xd3\xaf\xd1\xc3\xec\xcc\x1c\x4a\xbc\x02\x72\x73\xfb\xfb\xed\xa7\x5b\x32\x9f\x9d\x55\x8a\x5f\x01\xa9\x65\x94\xde\xcb\x55\x8d\xa2\xf3\xf8\xb4\x52\x1d\x5d\x77\x71\x98\xc1\x7c\x76\xa6\xab\x2c\x43\xad\xaf\x3a\xa1\x30\x6a\xe8\x1c\xac\xca\xfd\x55\x30\x87\xfb\x7f\xff\xfa\xed\x63\x47\xf4\x70\x7e\xd5\xd3\x3c\x0a\xb4\xdb\xd7\x63\xa6\x90\x6a\xf4\x6d\xfa\x56\x56\xc2\xa0\x8a\x1a\xf2\x4f\xb4\xbb\xbd\x5a\x88\x23\x65\x3e\x3b\x43\xa5\xa4\x0a\x32\x74\xf9\xf4\x53\x74\x26\x6d\x8a\x94\xa3\x32\x11\xb9\xb1\x9d\x60\x95\x14\x76\x1b\xac\x69\xc1\x91\x5d\x81\x43\xce\x1d\xeb\xb8\x1f\x0f\x18\xdf\x4d\x6f\x38\x3f\xd5\x50\x2d\x69\x4d\xed\x35\x77\x1f\x3e\x7f\x22\xf3\x76\xd1\xf3\x47\xcb\x22\xdd\xbd\x4e\x29\xdb\x16\x22\xdd\x17\x25\x06\x16\xcf\x22\x22\x9c\x3e\x17\x76\x80\xd9\x1b\x17\x69\x96\x47\x5d\x7a\x03\x33\xa7\x54\xe6\xee\x1a\x93\x17\x3a\x4e\xa8\x31\x2a\x3a\x2f\xd8\x79\xc0\x5b\x6b\xb8\x86\xc8\xd6\x21\xd7\xf6\x8c\xed\xf5\x4a\x30\x5c\x17\x02\x19\x81\x97\x2f\xa1\x60\xc9\x96\x9a\x2c\x8f\xd2\xbf\x1d\xa8\x0b\x27\x84\xc5\x97\x57\x8b\xef\xef\x1e\x5e\xcf\x8f\x17\x69\x3c\x15\xdf\xa7\xeb\xc3\x37\x37\xdc\x84\x7a\x9a\xef\xd8\x5b\x39\x0e\x2c\x7a\xd7\x00\x9a\xbe\xbc\x5e\x0d\x8c\x1f\x19\xa6\x8d\xd4\xda\x38\x1d\x27\xcf\x11\x5e\x18\x6d\xa8\xbf\xd1\xc4\x9f\x14\x61\xbf\xec\x49\x2d\x4e\x74\xd2\x89\x19\x9f\xb5\xbb\x25\x55\x1a\xdf\x09\x13\x5d\x44\x44\x97\xb4\xbd\x02\x17\xb5\x49\x73\xa5\xc5\xf1\xf8\x7d\x32\xc2\x75\xd1\x9c\x9a\xb8\x8a\x07\xb6\x61\x62\xa2\x7b\x43\x3e\x96\x82\x08\x26\xaa\x80\x1f\x96\x7e\x86\x4e\x0e\x15\x7f\x65\xfb\x80\xae\x35\x7f\x71\xf7\x7b\x28\x23\x85\xa6\x52\x22\x9c\xb2\xa1\x07\x14\x27\x1d\x0c\x0a\x3b\x61\x39\xfd\x44\x1e\x3d\x33\x7a\x4f\xdd\xee\xa5\x31\x26\xf7\x44\x45\x4f\x0c\xd3\x3d\x93\x07\x31\x2e\xda\x91\x00\xed\x4c\xf0\x23\x23\x69\xde\xaf\x24\x4e\xa4\xf0\xaf\x8a\x64\xa5\xbb\xe5\x39\x74\x47\xfd\x5b\xd9\x0e\xd8\xb6\x81\x15\xee\xa2\x38\x59\x17\x82\x79\x56\x13\x23\x37\x1b\x8e\x8b\x22\x93\x82\xc4\x7e\x12\xf7\xcb\xdf\xf0\x43\x99\xdb\xed\x45\x13\x63\xc1\xe4\xbe\x33\xee\x8a\x98\xb0\xac\x4a\x77\x21\x9c\x7a\xa8\xd7\x4d\xf3\x48\x7d\xb6\xd1\xff\xf7\xfa\x6c\xd6\x4f\xa9\xce\xe3\xf0\x84\xfa\x8e\xf1\xec\xbf\x00\x00\x00\xff\xff\xd4\x8f\xc0\xb9\xcc\x0e\x00\x00"),

go.mod

@@ -1,12 +1,12 @@
 module github.com/prometheus/pushgateway
 
 require (
-	github.com/go-kit/log v0.1.0
+	github.com/go-kit/log v0.2.0
 	github.com/golang/protobuf v1.5.2
 	github.com/matttproud/golang_protobuf_extensions v1.0.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.30.0
+	github.com/prometheus/common v0.31.1
 	github.com/prometheus/exporter-toolkit v0.6.1
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546

go.sum

@@ -64,13 +64,14 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 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 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
+github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 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 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -177,8 +178,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 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.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.30.0 h1:JEkYlQnpzrzQFxi6gnukFPdQ+ac82oRhzMcIduJu/Ug=
-github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
+github.com/prometheus/common v0.31.1 h1:d18hG4PkHnNAKNMOmFuXFaiY8Us0nird/2m60uS1AMs=
+github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/exporter-toolkit v0.6.1 h1:Aqk75wQD92N9CqmTlZwjKwq6272nOGrWIbc8Z7+xQO0=
 github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=