Merge pull request #462 from prometheus/beorn7/testing

Add Go 1.11

.travis.yml

@@ -6,7 +6,8 @@ go:
   - 1.8.x
   - 1.9.x
   - 1.10.x
+  - 1.11.x
 
 script:
   - make check_license style unused test-short
-  - if [[ ! $TRAVIS_GO_VERSION =~ ^1\.(7|8)\.[x0-9]+$ ]]; then make staticcheck; fi
+  - if [[ ! $TRAVIS_GO_VERSION =~ ^1\.(7|8|9)\.[x0-9]+$ ]]; then make staticcheck; fi

Makefile

@@ -13,6 +13,13 @@
 
 include Makefile.common
 
+# http.CloseNotifier is deprecated but we don't want to remove support
+# from client_golang to not break anybody still using it.
+STATICCHECK_IGNORE = \
+  github.com/prometheus/client_golang/prometheus/promhttp/delegator*.go:SA1019 \
+  github.com/prometheus/client_golang/prometheus/promhttp/instrument_server_test.go:SA1019 \
+  github.com/prometheus/client_golang/prometheus/http.go:SA1019
+
 .PHONY: get_dep
 get_dep:
 	@echo ">> getting dependencies" 

prometheus/registry_test.go

@@ -671,7 +671,7 @@ collected metric named "complex_count" collides with previously collected histog
 		handler(writer, request)
 
 		for key, value := range scenario.out.headers {
-			if writer.HeaderMap.Get(key) != value {
+			if writer.Header().Get(key) != value {
 				t.Errorf(
 					"%d. expected %q for header %q, got %q",
 					i, value, key, writer.Header().Get(key),