Fix bad merge
Peter Bourgon
8 years ago
| 19 | 19 |
// service.
|
| 20 | 20 |
func proxyAdd(remote endpoint.Endpoint, logger log.Logger) Add {
|
| 21 | 21 |
return func(ctx context.Context, a, b int64) int64 {
|
| 22 | |
resp, err := e(ctx, reqrep.AddRequest{A: a, B: b})
|
|
22 |
resp, err := remote(ctx, reqrep.AddRequest{A: a, B: b})
|
| 23 | 23 |
if err != nil {
|
| 24 | 24 |
logger.Log("err", err)
|
| 25 | 25 |
return 0
|
| 108 | 108 |
|
| 109 | 109 |
// Our business and operational domain
|
| 110 | 110 |
var a Add = pureAdd
|
| 111 | |
if *proxyHTTPAddr != "" {
|
|
111 |
if *proxyHTTPURL != "" {
|
| 112 | 112 |
var e endpoint.Endpoint
|
| 113 | |
e = httpclient.NewClient("GET", *proxyHTTPAddr, zipkin.ToRequest(zipkinSpanFunc))
|
|
113 |
e = httpclient.NewClient("GET", *proxyHTTPURL, zipkin.ToRequest(zipkinSpanFunc))
|
| 114 | 114 |
e = zipkin.AnnotateClient(zipkinSpanFunc, zipkinCollector)(e)
|
| 115 | 115 |
a = proxyAdd(e, logger)
|
| 116 | 116 |
}
|