From 171f50706a1c126f5e656f4a143875a7c2084d22 Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Fri, 18 Sep 2015 16:51:53 +0200
Subject: [PATCH] Fix unkeyed field errors.

---
 promql/parse_test.go    | 2 +-
 rules/recording_test.go | 4 ++--
 web/api/v1/api.go       | 4 +++-
 web/web.go              | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/promql/parse_test.go b/promql/parse_test.go
index d2cfb7150..e270e00e4 100644
--- a/promql/parse_test.go
+++ b/promql/parse_test.go
@@ -1084,7 +1084,7 @@ func TestNaNExpression(t *testing.T) {
 
 	if !math.IsNaN(float64(nl.Val)) {
 		t.Errorf("error on input 'NaN'")
-		t.Fatalf("expected 'NaN' in number literal but got %d", nl.Val)
+		t.Fatalf("expected 'NaN' in number literal but got %v", nl.Val)
 	}
 }
 
diff --git a/rules/recording_test.go b/rules/recording_test.go
index 896a23c81..9e9929e7d 100644
--- a/rules/recording_test.go
+++ b/rules/recording_test.go
@@ -37,7 +37,7 @@ func TestRuleEval(t *testing.T) {
 	}{
 		{
 			name:   "nolabels",
-			expr:   &promql.NumberLiteral{1},
+			expr:   &promql.NumberLiteral{Val: 1},
 			labels: model.LabelSet{},
 			result: model.Vector{&model.Sample{
 				Value:     1,
@@ -47,7 +47,7 @@ func TestRuleEval(t *testing.T) {
 		},
 		{
 			name:   "labels",
-			expr:   &promql.NumberLiteral{1},
+			expr:   &promql.NumberLiteral{Val: 1},
 			labels: model.LabelSet{"foo": "bar"},
 			result: model.Vector{&model.Sample{
 				Value:     1,
diff --git a/web/api/v1/api.go b/web/api/v1/api.go
index e548a13da..ba20a2b13 100644
--- a/web/api/v1/api.go
+++ b/web/api/v1/api.go
@@ -88,7 +88,9 @@ func (api *API) Register(r *route.Router) {
 				respond(w, data)
 			}
 		})
-		return prometheus.InstrumentHandler(name, httputil.CompressionHandler{hf})
+		return prometheus.InstrumentHandler(name, httputil.CompressionHandler{
+			Handler: hf,
+		})
 	}
 
 	r.Get("/query", instr("query", api.query))
diff --git a/web/web.go b/web/web.go
index 8b15087e9..f04c9794b 100644
--- a/web/web.go
+++ b/web/web.go
@@ -173,7 +173,7 @@ func New(st local.Storage, qe *promql.Engine, rm *rules.Manager, status *Prometh
 	router.Get(o.MetricsPath, prometheus.Handler().ServeHTTP)
 
 	router.Get("/federate", instrh("federate", httputil.CompressionHandler{
-		http.HandlerFunc(h.federation),
+		Handler: http.HandlerFunc(h.federation),
 	}))
 
 	h.apiLegacy.Register(router.WithPrefix("/api"))