Add wire tracer capabilities to reference client

internal/app/connectconformance/testsuites/errors.yaml

@@ -412,6 +412,31 @@ testCases:
         responseTrailers:
         - name: x-custom-trailer
           value: ["bing"]
+# Client Stream Tests -----------------------------------------------------------
+- request:
+    testName: client stream error one request
+    service: connectrpc.conformance.v1.ConformanceService
+    method: ClientStream
+    streamType: STREAM_TYPE_CLIENT_STREAM
+    requestMessages:
+    - "@type": type.googleapis.com/connectrpc.conformance.v1.ClientStreamRequest
+      responseDefinition:
+        error:
+          code: 13
+          message: "client stream failed"
+- request:
+    testName: client stream error multiple requests
+    service: connectrpc.conformance.v1.ConformanceService
+    method: ClientStream
+    streamType: STREAM_TYPE_CLIENT_STREAM
+    requestMessages:
+    - "@type": type.googleapis.com/connectrpc.conformance.v1.ClientStreamRequest
+      responseDefinition:
+        error:
+          code: 13
+          message: "client stream failed"
+    - "@type": type.googleapis.com/connectrpc.conformance.v1.ClientStreamRequest
+      requestData: "dGVzdCByZXNwb25zZQ=="
 # Bidi Stream Tests -----------------------------------------------------------
 - request:
     testName: bidi full duplex stream error with responses

internal/app/referenceclient/client.go

@@ -216,9 +216,11 @@ func invoke(ctx context.Context, req *v1.ClientCompatRequest, trace *tracer.Trac
 	case v1.HTTPVersion_HTTP_VERSION_UNSPECIFIED:
 		return nil, errors.New("an HTTP version must be specified")
 	}
