diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 24265d2ca6..3adf64689f 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,7 +1,16 @@ { "ImportPath": "github.com/prometheus/prometheus", - "GoVersion": "go1.4.1", + "GoVersion": "go1.4", "Deps": [ + { + "ImportPath": "bitbucket.org/ww/goautoneg", + "Comment": "null-5", + "Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675" + }, + { + "ImportPath": "github.com/beorn7/perks/quantile", + "Rev": "b965b613227fddccbfffe13eae360ed3fa822f8d" + }, { "ImportPath": "github.com/golang/glog", "Rev": "44145f04b68cf362d9c4df2182967c2275eaefed" @@ -18,35 +27,25 @@ "ImportPath": "github.com/miekg/dns", "Rev": "b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641" }, - { - "ImportPath": "github.com/prometheus/client_golang/_vendor/goautoneg", - "Comment": "0.2.0", - "Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b" - }, - { - "ImportPath": "github.com/prometheus/client_golang/_vendor/perks/quantile", - "Comment": "0.2.0", - "Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b" - }, { "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", diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/Makefile b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/Makefile rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/README.txt b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/README.txt rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg.go b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg.go rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg_test.go b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg_test.go rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg_test.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/bench_test.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/bench_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/bench_test.go rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/bench_test.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/example_test.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/example_test.go rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/exampledata.txt b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/exampledata.txt rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/quantile.test b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/quantile.test new file mode 100644 index 0000000000..f5706c454b Binary files /dev/null and b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/quantile.test differ diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream.go rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream_test.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream_test.go rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream_test.go diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/MANIFEST b/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/MANIFEST deleted file mode 100644 index 71bfe39aa9..0000000000 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/MANIFEST +++ /dev/null @@ -1 +0,0 @@ -Imported at 75cd24fc2f2c from https://bitbucket.org/ww/goautoneg. diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go index 5edb49c242..7ec92a1887 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go @@ -18,11 +18,9 @@ import ( "io" "math" - dto "github.com/prometheus/client_model/go" - "github.com/matttproud/golang_protobuf_extensions/ext" - "github.com/prometheus/client_golang/model" + dto "github.com/prometheus/client_model/go" ) type metricFamilyProcessor struct{} diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go index 3fd909cfc7..b970b03e97 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go @@ -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) } diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go index 451c57e5e8..b2b7587020 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go @@ -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) } diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go index 7e1f9e8537..46a71cb980 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go @@ -11,9 +11,8 @@ import ( "github.com/prometheus/client_golang/model" - dto "github.com/prometheus/client_model/go" - "github.com/golang/protobuf/proto" + dto "github.com/prometheus/client_model/go" ) var ( diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/example_selfcollector_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/example_selfcollector_test.go index 608deeb027..a7a5a3f972 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/example_selfcollector_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/example_selfcollector_test.go @@ -17,10 +17,8 @@ import ( "runtime" "github.com/golang/protobuf/proto" - - dto "github.com/prometheus/client_model/go" - "github.com/prometheus/client_golang/prometheus" + dto "github.com/prometheus/client_model/go" ) func NewCallbackMetric(desc *prometheus.Desc, callback func() float64) *CallbackMetric { diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/examples_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/examples_test.go index 5e62967b0b..37359cc2da 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/examples_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/examples_test.go @@ -21,11 +21,9 @@ import ( "runtime" "sort" - dto "github.com/prometheus/client_model/go" - "github.com/golang/protobuf/proto" - "github.com/prometheus/client_golang/prometheus" + dto "github.com/prometheus/client_model/go" ) func ExampleGauge() { diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar_test.go index 5d3128faed..00af8a4a27 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar_test.go @@ -19,9 +19,8 @@ import ( "sort" "strings" - dto "github.com/prometheus/client_model/go" - "github.com/prometheus/client_golang/prometheus" + dto "github.com/prometheus/client_model/go" ) func ExampleExpvarCollector() { diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go index 9b36a61150..e0c0042fe9 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go @@ -21,7 +21,6 @@ import ( "sync/atomic" "github.com/golang/protobuf/proto" - "github.com/prometheus/client_golang/model" dto "github.com/prometheus/client_model/go" ) diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go index 6709f25785..1c445cba24 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go @@ -33,13 +33,11 @@ import ( "strings" "sync" - dto "github.com/prometheus/client_model/go" - + "bitbucket.org/ww/goautoneg" "github.com/golang/protobuf/proto" - - "github.com/prometheus/client_golang/_vendor/goautoneg" "github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/text" + dto "github.com/prometheus/client_model/go" ) var ( diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go index 93e7b6bb1b..0ebc5bc010 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go @@ -20,12 +20,10 @@ import ( "sync" "time" + "github.com/beorn7/perks/quantile" "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/model" + dto "github.com/prometheus/client_model/go" ) // A Summary captures individual observations from an event or sample stream and diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go index 107d43e372..8d48b964e5 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go @@ -20,9 +20,8 @@ import ( "sort" "sync/atomic" - dto "github.com/prometheus/client_model/go" - "github.com/golang/protobuf/proto" + dto "github.com/prometheus/client_model/go" ) // ValueType is an enumeration of metric types that represent a simple value. diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go index df887e0fc6..5fe44f3d3f 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go @@ -16,12 +16,11 @@ package text import ( "bytes" "compress/gzip" + "github.com/matttproud/golang_protobuf_extensions/ext" + dto "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. diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go index e317d6850b..8a5af97d12 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go @@ -22,10 +22,9 @@ import ( "strconv" "strings" - dto "github.com/prometheus/client_model/go" - "github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/model" + dto "github.com/prometheus/client_model/go" ) // A stateFn is a function that represents a state in a state machine. By diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go index 6b7adfff55..cc3e6470f0 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go @@ -385,7 +385,7 @@ request_duration_microseconds_count 2693 }, }, }, - }, + }, } for i, scenario := range scenarios { diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go index 058adfc6f6..bf6f324f2f 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go @@ -19,7 +19,6 @@ import ( "github.com/golang/protobuf/proto" "github.com/matttproud/golang_protobuf_extensions/ext" - dto "github.com/prometheus/client_model/go" )