Merge 28e2ad0 into e668e50

codegen/templates/tchannel_endpoint.tmpl

@@ -244,10 +244,14 @@ func (h *{{$handlerName}}) redirectToDeputy(
 		"{{.ThriftService}}::{{.Name}}": "{{$methodName}}",
 	}
 
-	sub := h.Deps.Default.Channel.GetSubChannel(serviceName, tchannel.Isolated)
-	sub.Peers().Add(hostPort)
+	deputyChannel, err := tchannel.NewChannel(serviceName, nil)
+	if err != nil {
+		h.Deps.Default.ContextLogger.Error(ctx, "Deputy Failure", zap.Error(err))
+	}
+	defer deputyChannel.Close()
+	deputyChannel.Peers().Add(hostPort)
 	client := zanzibar.NewTChannelClientContext(
-		h.Deps.Default.Channel,
+		deputyChannel,
 		h.Deps.Default.Logger,
 		h.Deps.Default.ContextMetrics,
 		h.Deps.Default.ContextExtractor,
@@ -262,10 +266,6 @@ func (h *{{$handlerName}}) redirectToDeputy(
 	)
 
 	success, respHeaders, err := client.Call(ctx, "{{.ThriftService}}", "{{$methodName}}", reqHeaders, req, res)
-	// hostPort is added above, so there should not be any error returned for the
-	// following line
-	// nolint
-	_ = sub.Peers().Remove(hostPort)
 	return success, res, respHeaders, err
 }
 {{end -}}