-	if trace != nil {
-		transport = tracer.TracingRoundTripper(transport, trace)
-	}
+
+	// Create a new TracingRoundTripper with our WireTracer so that the tests can trace values on the
+	// wire. Note that 'trace' could be nil, in which case, any error traces will
+	// simply not be printed.
+	transport = tracer.TracingRoundTripper(transport, NewWireTracer(trace))
 
 	if req.RawRequest != nil {
 		transport = &rawRequestSender{transport: transport, rawRequest: req.RawRequest}

internal/app/referenceclient/impl.go

@@ -27,6 +27,7 @@ import (
 	v1 "connectrpc.com/conformance/internal/gen/proto/go/connectrpc/conformance/v1"
 	"connectrpc.com/conformance/internal/gen/proto/go/connectrpc/conformance/v1/conformancev1connect"
 	"connectrpc.com/connect"
+	"google.golang.org/protobuf/types/known/structpb"
 )
 
 const clientName = "connectconformance-referenceclient"
@@ -117,8 +118,21 @@ func (i *invoker) unary(
 	var trailers []*v1.Header
 	payloads := make([]*v1.ConformancePayload, 0, 1)
 
+	ctx, wire := WithWireCapture(ctx)
+
 	// Invoke the Unary call
 	resp, err := i.client.Unary(ctx, request)
+
+	var actualStatusCode int32
+	var connectErrorRaw *structpb.Struct
+	var actualTrailers []*v1.Header
+	wireDetails := wire.Get()
+	if wireDetails != nil {
+		actualStatusCode = wireDetails.StatusCode
+		actualTrailers = wireDetails.Trailers
+		connectErrorRaw = wireDetails.ConnectErrorRaw
+	}
+
 	if err != nil {
 		// If an error was returned, first convert it to a Connect error
 		// so that we can get the headers from the Meta property. Then,
@@ -137,11 +151,13 @@ func (i *invoker) unary(
 	}
 
 	return &v1.ClientResponseResult{
-		ResponseHeaders:  headers,
-		ResponseTrailers: trailers,
-		Payloads:         payloads,
-		Error:            protoErr,
-		ConnectErrorRaw:  nil, // TODO
+		ResponseHeaders:    headers,
+		ResponseTrailers:   trailers,
+		Payloads:           payloads,
+		Error:              protoErr,
+		ActualStatusCode:   actualStatusCode,
+		ActualHttpTrailers: actualTrailers,
+		ConnectErrorRaw:    connectErrorRaw,
 	}, nil
 }
 
@@ -168,8 +184,21 @@ func (i *invoker) idempotentUnary(
 	var trailers []*v1.Header
 	payloads := make([]*v1.ConformancePayload, 0, 1)
 
+	ctx, wire := WithWireCapture(ctx)
+
 	// Invoke the Unary call
 	resp, err := i.client.IdempotentUnary(ctx, request)
+
+	var actualStatusCode int32
+	var connectErrorRaw *structpb.Struct
+	var actualTrailers []*v1.Header
+	wireDetails := wire.Get()
+	if wireDetails != nil {
+		actualStatusCode = wireDetails.StatusCode
+		actualTrailers = wireDetails.Trailers
+		connectErrorRaw = wireDetails.ConnectErrorRaw
+	}
+
 	if err != nil {
 		// If an error was returned, first convert it to a Connect error
 		// so that we can get the headers from the Meta property. Then,
@@ -186,11 +215,13 @@ func (i *invoker) idempotentUnary(
 	}
 
 	return &v1.ClientResponseResult{
-		ResponseHeaders:  headers,
-		ResponseTrailers: trailers,
-		Payloads:         payloads,
-		Error:            protoErr,
-		ConnectErrorRaw:  nil, // TODO
+		ResponseHeaders:    headers,
+		ResponseTrailers:   trailers,
+		Payloads:           payloads,
+		Error:              protoErr,
+		ActualStatusCode:   actualStatusCode,
+		ActualHttpTrailers: actualTrailers,
+		ConnectErrorRaw:    connectErrorRaw,
 	}, nil
 }
 
@@ -212,6 +243,8 @@ func (i *invoker) serverStream(
 	// Add the specified request headers to the request
 	internal.AddHeaders(req.RequestHeaders, request.Header())
 
+	ctx, wire := WithWireCapture(ctx)
+
 	stream, err := i.client.ServerStream(ctx, request)
 	if err != nil {
 		// If an error was returned, first convert it to a Connect error
@@ -272,12 +305,24 @@ func (i *invoker) serverStream(
 			protoErr = internal.ConvertErrorToProtoError(err)
 		}
 	}
+	var actualStatusCode int32
+	var connectErrorRaw *structpb.Struct
+	var actualTrailers []*v1.Header
+	wireDetails := wire.Get()
+	if wireDetails != nil {
+		actualStatusCode = wireDetails.StatusCode
+		actualTrailers = wireDetails.Trailers
+		connectErrorRaw = wireDetails.ConnectErrorRaw
+	}
+
 	return &v1.ClientResponseResult{
-		ResponseHeaders:  headers,
-		ResponseTrailers: trailers,
-		Payloads:         payloads,
-		Error:            protoErr,
-		ConnectErrorRaw:  nil, // TODO
+		ResponseHeaders:    headers,
+		ResponseTrailers:   trailers,
+		Payloads:           payloads,
+		Error:              protoErr,
+		ActualStatusCode:   actualStatusCode,
+		ActualHttpTrailers: actualTrailers,
+		ConnectErrorRaw:    connectErrorRaw,
 	}, nil
 }
 
@@ -288,6 +333,7 @@ func (i *invoker) clientStream(
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
+	ctx, wire := WithWireCapture(ctx)
 	stream := i.client.ClientStream(ctx)
 
 	// Add the specified request headers to the request
@@ -340,13 +386,24 @@ func (i *invoker) clientStream(
 		headers = internal.ConvertToProtoHeader(resp.Header())
 		trailers = internal.ConvertToProtoHeader(resp.Trailer())
 	}
+	var actualStatusCode int32
+	var connectErrorRaw *structpb.Struct
+	var actualTrailers []*v1.Header
+	wireDetails := wire.Get()
+	if wireDetails != nil {
+		actualStatusCode = wireDetails.StatusCode
+		actualTrailers = wireDetails.Trailers
+		connectErrorRaw = wireDetails.ConnectErrorRaw
+	}
 
 	return &v1.ClientResponseResult{
-		ResponseHeaders:  headers,
-		ResponseTrailers: trailers,
-		Payloads:         payloads,
-		Error:            protoErr,
-		ConnectErrorRaw:  nil, // TODO
+		ResponseHeaders:    headers,
+		ResponseTrailers:   trailers,
+		Payloads:           payloads,
+		Error:              protoErr,
+		ActualStatusCode:   actualStatusCode,
+		ActualHttpTrailers: actualTrailers,
+		ConnectErrorRaw:    connectErrorRaw,
 	}, nil
 }
 
@@ -361,6 +418,8 @@ func (i *invoker) bidiStream(
 		ConnectErrorRaw: nil, // TODO
 	}
 
+	ctx, wire := WithWireCapture(ctx)
+
 	stream := i.client.BidiStream(ctx)
 	defer func() {
 		if result != nil {
@@ -466,6 +525,19 @@ func (i *invoker) bidiStream(
 		result.Payloads = append(result.Payloads, msg.Payload)
 	}
 
+	var actualStatusCode int32
+	var connectErrorRaw *structpb.Struct
+	var actualTrailers []*v1.Header
+	wireDetails := wire.Get()
+	if wireDetails != nil {
+		actualStatusCode = wireDetails.StatusCode
+		actualTrailers = wireDetails.Trailers
+		connectErrorRaw = wireDetails.ConnectErrorRaw
+	}
+	result.ActualStatusCode = actualStatusCode
+	result.ActualHttpTrailers = actualTrailers
+	result.ConnectErrorRaw = connectErrorRaw
+
 	if protoErr != nil {
 		result.Error = protoErr
 		return result, nil
@@ -491,10 +563,25 @@ func (i *invoker) unimplemented(
 	request := connect.NewRequest(ur)
 	internal.AddHeaders(req.RequestHeaders, request.Header())
 
+	ctx, wire := WithWireCapture(ctx)
+
 	// Invoke the Unary call
 	_, err := i.client.Unimplemented(ctx, request)
+
+	var actualStatusCode int32
+	var connectErrorRaw *structpb.Struct
+	var actualTrailers []*v1.Header
+	wireDetails := wire.Get()
+	if wireDetails != nil {
+		actualStatusCode = wireDetails.StatusCode
+		actualTrailers = wireDetails.Trailers
+		connectErrorRaw = wireDetails.ConnectErrorRaw
+	}
 	return &v1.ClientResponseResult{
-		Error: internal.ConvertErrorToProtoError(err),
+		Error:              internal.ConvertErrorToProtoError(err),
+		ActualStatusCode:   actualStatusCode,
+		ActualHttpTrailers: actualTrailers,
+		ConnectErrorRaw:    connectErrorRaw,
 	}, nil
 }