From 08acf744f7e75b07e9e6fc98effde01c8f508074 Mon Sep 17 00:00:00 2001 From: beorn7 Date: Thu, 26 Feb 2015 19:24:17 +0100 Subject: [PATCH] Update client_golang. --- Godeps/Godeps.json | 16 ++++++++-------- .../extraction/metricfamilyprocessor.go | 6 ++---- .../extraction/processor0_0_1_test.go | 5 ++--- .../extraction/processor0_0_2_test.go | 5 ++--- .../client_golang/prometheus/counter_test.go | 2 +- .../prometheus/client_golang/prometheus/desc.go | 5 ++--- .../prometheus/example_selfcollector_test.go | 6 ++---- .../client_golang/prometheus/examples_test.go | 6 ++---- .../client_golang/prometheus/expvar_test.go | 3 +-- .../client_golang/prometheus/gauge_test.go | 2 +- .../prometheus/go_collector_test.go | 2 +- .../client_golang/prometheus/histogram.go | 5 ++--- .../client_golang/prometheus/histogram_test.go | 2 +- .../client_golang/prometheus/http_test.go | 2 +- .../client_golang/prometheus/metric.go | 2 +- .../prometheus/process_collector_procfs.go | 2 +- .../prometheus/process_collector_test.go | 2 +- .../client_golang/prometheus/registry.go | 8 +++----- .../client_golang/prometheus/registry_test.go | 4 ++-- .../client_golang/prometheus/summary.go | 8 +++----- .../client_golang/prometheus/summary_test.go | 2 +- .../prometheus/client_golang/prometheus/value.go | 5 ++--- .../prometheus/client_golang/text/bench_test.go | 5 ++--- .../prometheus/client_golang/text/create.go | 2 +- .../prometheus/client_golang/text/create_test.go | 4 ++-- .../prometheus/client_golang/text/parse.go | 5 ++--- .../prometheus/client_golang/text/parse_test.go | 6 +++--- .../prometheus/client_golang/text/proto.go | 7 +++---- 28 files changed, 55 insertions(+), 74 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index c78a601ac0..3adf64689f 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -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", 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..f96c2323eb 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,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" ) 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/counter_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter_test.go index 67391a23aa..b89618824d 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter_test.go @@ -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) { 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..701aea95c7 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" + "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 ( 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..6bc93d5224 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 @@ -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" ) 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..590fd7ffd3 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,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" ) 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..d92b57fef3 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,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" ) diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge_test.go index 48cab46367..e537171883 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge_test.go @@ -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{}) { diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector_test.go index b0582d1b98..fe6173d5b7 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector_test.go @@ -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) { 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..82c81b45c8 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 @@ -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 diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram_test.go index 855af46950..cc5f93dac3 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram_test.go @@ -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) { diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http_test.go index ffe0418cf8..6ed8f2fc0f 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http_test.go @@ -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 diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go index d8905de2e8..a27bcd4b7c 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go @@ -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 diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_procfs.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_procfs.go index 5a09ded147..952972e844 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_procfs.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_procfs.go @@ -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 { diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_test.go index 829715acd8..b55f4606dc 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_test.go @@ -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) { 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..a9a5b9defe 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,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" ) diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry_test.go index 95579e512b..d37e24fd82 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry_test.go @@ -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 { 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..b380b354b5 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,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" ) diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary_test.go index 40d05fae52..db48d4798e 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary_test.go @@ -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) { 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..e7f8654fb1 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" + "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. 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..6898457c5a 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/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. diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go index 4430459946..d91c8a6765 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go @@ -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 diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go index fe938de80c..2cf61423c4 100644 --- a/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go +++ b/Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go @@ -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) { 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..ef3a828303 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,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" ) 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..c931fa914c 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 @@ -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 { 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..8b016c33ab 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 @@ -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