Update client_golang.

This commit is contained in:
beorn7 2015-02-26 19:24:17 +01:00
parent 784176d572
commit 08acf744f7
28 changed files with 55 additions and 74 deletions

16
Godeps/Godeps.json generated
View File

@ -29,23 +29,23 @@
},
{
"ImportPath": "github.com/prometheus/client_golang/extraction",
"Comment": "0.2.0",
"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
"Comment": "0.2.0-3-ga6c5e0f",
"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
},
{
"ImportPath": "github.com/prometheus/client_golang/model",
"Comment": "0.2.0",
"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
"Comment": "0.2.0-3-ga6c5e0f",
"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
},
{
"ImportPath": "github.com/prometheus/client_golang/prometheus",
"Comment": "0.2.0",
"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
"Comment": "0.2.0-3-ga6c5e0f",
"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
},
{
"ImportPath": "github.com/prometheus/client_golang/text",
"Comment": "0.2.0",
"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
"Comment": "0.2.0-3-ga6c5e0f",
"Rev": "a6c5e0f955686b0e7bbfd791edecfc65aa72593a"
},
{
"ImportPath": "github.com/prometheus/client_model/go",

View File

@ -18,10 +18,8 @@ import (
"io"
"math"
dto "github.com/prometheus/client_model/go"
"github.com/matttproud/golang_protobuf_extensions/ext"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model"
)

View File

@ -20,8 +20,6 @@ import (
"sort"
"testing"
"github.com/prometheus/prometheus/utility/test"
"github.com/prometheus/client_golang/model"
)
@ -47,7 +45,8 @@ func (s *testProcessor001ProcessScenario) test(t testing.TB, set int) {
options := &ProcessOptions{
Timestamp: test001Time,
}
if err := Processor001.ProcessSingle(reader, s, options); !test.ErrorEqual(s.err, err) {
err = Processor001.ProcessSingle(reader, s, options)
if s.err != err && (s.err == nil || err == nil || err.Error() != s.err.Error()) {
t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
}

View File

@ -23,8 +23,6 @@ import (
"sort"
"testing"
"github.com/prometheus/prometheus/utility/test"
"github.com/prometheus/client_golang/model"
)
@ -50,7 +48,8 @@ func (s *testProcessor002ProcessScenario) test(t testing.TB, set int) {
options := &ProcessOptions{
Timestamp: test002Time,
}
if err := Processor002.ProcessSingle(reader, s, options); !test.ErrorEqual(s.err, err) {
err = Processor002.ProcessSingle(reader, s, options)
if s.err != err && (s.err == nil || err == nil || err.Error() != s.err.Error()) {
t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
}

View File

@ -17,7 +17,7 @@ import (
"math"
"testing"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
func TestCounterAdd(t *testing.T) {

View File

@ -11,9 +11,8 @@ import (
"github.com/prometheus/client_golang/model"
dto "github.com/prometheus/client_model/go"
"github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
var (

View File

@ -16,10 +16,8 @@ package prometheus_test
import (
"runtime"
"github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/prometheus"
)

View File

@ -21,10 +21,8 @@ import (
"runtime"
"sort"
dto "github.com/prometheus/client_model/go"
"github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/prometheus"
)

View File

@ -19,8 +19,7 @@ import (
"sort"
"strings"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/prometheus"
)

View File

@ -20,7 +20,7 @@ import (
"testing"
"testing/quick"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
func listenGaugeStream(vals, result chan float64, done chan struct{}) {

View File

@ -5,7 +5,7 @@ import (
"testing"
"time"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
func TestGoCollector(t *testing.T) {

View File

@ -20,10 +20,9 @@ import (
"sort"
"sync/atomic"
"github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model"
dto "github.com/prometheus/client_model/go"
)
// A Histogram counts individual observations from an event or sample stream in

View File

@ -22,7 +22,7 @@ import (
"testing"
"testing/quick"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
func benchmarkHistogramObserve(w int, b *testing.B) {

View File

@ -19,7 +19,7 @@ import (
"testing"
"time"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
type respBody string

View File

@ -16,7 +16,7 @@ package prometheus
import (
"strings"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
// A Metric models a single sample value with its meta data being exported to

View File

@ -15,7 +15,7 @@
package prometheus
import "github.com/prometheus/procfs"
import "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
func processCollectSupported() bool {
if _, err := procfs.NewStat(); err == nil {

View File

@ -8,7 +8,7 @@ import (
"regexp"
"testing"
"github.com/prometheus/procfs"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
)
func TestProcessCollector(t *testing.T) {

View File

@ -33,11 +33,9 @@ import (
"strings"
"sync"
dto "github.com/prometheus/client_model/go"
"github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/_vendor/goautoneg"
"github.com/prometheus/client_golang/Godeps/_workspace/src/bitbucket.org/ww/goautoneg"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model"
"github.com/prometheus/client_golang/text"
)

View File

@ -25,8 +25,8 @@ import (
"net/http"
"testing"
"github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
type fakeResponseWriter struct {

View File

@ -20,11 +20,9 @@ import (
"sync"
"time"
"github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/_vendor/perks/quantile"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/beorn7/perks/quantile"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model"
)

View File

@ -22,7 +22,7 @@ import (
"testing/quick"
"time"
dto "github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
func benchmarkSummaryObserve(w int, b *testing.B) {

View File

@ -20,9 +20,8 @@ import (
"sort"
"sync/atomic"
dto "github.com/prometheus/client_model/go"
"github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
// ValueType is an enumeration of metric types that represent a simple value.

View File

@ -16,12 +16,11 @@ package text
import (
"bytes"
"compress/gzip"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"io"
"io/ioutil"
"testing"
dto "github.com/prometheus/client_model/go"
"github.com/matttproud/golang_protobuf_extensions/ext"
)
// Benchmarks to show how much penalty text format parsing actually inflicts.

View File

@ -27,8 +27,8 @@ import (
"math"
"strings"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model"
dto "github.com/prometheus/client_model/go"
)
// MetricFamilyToText converts a MetricFamily proto message into text format and

View File

@ -19,8 +19,8 @@ import (
"strings"
"testing"
"github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
func testCreate(t testing.TB) {

View File

@ -22,9 +22,8 @@ import (
"strconv"
"strings"
dto "github.com/prometheus/client_model/go"
"github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/model"
)

View File

@ -18,8 +18,8 @@ import (
"strings"
"testing"
"github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
var parser Parser
@ -385,7 +385,7 @@ request_duration_microseconds_count 2693
},
},
},
},
},
}
for i, scenario := range scenarios {

View File

@ -17,10 +17,9 @@ import (
"fmt"
"io"
"github.com/golang/protobuf/proto"
"github.com/matttproud/golang_protobuf_extensions/ext"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
)
// WriteProtoDelimited writes the MetricFamily to the writer in delimited