ingest client should be a querier; responses are in json.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

cmd/logcli/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"context"
+	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
@@ -9,7 +9,6 @@ import (
 	"os"
 
 	"github.com/grafana/logish/pkg/logproto"
-	"github.com/weaveworks/cortex/pkg/util"
 )
 
 var defaultAddr = "https://log-us.grafana.net/api/prom/query"
@@ -41,9 +40,8 @@ func main() {
 	defer resp.Body.Close()
 
 	var queryResponse logproto.QueryResponse
-	if bs, err := util.ParseProtoReader(context.Background(), resp.Body, &queryResponse, util.RawSnappy); err != nil {
-		log.Printf("Error decoding response: %v", err)
-		log.Fatal(string(bs))
+	if err := json.NewDecoder(resp.Body).Decode(&queryResponse); err != nil {
+		log.Fatalf("Error decoding response: %v", err)
 	}
 
 	fmt.Println(queryResponse.String())

pkg/ingester/client/client.go

@@ -39,9 +39,11 @@ func New(cfg Config, addr string) (grpc_health_v1.HealthClient, error) {
 	}
 	return struct {
 		logproto.PusherClient
+		logproto.QuerierClient
 		io.Closer
 	}{
-		PusherClient: logproto.NewPusherClient(conn),
-		Closer:       conn,
+		PusherClient:  logproto.NewPusherClient(conn),
+		QuerierClient: logproto.NewQuerierClient(conn),
+		Closer:        conn,
 	}, nil
 }

pkg/logproto/logproto.proto

@@ -13,7 +13,6 @@ service Pusher {
 
 service Querier {
   rpc Query(QueryRequest) returns (stream QueryResponse) {};
-  rpc Check(grpc.health.v1.HealthCheckRequest) returns (grpc.health.v1.HealthCheckResponse);
 }
 
 message PushRequest {

pkg/querier/iterator.go

@@ -121,7 +121,10 @@ func (i *heapIterator) Labels() string {
 }
 
 func (i *heapIterator) Error() error {
-	return i.curr.Error()
+	if i.curr != nil {
+		return i.curr.Error()
+	}
+	return nil
 }
 
 func (i *heapIterator) Close() error {