Merge pull request #86 from prometheus/unrewrite-godeps

Use non-rewritten Godep imports.

Godeps/Godeps.json

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

Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go

@@ -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() {

Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go

@@ -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

Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go

@@ -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{

Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go

@@ -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.

Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go

@@ -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) {

Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go

@@ -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) {

Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go

@@ -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)}

Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go

@@ -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.

Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go

@@ -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 {

Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go

@@ -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

Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/all_test.go

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

Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/decode.go

@@ -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")

Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/encode.go

@@ -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

Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/fixtures_test.go

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

Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go

@@ -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.

Makefile

@@ -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

extraction/metricfamilyprocessor.go

@@ -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_model/go"
-	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"
 )
 

prometheus/counter_test.go

@@ -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) {

prometheus/desc.go

@@ -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_model/go"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+
+	"github.com/golang/protobuf/proto"
 )
 
 var (

prometheus/example_selfcollector_test.go

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

prometheus/examples_test.go

@@ -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_model/go"
-	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"
 )
 

prometheus/expvar_test.go

@@ -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"
 )
 

prometheus/gauge_test.go

@@ -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{}) {

prometheus/go_collector_test.go

@@ -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) {

prometheus/histogram.go

@@ -20,9 +20,10 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"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/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A Histogram counts individual observations from an event or sample stream in

prometheus/histogram_test.go

@@ -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) {

prometheus/http_test.go

@@ -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

prometheus/metric.go

@@ -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

prometheus/process_collector_procfs.go

@@ -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 {

prometheus/process_collector_test.go

@@ -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) {

prometheus/registry.go

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

prometheus/registry_test.go

@@ -25,8 +25,8 @@ import (
 	"net/http"
 	"testing"
 
-	"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"
+	dto "github.com/prometheus/client_model/go"
 )
 
 type fakeResponseWriter struct {

prometheus/summary.go

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

prometheus/summary_test.go

@@ -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) {

prometheus/value.go

@@ -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_model/go"
-	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.

text/bench_test.go

@@ -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.

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

text/create_test.go

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

text/parse.go

@@ -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_model/go"
-	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"
 )
 

text/parse_test.go

@@ -18,8 +18,8 @@ import (
 	"strings"
 	"testing"
 
-	"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"
+	dto "github.com/prometheus/client_model/go"
 )
 
 var parser Parser
@@ -385,7 +385,7 @@ request_duration_microseconds_count 2693
 					},
 				},
 			},
-		},
+                },
 	}
 
 	for i, scenario := range scenarios {

text/proto.go

@@ -17,9 +17,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
+	"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