Merge pull request #95 from prometheus/beorn7/fixes

Fix two bugs (see commit descriptions).

README.md

@@ -8,7 +8,7 @@ continue your journey:
   1. See the [exposition library](prometheus/README.md) if you want to
      export metrics to a Prometheus server or pushgateway
 
-  2. See the [consumption library](extraction/README.md) if you want to
+  2. See the [consumption library](https://godoc.org/github.com/prometheus/client_golang/extraction) if you want to
      process metrics exported by a Prometheus client. (The Prometheus server
      is using that library.)
 

prometheus/summary.go

@@ -16,6 +16,7 @@ package prometheus
 import (
 	"fmt"
 	"hash/fnv"
+	"math"
 	"sort"
 	"sync"
 	"time"
@@ -277,10 +278,8 @@ func (s *summary) Write(out *dto.Metric) error {
 
 	s.bufMtx.Lock()
 	s.mtx.Lock()
-
+	// Swap bufs even if hotBuf is empty to set new hotBufExpTime.
-	if len(s.hotBuf) != 0 {
+	s.swapBufs(time.Now())
-		s.swapBufs(time.Now())
-	}
 	s.bufMtx.Unlock()
 
 	s.flushColdBuf()
@@ -288,9 +287,15 @@ func (s *summary) Write(out *dto.Metric) error {
 	sum.SampleSum = proto.Float64(s.sum)
 
 	for _, rank := range s.sortedObjectives {
+		var q float64
+		if s.headStream.Count() == 0 {
+			q = math.NaN()
+		} else {
+			q = s.headStream.Query(rank)
+		}
 		qs = append(qs, &dto.Quantile{
 			Quantile: proto.Float64(rank),
-			Value:    proto.Float64(s.headStream.Query(rank)),
+			Value:    proto.Float64(q),
 		})
 	}
 

prometheus/summary_test.go

@@ -289,6 +289,11 @@ func TestSummaryVecConcurrency(t *testing.T) {
 }
 
 func TestSummaryDecay(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+		// More because it depends on timing than because it is particularly long...
+	}
+
 	sum := NewSummary(SummaryOpts{
 		Name:       "test_summary",
 		Help:       "helpless",
@@ -315,6 +320,12 @@ func TestSummaryDecay(t *testing.T) {
 		}
 	}
 	tick.Stop()
+	// Wait for MaxAge without observations and make sure quantiles are NaN.
+	time.Sleep(100 * time.Millisecond)
+	sum.Write(m)
+	if got := *m.Summary.Quantile[0].Value; !math.IsNaN(got) {
+		t.Errorf("got %f, want NaN after expiration", got)
+	}
 }
 
 func getBounds(vars []float64, q, ε float64) (min, max float64) {