Merge pull request #3259 from dougm/vapi-operation-id

vapi: add support for OperationID header

vapi/rest/client.go

@@ -31,6 +31,7 @@ import (
 	"github.com/vmware/govmomi/vapi/internal"
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
 )
 
 // Client extends soap.Client to support JSON encoding, while inheriting security features, debug tracing and session persistence.
@@ -179,6 +180,11 @@ func (c *Client) Do(ctx context.Context, req *http.Request, resBody interface{})
 		}
 	}
 
+	// OperationID (see soap.Client.soapRoundTrip)
+	if id, ok := ctx.Value(types.ID{}).(string); ok {
+		req.Header.Add("X-Request-ID", id)
+	}
+
 	if headers, ok := ctx.Value(headersContext{}).(http.Header); ok {
 		for k, v := range headers {
 			for _, v := range v {