Fork prometheus prompb inside our repo

cevian · cevian · commit 3bd7ebda8a9b · 2020-05-26T13:32:42.000-04:00
This commit moves the code into our repo without modifications.
Future commits will modify it to enable\ us to reuse memory more
effectively.
diff --git a/cmd/timescale-prometheus/main.go b/cmd/timescale-prometheus/main.go
@@ -31,7 +31,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	io_prometheus_client "github.com/prometheus/client_model/go"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 type config struct {
diff --git a/cmd/timescale-prometheus/main_test.go b/cmd/timescale-prometheus/main_test.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	"github.com/timescale/timescale-prometheus/pkg/log"
 	"github.com/timescale/timescale-prometheus/pkg/pgclient"
diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang-migrate/migrate/v4 v4.9.1
 	github.com/golang/snappy v0.0.1
+	github.com/grpc-ecosystem/grpc-gateway v1.14.1
 	github.com/jackc/pgconn v1.3.2
 	github.com/jackc/pgerrcode v0.0.0-20190803225404-afa3381909a6
 	github.com/jackc/pgproto3/v2 v2.0.1
@@ -21,6 +22,8 @@ require (
 	github.com/prometheus/prometheus v1.8.2-0.20200326161412-ae041f97cfc6
 	github.com/spf13/cobra v0.0.7 // indirect
 	github.com/testcontainers/testcontainers-go v0.3.1
+	google.golang.org/genproto v0.0.0-20200305110556-506484158171
+	google.golang.org/grpc v1.27.1
 )
 
 replace github.com/jackc/pgconn => github.com/JLockerman/pgconn v1.5.3-0.20200513205926-64cd2ce264ca
diff --git a/pkg/pgclient/client.go b/pkg/pgclient/client.go
@@ -9,7 +9,7 @@ import (
 	"github.com/allegro/bigcache"
 	"github.com/jackc/pgx/v4/pgxpool"
 
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	"github.com/timescale/timescale-prometheus/pkg/log"
 	"github.com/timescale/timescale-prometheus/pkg/pgmodel"
diff --git a/pkg/pgmodel/end_to_end_tests/concurrent_sql_test.go b/pkg/pgmodel/end_to_end_tests/concurrent_sql_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/prometheus/common/model"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	_ "github.com/jackc/pgx/v4/stdlib"
 	. "github.com/timescale/timescale-prometheus/pkg/pgmodel"
diff --git a/pkg/pgmodel/end_to_end_tests/create_test.go b/pkg/pgmodel/end_to_end_tests/create_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/jackc/pgx/v4/pgxpool"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	_ "github.com/jackc/pgx/v4/stdlib"
 
diff --git a/pkg/pgmodel/end_to_end_tests/drop_test.go b/pkg/pgmodel/end_to_end_tests/drop_test.go
@@ -12,7 +12,7 @@ import (
 
 	_ "github.com/jackc/pgx/v4/stdlib"
 	"github.com/prometheus/common/model"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	. "github.com/timescale/timescale-prometheus/pkg/pgmodel"
 )
diff --git a/pkg/pgmodel/end_to_end_tests/functions_test.go b/pkg/pgmodel/end_to_end_tests/functions_test.go
@@ -15,7 +15,7 @@ import (
 
 	_ "github.com/jackc/pgx/v4/stdlib"
 	"github.com/prometheus/common/model"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 func TestSQLJsonLabelArray(t *testing.T) {
diff --git a/pkg/pgmodel/end_to_end_tests/nan_test.go b/pkg/pgmodel/end_to_end_tests/nan_test.go
@@ -11,7 +11,7 @@ import (
 
 	_ "github.com/jackc/pgx/v4/stdlib"
 	"github.com/prometheus/prometheus/pkg/value"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	. "github.com/timescale/timescale-prometheus/pkg/pgmodel"
 )
diff --git a/pkg/pgmodel/end_to_end_tests/query_integration_test.go b/pkg/pgmodel/end_to_end_tests/query_integration_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/golang/snappy"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/prometheus/prometheus/pkg/labels"
-	"github.com/prometheus/prometheus/prompb"
 	"github.com/prometheus/prometheus/tsdb"
 	"github.com/timescale/timescale-prometheus/pkg/internal/testhelpers"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	. "github.com/timescale/timescale-prometheus/pkg/pgmodel"
 )
diff --git a/pkg/pgmodel/end_to_end_tests/view_test.go b/pkg/pgmodel/end_to_end_tests/view_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/jackc/pgx/v4/pgxpool"
 
 	_ "github.com/jackc/pgx/v4/stdlib"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 
 	. "github.com/timescale/timescale-prometheus/pkg/pgmodel"
 )
diff --git a/pkg/pgmodel/ingestor.go b/pkg/pgmodel/ingestor.go
@@ -7,7 +7,7 @@ package pgmodel
 import (
 	"fmt"
 
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 const (
diff --git a/pkg/pgmodel/ingestor_interface.go b/pkg/pgmodel/ingestor_interface.go
@@ -4,7 +4,7 @@
 
 package pgmodel
 
-import "github.com/prometheus/prometheus/prompb"
+import "github.com/timescale/timescale-prometheus/pkg/prompb"
 
 // DBInserter is responsible for ingesting the TimeSeries protobuf structs and
 // storing them in the database.
diff --git a/pkg/pgmodel/ingestor_test.go b/pkg/pgmodel/ingestor_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 type mockCache struct {
diff --git a/pkg/pgmodel/insert_ctx.go b/pkg/pgmodel/insert_ctx.go
@@ -3,7 +3,7 @@ package pgmodel
 import (
 	"sync"
 
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 var pool = sync.Pool{
diff --git a/pkg/pgmodel/labels.go b/pkg/pgmodel/labels.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/prometheus/prometheus/pkg/labels"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 // Labels stores a labels.Labels in its canonical string representation
diff --git a/pkg/pgmodel/pgx.go b/pkg/pgmodel/pgx.go
@@ -17,8 +17,8 @@ import (
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/prometheus/common/model"
-	"github.com/prometheus/prometheus/prompb"
 	"github.com/timescale/timescale-prometheus/pkg/log"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 const (
diff --git a/pkg/pgmodel/pgx_test.go b/pkg/pgmodel/pgx_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/jackc/pgproto3/v2"
 	"github.com/jackc/pgx/v4"
 	"github.com/prometheus/prometheus/pkg/labels"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 // rowResults represents a collection of a multi-column row result
diff --git a/pkg/pgmodel/querier.go b/pkg/pgmodel/querier.go
@@ -5,7 +5,7 @@
 package pgmodel
 
 import (
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 // Reader reads the data based on the provided read request.
diff --git a/pkg/pgmodel/querier_test.go b/pkg/pgmodel/querier_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 type mockQuerier struct {
diff --git a/pkg/pgmodel/query_builder.go b/pkg/pgmodel/query_builder.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/jackc/pgx/v4"
 	"github.com/prometheus/prometheus/pkg/labels"
-	"github.com/prometheus/prometheus/prompb"
+	"github.com/timescale/timescale-prometheus/pkg/prompb"
 )
 
 const (
diff --git a/pkg/prompb/remote.pb.go b/pkg/prompb/remote.pb.go
diff --git a/pkg/prompb/rpc.pb.go b/pkg/prompb/rpc.pb.go
diff --git a/pkg/prompb/rpc.pb.gw.go b/pkg/prompb/rpc.pb.gw.go
diff --git a/pkg/prompb/types.pb.go b/pkg/prompb/types.pb.go

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`"github.com/prometheus/client_golang/prometheus"`
`32`	`32`	`"github.com/prometheus/client_golang/prometheus/promhttp"`
`33`	`33`	`io_prometheus_client "github.com/prometheus/client_model/go"`
`34`		`- "github.com/prometheus/prometheus/prompb"`
	`34`	`+ "github.com/timescale/timescale-prometheus/pkg/prompb"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`type config struct {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`_ "github.com/jackc/pgx/v4/stdlib"`
`14`	`14`	`"github.com/prometheus/common/model"`
`15`		`- "github.com/prometheus/prometheus/prompb"`
	`15`	`+ "github.com/timescale/timescale-prometheus/pkg/prompb"`
`16`	`16`
`17`	`17`	`. "github.com/timescale/timescale-prometheus/pkg/pgmodel"`
`18`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`_ "github.com/jackc/pgx/v4/stdlib"`
`17`	`17`	`"github.com/prometheus/common/model"`
`18`		`- "github.com/prometheus/prometheus/prompb"`
	`18`	`+ "github.com/timescale/timescale-prometheus/pkg/prompb"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`func TestSQLJsonLabelArray(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`_ "github.com/jackc/pgx/v4/stdlib"`
`13`	`13`	`"github.com/prometheus/prometheus/pkg/value"`
`14`		`- "github.com/prometheus/prometheus/prompb"`
	`14`	`+ "github.com/timescale/timescale-prometheus/pkg/prompb"`
`15`	`15`
`16`	`16`	`. "github.com/timescale/timescale-prometheus/pkg/pgmodel"`
`17`	`17`	`)`