Merge pull request #86 from prometheus/unrewrite-godeps

Use non-rewritten Godep imports.
This commit is contained in:
Julius Volz 2015-02-27 16:55:31 +01:00
commit de5f7a2db9
42 changed files with 81 additions and 62 deletions

2
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{
"ImportPath": "github.com/prometheus/client_golang",
"GoVersion": "go1.4.1",
"GoVersion": "go1.4.2",
"Packages": [
"./..."
],

View File

@ -10,7 +10,7 @@ import (
"strconv"
"time"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/beorn7/perks/quantile"
"github.com/beorn7/perks/quantile"
)
func Example_simple() {

View File

@ -45,7 +45,7 @@ import (
"time"
. "./testdata"
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
. "github.com/golang/protobuf/proto"
)
var globalO *Buffer

View File

@ -34,8 +34,9 @@ package proto_test
import (
"testing"
"github.com/golang/protobuf/proto"
pb "./testdata"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
)
var cloneTestMessage = &pb.MyMessage{

View File

@ -35,7 +35,7 @@ import (
"testing"
pb "./testdata"
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
. "github.com/golang/protobuf/proto"
)
// Four identical base messages.

View File

@ -35,7 +35,7 @@ import (
"testing"
pb "./testdata"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto"
)
func TestGetExtensionsWithMissingExtensions(t *testing.T) {

View File

@ -35,7 +35,7 @@ import (
"testing"
pb "./proto3_proto"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto"
)
func TestProto3ZeroValues(t *testing.T) {

View File

@ -37,7 +37,7 @@ import (
proto3pb "./proto3_proto"
pb "./testdata"
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
. "github.com/golang/protobuf/proto"
)
var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}

View File

@ -37,7 +37,7 @@ It has these top-level messages:
*/
package testdata
import proto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
import proto "github.com/golang/protobuf/proto"
import math "math"
// Reference imports to suppress errors if they are not otherwise used.

View File

@ -38,7 +38,7 @@ import (
proto3pb "./proto3_proto"
. "./testdata"
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
. "github.com/golang/protobuf/proto"
)
type UnmarshalTextTest struct {

View File

@ -39,9 +39,10 @@ import (
"strings"
"testing"
"github.com/golang/protobuf/proto"
proto3pb "./proto3_proto"
pb "./testdata"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
)
// textMessage implements the methods that allow it to marshal and unmarshal

View File

@ -21,8 +21,8 @@ import (
"testing"
"testing/quick"
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata"
. "github.com/golang/protobuf/proto"
. "github.com/golang/protobuf/proto/testdata"
)
func TestWriteDelimited(t *testing.T) {

View File

@ -19,7 +19,7 @@ import (
"errors"
"io"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto"
)
var errInvalidVarint = errors.New("invalid varint32 encountered")

View File

@ -18,7 +18,7 @@ import (
"encoding/binary"
"io"
"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto"
)
// WriteDelimited encodes and dumps a message to the provided writer prefixed

View File

@ -30,8 +30,8 @@
package ext
import (
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata"
. "github.com/golang/protobuf/proto"
. "github.com/golang/protobuf/proto/testdata"
)
// FROM https://github.com/golang/protobuf/blob/master/proto/all_test.go.

View File

@ -22,7 +22,7 @@ It has these top-level messages:
*/
package io_prometheus_client
import proto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
import proto "github.com/golang/protobuf/proto"
import math "math"
// Reference imports to suppress errors if they are not otherwise used.

View File

@ -73,7 +73,7 @@ build: source_path dependencies
$(GO) build ./...
dependencies: source_path $(GOCC)
$(GO) get -d -t ./...
cp -a $(CURDIR)/Godeps/_workspace/src/* $(GOPATH)/src
example_random: source_path dependencies examples/random/main.go
$(GO) build -o example_random examples/random/main.go

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -19,7 +19,8 @@ import (
"sort"
"strings"
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"
)

View File

@ -20,7 +20,7 @@ import (
"testing"
"testing/quick"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
dto "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_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_model/go"
)
func TestGoCollector(t *testing.T) {

View File

@ -20,9 +20,10 @@ import (
"sort"
"sync/atomic"
"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"
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_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
dto "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_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_model/go"
)
type respBody string

View File

@ -16,7 +16,7 @@ package prometheus
import (
"strings"
dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
dto "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/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
import "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/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
"github.com/prometheus/procfs"
)
func TestProcessCollector(t *testing.T) {

View File

@ -33,9 +33,11 @@ import (
"strings"
"sync"
"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"
"bitbucket.org/ww/goautoneg"
"github.com/golang/protobuf/proto"
dto "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/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"
dto "github.com/prometheus/client_model/go"
)
type fakeResponseWriter struct {

View File

@ -20,9 +20,11 @@ import (
"sync"
"time"
"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/beorn7/perks/quantile"
"github.com/golang/protobuf/proto"
dto "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_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
dto "github.com/prometheus/client_model/go"
)
func benchmarkSummaryObserve(w int, b *testing.B) {

View File

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

View File

@ -16,11 +16,12 @@ 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/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"
dto "github.com/prometheus/client_model/go"
)
func testCreate(t testing.TB) {

View File

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

View File

@ -18,8 +18,8 @@ import (
"strings"
"testing"
"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"
dto "github.com/prometheus/client_model/go"
)
var parser Parser

View File

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