Adapt to logger changes

integration/setup.go

@@ -99,7 +99,7 @@ func (ts *testServerSetup) startServer() error {
 			ts.httpServiceOpts,
 			ts.httpServerOpts,
 			ts.db,
-			ts.dbOpts.InstrumentOptions().Logger(),
+			ts.dbOpts.InstrumentOptions().Logger().Sugar(),
 			ts.doneCh,
 		); err != nil {
 			select {

persist/fs/reader.go

@@ -17,8 +17,7 @@ import (
 	"github.com/xichen2020/eventdb/values/decoding"
 	"github.com/xichen2020/eventdb/x/io"
 	"github.com/xichen2020/eventdb/x/mmap"
-
-	xlog "github.com/m3db/m3/src/x/log"
+	"go.uber.org/zap"
 )
 
 // segmentReader is responsible for reading segments from filesystem.
@@ -51,7 +50,7 @@ type reader struct {
 	fieldPathSeparator string
 	timestampPrecision time.Duration
 	mmapHugeTLBOpts    mmap.HugeTLBOptions
-	logger             xlog.Logger
+	logger             *zap.SugaredLogger
 
 	info              *infopb.SegmentInfo
 	bytesBuf          bytes.Buffer
@@ -82,7 +81,7 @@ func newSegmentReader(
 			Enabled:   opts.MmapEnableHugePages(),
 			Threshold: opts.MmapHugePagesThreshold(),
 		},
-		logger: opts.InstrumentOptions().Logger(),
+		logger: opts.InstrumentOptions().Logger().Sugar(),
 		info:   &infopb.SegmentInfo{},
 		bd:     decoding.NewBoolDecoder(),
 		id:     decoding.NewIntDecoder(),

server/http/server.go

@@ -54,7 +54,7 @@ func (s *server) Serve(l net.Listener) error {
 }
 
 func (s *server) Close() {
-	logger := s.opts.InstrumentOptions().Logger()
+	logger := s.opts.InstrumentOptions().Logger().Sugar()
 	if err := s.server.Close(); err != nil {
 		logger.Errorf("http server close encountered error: %v\n", err)
 	} else {

services/eventdb/main/main.go

@@ -40,11 +40,13 @@ func main() {
 	}
 
 	// Create logger and metrics scope.
-	logger, err := cfg.Logging.BuildLogger()
+	l, err := cfg.Logging.BuildLogger()
 	if err != nil {
 		fmt.Printf("error creating logger: %v\n", err)
 		os.Exit(1)
 	}
+	logger := l.Sugar()
+
 	scope, closer, err := cfg.Metrics.NewRootScope()
 	if err != nil {
 		logger.Fatalf("error creating metrics root scope: %v", err)

services/eventdb/serve/serve.go

@@ -8,7 +8,7 @@ import (
 	"github.com/xichen2020/eventdb/server/http/handlers"
 	"github.com/xichen2020/eventdb/storage"
 
-	"github.com/m3db/m3/src/x/log"
+	"go.uber.org/zap"
 )
 
 // Serve starts serving HTTP traffic.
@@ -20,7 +20,7 @@ func Serve(
 	httpServiceOpts *handlers.Options,
 	httpServerOpts *httpserver.Options,
 	db storage.Database,
-	logger log.Logger,
+	logger *zap.SugaredLogger,
 	doneCh chan struct{},
 ) error {
 	grpcService := grpc.NewService(db, grpcServiceOpts)
@@ -29,6 +29,7 @@ func Serve(
 		return fmt.Errorf("could not start grpc server at %s: %v", grpcAddr, err)
 	}
 	defer grpcServer.Close()
+
 	logger.Infof("grpc server: listening on %s", grpcAddr)
 
 	httpService := handlers.NewService(db, httpServiceOpts)

storage/flush_mgr.go

@@ -11,8 +11,8 @@ import (
 	"github.com/m3db/m3/src/x/clock"
 	xerrors "github.com/m3db/m3/src/x/errors"
 	"github.com/m3db/m3/src/x/instrument"
-	xlog "github.com/m3db/m3/src/x/log"
 	"github.com/uber-go/tally"
+	"go.uber.org/zap"
 )
 
 type segmentPayload struct {
@@ -69,7 +69,7 @@ type flushManager struct {
 
 	opts   *Options
 	nowFn  clock.NowFn
-	logger xlog.Logger
+	logger *zap.Logger
 	pm     persist.Manager
 
 	state     flushManagerState
@@ -154,9 +154,9 @@ func (m *flushManager) flushLoop() {
 			if p.resultErr == nil {
 				m.metrics.flush.ReportSuccess(dur)
 			} else {
-				m.logger.WithFields(
-					xlog.NewField("namespace", string(p.namespace)),
-					xlog.NewErrField(p.resultErr),
+				m.logger.With(
+					zap.String("namespace", string(p.namespace)),
+					zap.Error(p.resultErr),
 				).Error("error flushing segment")
 				m.metrics.flush.ReportError(dur)
 			}

storage/fs_mgr.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	"github.com/m3db/m3/src/x/clock"
-	"github.com/m3db/m3/src/x/log"
+	"go.uber.org/zap"
 )
 
 type databaseFileSystemManager interface {
@@ -25,7 +25,7 @@ type fileSystemManager struct {
 
 	database database
 	opts     *Options
-	logger   log.Logger
+	logger   *zap.SugaredLogger
 	nowFn    clock.NowFn
 
 	status runStatus
@@ -35,7 +35,7 @@ func newFileSystemManager(database database, opts *Options) *fileSystemManager {
 	return &fileSystemManager{
 		database: database,
 		opts:     opts,
-		logger:   opts.InstrumentOptions().Logger(),
+		logger:   opts.InstrumentOptions().Logger().Sugar(),
 		nowFn:    opts.ClockOptions().NowFn(),
 	}
 }

storage/mediator.go

@@ -57,11 +57,11 @@ func newMediator(database database, opts *Options) databaseMediator {
 		database:                  database,
 		databaseTickManager:       newTickManager(database, opts.SetInstrumentOptions(tickMgrOpts)),
 		databaseFileSystemManager: newFileSystemManager(database, opts.SetInstrumentOptions(fsMgrOpts)),
-		opts:     opts,
-		nowFn:    opts.ClockOptions().NowFn(),
-		sleepFn:  time.Sleep,
-		state:    mediatorNotOpen,
-		closedCh: make(chan struct{}),
+		opts:                      opts,
+		nowFn:                     opts.ClockOptions().NowFn(),
+		sleepFn:                   time.Sleep,
+		state:                     mediatorNotOpen,
+		closedCh:                  make(chan struct{}),
 	}
 }
 
@@ -108,7 +108,7 @@ func (m *mediator) ongoingTick() {
 			if err := m.Tick(); err == errTickInProgress {
 				m.sleepFn(tickCheckInterval)
 			} else if err != nil {
-				log := m.opts.InstrumentOptions().Logger()
+				log := m.opts.InstrumentOptions().Logger().Sugar()
 				log.Errorf("error within ongoingTick: %v", err)
 			}
 		}

storage/namespace.go

@@ -17,8 +17,8 @@ import (
 	"github.com/m3db/m3/src/x/clock"
 	xerrors "github.com/m3db/m3/src/x/errors"
 	"github.com/m3db/m3/src/x/instrument"
-	xlog "github.com/m3db/m3/src/x/log"
 	"github.com/uber-go/tally"
+	"go.uber.org/zap"
 )
 
 // databaseNamespace is a database namespace.
@@ -95,7 +95,7 @@ type dbNamespace struct {
 	segmentBuilderOpts *segment.BuilderOptions
 	segmentOpts        *segmentOptions
 	flushManager       databaseFlushManager
-	logger             xlog.Logger
+	logger             *zap.SugaredLogger
 
 	closed bool
 
@@ -151,7 +151,7 @@ func newDatabaseNamespace(
 		segmentBuilderOpts:  segmentBuilderOpts,
 		segmentOpts:         segmentOpts,
 		flushManager:        opts.databaseFlushManager(),
-		logger:              opts.InstrumentOptions().Logger(),
+		logger:              opts.InstrumentOptions().Logger().Sugar(),
 		sealedByMaxTimeAsc:  skiplist.New(),
 		metrics:             newDatabaseNamespaceMetrics(scope, samplingRate),
 		nowFn:               opts.ClockOptions().NowFn(),

tools/benchdb/main/main.go

@@ -13,13 +13,14 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/m3db/m3/src/x/instrument"
+
 	"github.com/xichen2020/eventdb/document"
 	"github.com/xichen2020/eventdb/document/field"
 	"github.com/xichen2020/eventdb/parser/json"
 	"github.com/xichen2020/eventdb/parser/json/value"
 	"github.com/xichen2020/eventdb/storage"
 
-	"github.com/m3db/m3/src/x/log"
 	"github.com/pborman/uuid"
 )
 
@@ -29,9 +30,8 @@ var (
 	excludeKeySuffix = flag.String("excludeKeySuffix", "", "excluding keys with given suffix")
 	numWorkers       = flag.Int("numWorkers", 1, "number of workers processing events in parallel")
 	cpuProfileFile   = flag.String("cpuProfileFile", "cpu.profile", "path to CPU profile")
-
-	logger         = log.SimpleLogger
-	eventNamespace = []byte("testNamespace")
+	eventNamespace   = []byte("testNamespace")
+	logger           = instrument.NewOptions().Logger().Sugar()
 )
 
 func main() {