mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update client_golang.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Godeps/Godeps.json generated
View file

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

6
Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go generated vendored
View file

@ -18,10 +18,8 @@ import (
"io" "io"
"math" "math"
dto "github.com/prometheus/client_model/go" "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/matttproud/golang_protobuf_extensions/ext"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
) )

5
Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_1_test.go generated vendored
View file

@ -20,8 +20,6 @@ import (
"sort" "sort"
"testing" "testing"
"github.com/prometheus/prometheus/utility/test"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
) )
@ -47,7 +45,8 @@ func (s *testProcessor001ProcessScenario) test(t testing.TB, set int) {
options := &ProcessOptions{ options := &ProcessOptions{
Timestamp: test001Time, 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) t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
} }

5
Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/processor0_0_2_test.go generated vendored
View file

@ -23,8 +23,6 @@ import (
"sort" "sort"
"testing" "testing"
"github.com/prometheus/prometheus/utility/test"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
) )
@ -50,7 +48,8 @@ func (s *testProcessor002ProcessScenario) test(t testing.TB, set int) {
options := &ProcessOptions{ options := &ProcessOptions{
Timestamp: test002Time, 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) t.Fatalf("%d. expected err of %s, got %s", set, s.err, err)
} }

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter_test.go generated vendored
View file

@ -17,7 +17,7 @@ import (
"math" "math"
"testing" "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) { func TestCounterAdd(t *testing.T) {

5
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go generated vendored
View file

@ -11,9 +11,8 @@ import (
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
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/golang/protobuf/proto"
) )
var ( var (

6
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/example_selfcollector_test.go generated vendored
View file

@ -16,10 +16,8 @@ package prometheus_test
import ( import (
"runtime" "runtime"
"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"
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )

6
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/examples_test.go generated vendored
View file

@ -21,10 +21,8 @@ import (
"runtime" "runtime"
"sort" "sort"
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/golang/protobuf/proto"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )

3
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar_test.go generated vendored
View file

@ -19,8 +19,7 @@ import (
"sort" "sort"
"strings" "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" "github.com/prometheus/client_golang/prometheus"
) )

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge_test.go generated vendored
View file

@ -20,7 +20,7 @@ import (
"testing" "testing"
"testing/quick" "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{}) { func listenGaugeStream(vals, result chan float64, done chan struct{}) {

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector_test.go generated vendored
View file

@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "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) { func TestGoCollector(t *testing.T) {

5
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go generated vendored
View file

@ -20,10 +20,9 @@ import (
"sort" "sort"
"sync/atomic" "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" "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 // A Histogram counts individual observations from an event or sample stream in

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram_test.go generated vendored
View file

@ -22,7 +22,7 @@ import (
"testing" "testing"
"testing/quick" "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) { func benchmarkHistogramObserve(w int, b *testing.B) {

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http_test.go generated vendored
View file

@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "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 type respBody string

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go generated vendored
View file

@ -16,7 +16,7 @@ package prometheus
import ( import (
"strings" "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 // A Metric models a single sample value with its meta data being exported to

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_procfs.go generated vendored
View file

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

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_test.go generated vendored
View file

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

8
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go generated vendored
View file

@ -33,11 +33,9 @@ import (
"strings" "strings"
"sync" "sync"
dto "github.com/prometheus/client_model/go" "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"
"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/_vendor/goautoneg"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
"github.com/prometheus/client_golang/text" "github.com/prometheus/client_golang/text"
) )

4
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry_test.go generated vendored
View file

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

8
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go generated vendored
View file

@ -20,11 +20,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/golang/protobuf/proto" "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_model/go" dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
"github.com/prometheus/client_golang/_vendor/perks/quantile"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
) )

2
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary_test.go generated vendored
View file

@ -22,7 +22,7 @@ import (
"testing/quick" "testing/quick"
"time" "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) { func benchmarkSummaryObserve(w int, b *testing.B) {

5
Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go generated vendored
View file

@ -20,9 +20,8 @@ import (
"sort" "sort"
"sync/atomic" "sync/atomic"
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/golang/protobuf/proto"
) )
// ValueType is an enumeration of metric types that represent a simple value. // ValueType is an enumeration of metric types that represent a simple value.

5
Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go generated vendored
View file

@ -16,12 +16,11 @@ package text
import ( import (
"bytes" "bytes"
"compress/gzip" "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"
"io/ioutil" "io/ioutil"
"testing" "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. // Benchmarks to show how much penalty text format parsing actually inflicts.

2
Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go generated vendored
View file

@ -27,8 +27,8 @@ import (
"math" "math"
"strings" "strings"
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/model"
dto "github.com/prometheus/client_model/go"
) )
// MetricFamilyToText converts a MetricFamily proto message into text format and // MetricFamilyToText converts a MetricFamily proto message into text format and

4
Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go generated vendored
View file

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

5
Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go generated vendored
View file

@ -22,9 +22,8 @@ import (
"strconv" "strconv"
"strings" "strings"
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/golang/protobuf/proto"
"github.com/prometheus/client_golang/model" "github.com/prometheus/client_golang/model"
) )

6
Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go generated vendored
View file

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

7
Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go generated vendored
View file

@ -17,10 +17,9 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
"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"
dto "github.com/prometheus/client_model/go"
) )
// WriteProtoDelimited writes the MetricFamily to the writer in delimited // WriteProtoDelimited writes the MetricFamily to the writer in delimited