Update to latest version of lightstep-tracer-common (#109)

lightstep · Sep 27, 2017 · 1e25a64 · 1e25a64
1 parent ad2fc76
commit 1e25a64
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 97 deletions.
diff --git a/Makefile b/Makefile
@@ -43,8 +43,8 @@ collectorpb/collector.pb.go:
 else
 collectorpb/collector.pb.go: lightstep-tracer-common/collector.proto
 	docker run --rm -v $(shell pwd)/lightstep-tracer-common:/input:ro -v $(shell pwd)/collectorpb:/output \
-	  lightstep/protoc:latest \
-	  protoc --go_out=plugins=grpc:/output --proto_path=/input /input/collector.proto
+	  lightstep/grpc-gateway:latest \
+	  protoc -I/root/go/src/tmp/vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --go_out=plugins=grpc:/output --proto_path=/input /input/collector.proto
 endif
 
 # gRPC

diff --git a/collectorpb/collector.pb.go b/collectorpb/collector.pb.go
diff --git a/collectorpb/collectorpbfakes/fake_collector_service_client.go b/collectorpb/collectorpbfakes/fake_collector_service_client.go
diff --git a/grpc_logencoder.go b/grpc_logencoder.go
@@ -25,11 +25,11 @@ func marshalFields(
 	buffer *reportBuffer,
 ) {
 	lfe := grpcLogFieldEncoder{recorder, buffer, nil}
-	protoLog.Keyvalues = make([]*cpb.KeyValue, len(fields))
+	protoLog.Fields = make([]*cpb.KeyValue, len(fields))
 	for i, f := range fields {
 		lfe.currentKeyValue = &cpb.KeyValue{}
 		f.Marshal(&lfe)
-		protoLog.Keyvalues[i] = lfe.currentKeyValue
+		protoLog.Fields[i] = lfe.currentKeyValue
 	}
 }
 

diff --git a/lightstep-tracer-common b/lightstep-tracer-common
diff --git a/lightsteppb/lightstep_carrier.pb.go b/lightsteppb/lightstep_carrier.pb.go
diff --git a/test_utils_test.go b/test_utils_test.go
@@ -45,7 +45,7 @@ func (matcher haveKeyValuesMatcher) Match(actual interface{}) (bool, error) {
 	case []*cpb.KeyValue:
 		actualKeyValues = v
 	case *cpb.Log:
-		actualKeyValues = v.GetKeyvalues()
+		actualKeyValues = v.GetFields()
 	default:
 		return false, fmt.Errorf("HaveKeyValues matcher expects either a []*KeyValue or a *Log")
 	}