update loki (#377)

includes grafana/loki#3284 and grafana/loki#3246

go.mod

@@ -4,22 +4,23 @@ go 1.12
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.2.0
-	github.com/aws/aws-sdk-go v1.35.31
-	github.com/cortexproject/cortex v1.6.1-0.20210121163251-a59b811d5952
+	github.com/aws/aws-sdk-go v1.36.15
+	github.com/cortexproject/cortex v1.6.1-0.20210129172402-0976147451ee
 	github.com/drone/envsubst v1.0.2
 	github.com/go-kit/kit v0.10.0
 	github.com/go-playground/validator/v10 v10.4.0 // indirect
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/protobuf v1.4.3
 	github.com/google/dnsmasq_exporter v0.0.0-00010101000000-000000000000
 	github.com/gorilla/mux v1.8.0
-	github.com/grafana/loki v1.6.2-0.20210126101127-33abab5e4203
-	github.com/hashicorp/consul/api v1.7.0
+	github.com/grafana/loki v1.6.2-0.20210203125540-d667dd20f287
+	github.com/hashicorp/consul/api v1.8.1
 	github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
 	github.com/joshdk/go-junit v0.0.0-20200702055522-6efcf4050909 // indirect
 	github.com/jsternberg/zap-logfmt v1.2.0
 	github.com/justwatchcom/elasticsearch_exporter v1.1.0
 	github.com/miekg/dns v1.1.35
+	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
 	github.com/ncabatoff/process-exporter v0.7.5
 	github.com/oklog/run v1.1.0
 	github.com/olekukonko/tablewriter v0.0.2
@@ -34,7 +35,7 @@ require (
 	github.com/prometheus/mysqld_exporter v0.0.0-00010101000000-000000000000
 	github.com/prometheus/node_exporter v1.0.1
 	github.com/prometheus/procfs v0.2.0
-	github.com/prometheus/prometheus v1.8.2-0.20201119181812-c8f810083d3f
+	github.com/prometheus/prometheus v1.8.2-0.20210124145330-b5dfa2414b9e
 	github.com/prometheus/statsd_exporter v0.18.1-0.20201124082027-8b2b4c1a2b49
 	github.com/sirupsen/logrus v1.7.0
 	github.com/spf13/cobra v1.1.1
@@ -50,13 +51,11 @@ require (
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
+	gotest.tools/v3 v3.0.3 // indirect
 )
 
 // Needed for Cortex's dependencies to work properly.
-replace (
-	google.golang.org/grpc => google.golang.org/grpc v1.29.1
-	k8s.io/client-go => k8s.io/client-go v0.19.2
-)
+replace google.golang.org/grpc => google.golang.org/grpc v1.29.1
 
 // Replace directives from Prometheus
 replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0
@@ -65,10 +64,18 @@ replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0
 replace (
 	git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
 	github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85
-	github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03
 	github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0
 )
 
+// Replace directives from Loki
+replace (
+	github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.2.0+incompatible
+	github.com/hashicorp/consul => github.com/hashicorp/consul v1.5.1
+	github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20201004203643-7aa4e4a91f03
+	k8s.io/api => k8s.io/api v0.19.4
+	k8s.io/client-go => k8s.io/client-go v0.19.4
+)
+
 replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20210111220521-c0d5de2f0ee3
 
 replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20200521142311-984fc90c8a04

pkg/prom/ha/client/client.go

@@ -49,7 +49,11 @@ func New(cfg Config, addr string) (ScrapingServiceClient, error) {
 		grpc.WithInsecure(),
 		grpc.WithDefaultCallOptions(cfg.GRPCClientConfig.CallOptions()...),
 	}
-	opts = append(opts, cfg.GRPCClientConfig.DialOption(instrumentation())...)
+	grpcDialOpts, err := cfg.GRPCClientConfig.DialOption(instrumentation())
+	if err != nil {
+		return nil, err
+	}
+	opts = append(opts, grpcDialOpts...)
 	conn, err := grpc.Dial(addr, opts...)
 	if err != nil {
 		return nil, err