diff --git a/examples/addsvc/client/thrift/client.go b/examples/addsvc/client/thrift/client.go
index 15660f3..4463ae8 100644
--- a/examples/addsvc/client/thrift/client.go
+++ b/examples/addsvc/client/thrift/client.go
@@ -42,10 +42,10 @@
 	{
 		concatEndpoint = addsvc.MakeThriftConcatEndpoint(client)
 		concatEndpoint = limiter(concatEndpoint)
-		sumEndpoint = circuitbreaker.Gobreaker(gobreaker.NewCircuitBreaker(gobreaker.Settings{
+		concatEndpoint = circuitbreaker.Gobreaker(gobreaker.NewCircuitBreaker(gobreaker.Settings{
 			Name:    "Concat",
 			Timeout: 30 * time.Second,
-		}))(sumEndpoint)
+		}))(concatEndpoint)
 	}
 
 	return addsvc.Endpoints{
diff --git a/tracing/opentracing/endpoint.go b/tracing/opentracing/endpoint.go
index a193ef8..51934fa 100644
--- a/tracing/opentracing/endpoint.go
+++ b/tracing/opentracing/endpoint.go
@@ -24,7 +24,7 @@
 				serverSpan.SetOperationName(operationName)
 			}
 			defer serverSpan.Finish()
-			otext.SpanKind.Set(serverSpan, otext.SpanKindRPCServer)
+			otext.SpanKindRPCServer.Set(serverSpan)
 			ctx = opentracing.ContextWithSpan(ctx, serverSpan)
 			return next(ctx, request)
 		}
@@ -46,7 +46,7 @@
 				clientSpan = tracer.StartSpan(operationName)
 			}
 			defer clientSpan.Finish()
-			otext.SpanKind.Set(clientSpan, otext.SpanKindRPCClient)
+			otext.SpanKindRPCClient.Set(clientSpan)
 			ctx = opentracing.ContextWithSpan(ctx, clientSpan)
 			return next(ctx, request)
 		}