Add gRPC plugin proto changes

Relating to issue jaegertracing#422 and review jaegertracing#1214, add proto changes
to later allow for gRPC plugins to be used.

Signed-off-by: Charles Dixon <[email protected]>

Author: chvck

Diff for: Gopkg.lock

@@ -118,6 +118,18 @@ required = [
 [prune]
   go-tests = true
   unused-packages = true
+  [[prune.project]]
+    name = "github.com/gogo/protobuf"
+    non-go = false
+    unused-packages = false
+  [[prune.project]]
+    name = "github.com/grpc-ecosystem/grpc-gateway"
+    non-go = false
+    unused-packages = false
+  [[prune.project]]
+      name = "github.com/gogo/googleapis"
+      non-go = false
+      unused-packages = false
 
 [[constraint]]
   name = "github.com/Shopify/sarama"

Diff for: Gopkg.toml

@@ -330,9 +330,11 @@ PROTO_INCLUDES := \
 	-I model/proto \
 	-I vendor/github.com/grpc-ecosystem/grpc-gateway \
 	-I vendor/github.com/gogo/googleapis \
+	-I vendor/github.com/gogo/protobuf/protobuf \
 	-I vendor/github.com/gogo/protobuf
 # Remapping of std types to gogo types (must not contain spaces)
 PROTO_GOGO_MAPPINGS := $(shell echo \
+		Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/types, \
 		Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types, \
 		Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types, \
 		Mgoogle/protobuf/empty.proto=github.com/gogo/protobuf/types, \
@@ -342,7 +344,7 @@ PROTO_GOGO_MAPPINGS := $(shell echo \
 
 .PHONY: proto
 proto:
-	# Generate gogo, gRPC-Gateway, swagger, go-validators output.
+	# Generate gogo, gRPC-Gateway, swagger, go-validators, gRPC-storage-plugin output.
 	#
 	# -I declares import folders, in order of importance
 	# This is how proto resolves the protofile imports.
@@ -378,11 +380,18 @@ proto:
 		--swagger_out=$(PWD)/proto-gen/openapi/ \
 		model/proto/api_v2.proto
 
+	protoc \
+		$(PROTO_INCLUDES) \
+		-I plugin/storage/grpc/proto \
+				--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/plugin/storage/grpc/proto \
+				plugin/storage/grpc/proto/storage.proto
+
 	protoc \
 		-I model/proto \
 		--go_out=$(PWD)/model/prototest/ \
 		model/proto/model_test.proto
 
+
 .PHONY: proto-install
 proto-install:
 	go get -u github.com/golang/glog