Fixes

Signed-off-by: Yuri Shkuro <[email protected]>

Author: Yuri Shkuro

cmd/collector/app/zipkin/http_handler_test.go

@@ -93,7 +93,7 @@ func waitForSpans(t *testing.T, handler *mockZipkinHandler, expecting int) {
 			t.Error("never received a span")
 			return
 		}
-		if want, have := expecting, len(handler.getSpans()); want != have {
+		if have := len(handler.getSpans()); expecting != have {
 			time.Sleep(time.Millisecond)
 			continue
 		}

cmd/collector/app/zipkin/json.go

@@ -149,7 +149,7 @@ func endpointToThrift(e endpoint) (*zipkincore.Endpoint, error) {
 	}
 	port := e.Port
 	if port >= (1 << 15) {
-		// Zipkin.thrift defines port as i16, so values between (2^16 and 2^16-1) must be encoded as negative
+		// Zipkin.thrift defines port as i16, so values between (2^15 and 2^16-1) must be encoded as negative
 		port = port - (1 << 16)
 	}