From 5e5c463bd0081f176b60a1a515ece01c97200d79 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Mon, 3 Oct 2016 11:23:19 +0100 Subject: [PATCH 1/2] Don't log chunk flushing https://github.com/tomwilkie/prometheus/pull/82 --- vendor/github.com/prometheus/prometheus/storage/local/prism.go | 1 - vendor/manifest | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/vendor/github.com/prometheus/prometheus/storage/local/prism.go b/vendor/github.com/prometheus/prometheus/storage/local/prism.go index 9afab5f47cd..e8ec97d58cb 100644 --- a/vendor/github.com/prometheus/prometheus/storage/local/prism.go +++ b/vendor/github.com/prometheus/prometheus/storage/local/prism.go @@ -465,7 +465,6 @@ func (i *Ingester) flushSeries(ctx context.Context, u *userState, fp model.Finge } // flush the chunks without locking the series - log.Infof("Flushing %d chunks", len(chunks)) if err := i.flushChunks(ctx, fp, series.metric, chunks); err != nil { i.chunkStoreFailures.Add(float64(len(chunks))) return err diff --git a/vendor/manifest b/vendor/manifest index a32f6b36bf1..76acd7037bb 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -549,7 +549,7 @@ "importpath": "github.com/prometheus/prometheus", "repository": "https://github.com/tomwilkie/prometheus", "vcs": "git", - "revision": "3244beecf7f48739b4e4838fb050dc363376096f", + "revision": "b7f684b54172efc0080fd366e913c98a9e1b64a5", "branch": "frankenstein", "notests": true }, From af95f4ca2050e1de9921bd9cf8e5024f4e2e8f6c Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Mon, 3 Oct 2016 11:51:55 +0100 Subject: [PATCH 2/2] Fix lint --- user/id.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/id.go b/user/id.go index bcd171eef54..48762775ddc 100644 --- a/user/id.go +++ b/user/id.go @@ -20,5 +20,5 @@ func GetID(ctx context.Context) (string, error) { // WithID returns a derived context containing the user ID. func WithID(ctx context.Context, userID string) context.Context { - return context.WithValue(ctx, userIDContextKey, userID) + return context.WithValue(ctx, interface{}(userIDContextKey), userID) }