Upgrade prom dep to 2.3

Gopkg.toml

@@ -12,12 +12,12 @@
   version = "1.1.0"
 
 [[constraint]]
-  branch = "tjackson_fork_22"
+  branch = "tjackson_fork_23"
   name = "github.com/prometheus/common"
   source = "github.com/jacksontj/common"
 
 [[constraint]]
-  branch = "release-2.2_fork_promxy"
+  branch = "release-2.3_fork_promxy"
   name = "github.com/prometheus/prometheus"
   source = "github.com/jacksontj/prometheus"
 
@@ -29,6 +29,10 @@
   branch = "v2"
   name = "gopkg.in/yaml.v2"
 
+[[constraint]]
+  branch = "master"
+  name = "github.com/prometheus/client_golang"
+
 # Force some transitive stuffs
 [[override]]
   name = "github.com/hashicorp/consul"

proxyquerier/querier.go

@@ -9,6 +9,7 @@ import (
 	"github.com/jacksontj/promxy/servergroup"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/pkg/timestamp"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/sirupsen/logrus"
 )
@@ -44,7 +45,7 @@ func (h *ProxyQuerier) Select(selectParams *storage.SelectParams, matchers ...*l
 		}).Debug("Select")
 	}()
 
-	result, err := h.ServerGroups.GetValue(h.Ctx, h.Start, h.End, matchers)
+	result, err := h.ServerGroups.GetValue(h.Ctx, timestamp.Time(selectParams.Start), timestamp.Time(selectParams.End), matchers)
 	if err != nil {
 		return nil, err
 	}

proxystorage/proxy.go

@@ -161,7 +161,7 @@ func (p *ProxyStorage) NodeReplacer(ctx context.Context, s *promql.EvalStmt, nod
 
 	visitor := &OffsetFinder{}
 	if _, err := promql.Walk(ctx, visitor, s, node, nil, nil); err != nil {
-		return nil, err
+		return nil, nil
 	}
 	// If we couldn't find an offset, then something is wrong-- lets skip
 	// Also if there was an error, skip

servergroup/servergroup.go

@@ -21,7 +21,6 @@ import (
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/relabel"
 	"github.com/prometheus/prometheus/storage/remote"
-	httputil "github.com/prometheus/prometheus/util/httputil"
 
 	sd_config "github.com/prometheus/prometheus/discovery/config"
 )
@@ -118,7 +117,7 @@ func (s *ServerGroup) ApplyConfig(cfg *Config) error {
 
 	// stage the client swap as well
 	// TODO: better name
-	client, err := httputil.NewClientFromConfig(cfg.HTTPConfig, "somename")
+	client, err := config_util.NewClientFromConfig(cfg.HTTPConfig, "somename")
 	if err != nil {
 		return fmt.Errorf("Unable to load client from config: %s", err)
 	}
@@ -226,7 +225,7 @@ func (s *ServerGroup) RemoteRead(ctx context.Context, start, end time.Time, matc
 			}
 
 			start := time.Now()
-			query, err := remote.ToQuery(int64(timestamp.FromTime(start)), int64(timestamp.FromTime(end)), matchers)
+			query, err := remote.ToQuery(int64(timestamp.FromTime(start)), int64(timestamp.FromTime(end)), matchers, nil)
 			if err != nil {
 				retChan <- err
 				return