Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add logs in tchannel client #859

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add logs in tchannel client #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c2761dc
Update tchannel_client.go
groshu Apr 5, 2023
9d516ff
Update tchannel_outbound_call.go
groshu Apr 5, 2023
1bc9b63
adding more logs
groshu Apr 7, 2023
c9e751b
adding more logs
groshu Apr 7, 2023
6c62e67
adding more logs
groshu Apr 10, 2023
d9b9d70
adding more logs
groshu Apr 10, 2023
18cc6dd
adding more logs
groshu Apr 10, 2023
c47b104
adding more logs
groshu Apr 10, 2023
7ecdac8
adding more logs
groshu Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion runtime/tchannel_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ package zanzibar

import (
"context"
"fmt"
"strings"
"time"

"github.com/pkg/errors"
"github.com/uber-go/tally"
"github.com/uber/tchannel-go"
"github.com/uber/zanzibar/runtime/ruleengine"
"go.uber.org/zap"
netContext "golang.org/x/net/context"
)

Expand Down Expand Up @@ -191,8 +193,10 @@ func (c *TChannelClient) call(
}()
call.start()

ctx = call.contextLogger.WarnZ(ctx, "Tchannel call started")
reqUUID := RequestUUIDFromCtx(ctx)
if reqUUID != "" {
ctx = context.WithValue(ctx, "requestUUID", reqUUID)
if reqHeaders == nil {
reqHeaders = make(map[string]string)
}
Expand Down Expand Up @@ -235,49 +239,67 @@ func (c *TChannelClient) call(
ctxBuilder.SetShardKey(sk)
}

ctx, cancel := ctxBuilder.Build()
ctx1, cancel := ctxBuilder.Build()
ctx = call.contextLogger.WarnZ(ctx1, "context headers", zap.Any("context-headers1", ctx1.Headers()))
defer cancel()

deadline, ok := ctx.Deadline()
if ok {
ctx = call.contextLogger.WarnZ(ctx, "ctxBuilder.Build", zap.Time("tchannel-client-deadline", deadline))
}

err = c.ch.RunWithRetry(ctx, func(ctx netContext.Context, rs *tchannel.RequestState) (cerr error) {
call.resHeaders = map[string]string{}
call.success = false

sc, ctx := c.getDynamicChannelWithFallback(reqHeaders, c.sc, ctx)
ctx = call.contextLogger.Warn(ctx, fmt.Sprintf("Initiating tchannel call with attempt : %d", rs.Attempt))
call.call, cerr = sc.BeginCall(ctx, call.serviceMethod, &tchannel.CallOptions{
Format: tchannel.Thrift,
ShardKey: GetShardKeyFromCtx(ctx),
RequestState: rs,
RoutingDelegate: GetRoutingDelegateFromCtx(ctx),
})
ctx = call.contextLogger.Warn(ctx, "tchannel call tried", zap.Bool("call-nil", call.call == nil), zap.Bool("call-error", cerr != nil))
if cerr != nil {
ctx = call.contextLogger.Warn(ctx, "Error in tchannel call", zap.String("cerr", cerr.Error()))
return errors.Wrapf(
err, "Could not begin outbound %s.%s (%s %s) request",
call.client.ClientID, call.methodName, call.client.serviceName, call.serviceMethod,
)
}

if call.call != nil && call.call.Response() != nil {
ctx = call.contextLogger.Warn(ctx, fmt.Sprintf("outbound call response format : %s", call.call.Response().Format().String()))
}
// trace request
reqHeaders = tchannel.InjectOutboundSpan(call.call.Response(), reqHeaders)

if cerr := call.writeReqHeaders(reqHeaders); cerr != nil {
ctx = call.contextLogger.Warn(ctx, "Error in tchannel req headers", zap.String("cerr", cerr.Error()))
return cerr
}
if cerr := call.writeReqBody(ctx, req); cerr != nil {
ctx = call.contextLogger.Warn(ctx, "Error in tchannel req body", zap.String("cerr", cerr.Error()))
return cerr
}

response := call.call.Response()
if cerr = call.readResHeaders(response); cerr != nil {
ctx = call.contextLogger.Warn(ctx, "Error in tchannel res headers", zap.String("cerr", cerr.Error()))
return cerr
}
if cerr = call.readResBody(ctx, response, resp); cerr != nil {
ctx = call.contextLogger.Warn(ctx, "Error in tchannel res body", zap.String("cerr", cerr.Error()))
return cerr
}

ctx = call.contextLogger.Warn(ctx, "No Error in tchannel call", zap.Bool("cerr", cerr != nil))
return cerr
})

if err != nil {
ctx = call.contextLogger.Warn(ctx, "Error in tchannel final", zap.String("tchannel-err", err.Error()))
// Do not wrap system errors.
if _, ok := err.(tchannel.SystemError); ok {
return call.success, call.resHeaders, err
Expand Down
8 changes: 7 additions & 1 deletion runtime/tchannel_outbound_call.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ func (c *tchannelOutboundCall) start() {
func (c *tchannelOutboundCall) finish(ctx context.Context, err error) {
c.finishTime = time.Now()

ctx = c.contextLogger.InfoZ(ctx, "Finishing tchannel call")

// emit metrics
if err != nil {
errCause := tchannel.GetSystemErrorCode(errors.Cause(err))
Expand All @@ -76,7 +78,11 @@ func (c *tchannelOutboundCall) finish(ctx context.Context, err error) {
// write logs
fields := c.logFields(ctx)
if err == nil {
c.contextLogger.Debug(ctx, "Finished an outgoing client TChannel request", fields...)
if c.success {
c.contextLogger.Debug(ctx, "Finished an outgoing client TChannel request", fields...)
} else {
c.contextLogger.Warn(ctx, "Unsuccessful outgoing client TChannel request", fields...)
}
} else {
fields = append(fields, zap.Error(err))
c.contextLogger.Warn(ctx, "Failed to send outgoing client TChannel request", fields...)
Expand Down