[glide] Update m3x and m3cluster dependencies

glide.yaml

@@ -1,12 +1,12 @@
 package: github.com/m3db/m3metrics
 import:
 - package: github.com/m3db/m3x
-  version: bd6be18ffb184691512eb442561b16a59c15d797
+  version: 6e9713eca6718643e105f574be392f122bcc062e
   subpackages:
   - pool
   - time
 - package: github.com/m3db/m3cluster
-  version: b596a86b06f37c9150ea352d6ec1549ed19f304b
+  version: 3ca6883175651960ca2f93ba91198bbb9a84f5be
   subpackages:
   - kv
   - kv/mem

matcher/cache/cache.go

@@ -29,7 +29,7 @@ import (
 	"github.com/m3db/m3metrics/matcher"
 	"github.com/m3db/m3metrics/rules"
 	"github.com/m3db/m3x/clock"
-	"github.com/m3db/m3x/id"
+	xid "github.com/m3db/m3x/id"
 
 	"github.com/uber-go/tally"
 )

matcher/cache/cache_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/m3db/m3metrics/matcher"
 	"github.com/m3db/m3metrics/rules"
 	"github.com/m3db/m3x/clock"
-	"github.com/m3db/m3x/id"
+	xid "github.com/m3db/m3x/id"
 
 	"github.com/stretchr/testify/require"
 )

matcher/cache/list.go

@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/m3db/m3metrics/rules"
-	"github.com/m3db/m3x/id"
+	xid "github.com/m3db/m3x/id"
 )
 
 // element is a list element

matcher/cache/list_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/m3db/m3metrics/policy"
 	"github.com/m3db/m3metrics/rules"
 	xid "github.com/m3db/m3x/id"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

matcher/namespaces.go

@@ -30,7 +30,7 @@ import (
 	"github.com/m3db/m3metrics/generated/proto/schema"
 	"github.com/m3db/m3metrics/rules"
 	"github.com/m3db/m3x/clock"
-	"github.com/m3db/m3x/id"
+	xid "github.com/m3db/m3x/id"
 	"github.com/m3db/m3x/log"
 
 	"github.com/uber-go/tally"
@@ -91,7 +91,7 @@ type namespaces struct {
 	store                kv.Store
 	opts                 Options
 	nowFn                clock.NowFn
-	log                  xlog.Logger
+	log                  log.Logger
 	ruleSetKeyFn         RuleSetKeyFn
 	matchRangePast       time.Duration
 	onNamespaceAddedFn   OnNamespaceAddedFn
@@ -146,8 +146,8 @@ func (n *namespaces) Open() error {
 	// from starting up.
 	n.metrics.initWatchErrors.Inc(1)
 	n.opts.InstrumentOptions().Logger().WithFields(
-		xlog.NewLogField("key", n.key),
-		xlog.NewLogErrField(err),
+		log.NewField("key", n.key),
+		log.NewErrField(err),
 	).Error("error initializing namespaces values, retrying in the background")
 	return nil
 }
@@ -237,7 +237,7 @@ func (n *namespaces) process(value interface{}) error {
 		// This should never happen but just to be on the defensive side.
 		if len(snapshots) == 0 {
 			n.log.WithFields(
-				xlog.NewLogField("version", version),
+				log.NewField("version", version),
 			).Warn("namespace updates have no snapshots")
 		} else {
 			latestSnapshot := snapshots[len(snapshots)-1]
@@ -256,8 +256,8 @@ func (n *namespaces) process(value interface{}) error {
 			if err := ruleSet.Watch(); err != nil {
 				n.metrics.watchErrors.Inc(1)
 				n.log.WithFields(
-					xlog.NewLogField("ruleSetKey", ruleSet.Key()),
-					xlog.NewLogErrField(err),
+					log.NewField("ruleSetKey", ruleSet.Key()),
+					log.NewErrField(err),
 				).Error("failed to watch ruleset updates")
 			}
 		}

matcher/namespaces_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/m3db/m3cluster/kv/mem"
 	"github.com/m3db/m3metrics/generated/proto/schema"
 	"github.com/m3db/m3metrics/rules"
-	"github.com/m3db/m3x/id"
+	xid "github.com/m3db/m3x/id"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/stretchr/testify/require"

policy/policy_benchmark_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 )
 
 var (

policy/policy_test.go

@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/m3db/m3metrics/generated/proto/schema"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 	yaml "gopkg.in/yaml.v2"

policy/resolution.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 )
 
 const (

policy/resolution_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

policy/staged_policy_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 	"github.com/stretchr/testify/require"
 )
 

policy/storage_policy.go

@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"github.com/m3db/m3metrics/generated/proto/schema"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 )
 
 const (

policy/storage_policy_test.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/m3db/m3metrics/generated/proto/schema"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 	yaml "gopkg.in/yaml.v2"

protocol/msgpack/aggregated_roundtrip_test.go

@@ -30,7 +30,7 @@ import (
 	"github.com/m3db/m3metrics/metric/aggregated"
 	"github.com/m3db/m3metrics/metric/id"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

protocol/msgpack/base_iterator.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/m3db/m3metrics/metric/id"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	msgpack "gopkg.in/vmihailenco/msgpack.v2"
 )

protocol/msgpack/base_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 	"github.com/stretchr/testify/require"
 )
 

protocol/msgpack/unaggregated_encoder_test.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/m3db/m3metrics/metric/unaggregated"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

protocol/msgpack/unaggregated_iterator_test.go

@@ -31,7 +31,7 @@ import (
 	"github.com/m3db/m3metrics/metric/id"
 	"github.com/m3db/m3metrics/metric/unaggregated"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

protocol/msgpack/unaggregated_roundtrip_test.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/m3db/m3metrics/metric/unaggregated"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

rules/mapping_test.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/m3db/m3metrics/generated/proto/schema"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

rules/result_test.go

@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

rules/rollup_test.go

@@ -26,7 +26,7 @@ import (
 
 	"github.com/m3db/m3metrics/generated/proto/schema"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 )

rules/ruleset_test.go

@@ -30,7 +30,7 @@ import (
 	"github.com/m3db/m3metrics/generated/proto/schema"
 	"github.com/m3db/m3metrics/metric/id"
 	"github.com/m3db/m3metrics/policy"
-	"github.com/m3db/m3x/time"
+	xtime "github.com/m3db/m3x/time"
 
 	"github.com/stretchr/testify/require"
 	yaml "gopkg.in/yaml.v2"