Address comments

m3db · Jun 6, 2017 · b2e7996 · b2e7996
1 parent aa76a6e
commit b2e7996
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/server/msgpack/options.go b/server/msgpack/options.go
@@ -49,7 +49,7 @@ type Options interface {
 
 type options struct {
 	instrumentOpts instrument.Options
-	rOpts          xretry.Options
+	retryOpts      xretry.Options
 	iteratorPool   msgpack.UnaggregatedIteratorPool
 }
 
@@ -63,7 +63,7 @@ func NewOptions() Options {
 
 	return &options{
 		instrumentOpts: instrument.NewOptions(),
-		rOpts:          xretry.NewOptions(),
+		retryOpts:      xretry.NewOptions(),
 		iteratorPool:   iteratorPool,
 	}
 }
@@ -80,12 +80,12 @@ func (o *options) InstrumentOptions() instrument.Options {
 
 func (o *options) SetRetryOptions(value xretry.Options) Options {
 	opts := *o
-	opts.rOpts = value
+	opts.retryOpts = value
 	return &opts
 }
 
 func (o *options) RetryOptions() xretry.Options {
-	return o.rOpts
+	return o.retryOpts
 }
 
 func (o *options) SetIteratorPool(value msgpack.UnaggregatedIteratorPool) Options {

diff --git a/server/msgpack/server.go b/server/msgpack/server.go
@@ -41,16 +41,14 @@ const (
 func NewServer(address string, aggregator aggregator.Aggregator, opts Options) xserver.Server {
 	iOpts := opts.InstrumentOptions()
 	scope := iOpts.MetricsScope()
-	return xserver.NewServer(
-		address,
-		NewHandler(
-			aggregator,
-			opts.SetInstrumentOptions(iOpts.SetMetricsScope(scope.Tagged(map[string]string{"handler": "msgpack"}))),
-		),
-		xserver.NewOptions().
-			SetInstrumentOptions(iOpts.SetMetricsScope(scope.Tagged(map[string]string{"server": "msgpack"}))).
-			SetRetryOptions(opts.RetryOptions()),
-	)
+
+	handlerInstrumentOpts := iOpts.SetMetricsScope(scope.Tagged(map[string]string{"handler": "msgpack"}))
+	handler := NewHandler(aggregator, opts.SetInstrumentOptions(handlerInstrumentOpts))
+
+	serverInstrumentOpts := iOpts.SetMetricsScope(scope.Tagged(map[string]string{"server": "msgpack"}))
+	serverOpts := xserver.NewOptions().SetInstrumentOptions(serverInstrumentOpts).SetRetryOptions(opts.RetryOptions())
+
+	return xserver.NewServer(address, handler, serverOpts)
 }
 
 type handlerMetrics struct {

diff --git a/services/m3aggregator/config/server.go b/services/m3aggregator/config/server.go
@@ -50,8 +50,8 @@ func (c *MsgpackServerConfiguration) NewMsgpackServerOptions(
 	opts := msgpack.NewOptions().SetInstrumentOptions(instrumentOpts)
 
 	// Set retry options.
-	rOpts := c.Retry.NewOptions(instrumentOpts.MetricsScope())
-	opts = opts.SetRetryOptions(rOpts)
+	retryOpts := c.Retry.NewOptions(instrumentOpts.MetricsScope())
+	opts = opts.SetRetryOptions(retryOpts)
 
 	// Set unaggregated iterator pool.
 	iteratorPool := c.Iterator.NewUnaggregatedIteratorPool(instrumentOpts)