Simplify

Author: Paweł Rozynek

emf/logger.go

@@ -24,18 +24,18 @@ type Context struct {
 	values          map[string]interface{}
 }
 
-// NewOption defines a function that can be used to customize a logger.
-type NewOption func(l *Logger)
+// LoggerOption defines a function that can be used to customize a logger.
+type LoggerOption func(l *Logger)
 
 // WithWriter customizes the writer used by a logger.
-func WithWriter(w io.Writer) NewOption {
+func WithWriter(w io.Writer) LoggerOption {
 	return func(l *Logger) {
 		l.out = w
 	}
 }
 
 // WithTimestamp customizes the timestamp used by a logger.
-func WithTimestamp(t time.Time) NewOption {
+func WithTimestamp(t time.Time) LoggerOption {
 	return func(l *Logger) {
 		l.timestamp = t.UnixNano() / int64(time.Millisecond)
 	}
@@ -46,7 +46,7 @@ func WithTimestamp(t time.Time) NewOption {
 // - Context based on Lambda environment variables.
 // - Timestamp set to the time when NewWith was called.
 // Specify NewOptions to customize the logger.
-func NewWith(opts ...NewOption) *Logger {
+func New(opts ...LoggerOption) *Logger {
 	values := make(map[string]interface{})
 
 	// set default properties for lambda function
@@ -80,18 +80,6 @@ func NewWith(opts ...NewOption) *Logger {
 	return l
 }
 
-// New creates logger printing to os.Stdout, perfect for Lambda functions.
-// Deprecated: use NewWith instead.
-func New() *Logger {
-	return NewWith(WithWriter(os.Stdout))
-}
-
-// NewFor creates logger printing to any suitable writer.
-// Deprecated: use NewWith and WithWriter instead.
-func NewFor(out io.Writer) *Logger {
-	return NewWith(WithWriter(out))
-}
-
 // Dimension helps builds DimensionSet.
 type Dimension struct {
 	Key, Value string

emf/logger_internal_test.go

@@ -7,10 +7,10 @@ import (
 	"time"
 )
 
-func TestNewWith(t *testing.T) {
+func TestNew(t *testing.T) {
 	tcs := []struct {
 		name     string
-		opts     []NewOption
+		opts     []LoggerOption
 		expected *Logger
 	}{
 		{
@@ -22,7 +22,7 @@ func TestNewWith(t *testing.T) {
 		},
 		{
 			name: "with options",
-			opts: []NewOption{
+			opts: []LoggerOption{
 				WithWriter(os.Stderr),
 				WithTimestamp(time.Now().Add(time.Hour)),
 			},
@@ -35,7 +35,7 @@ func TestNewWith(t *testing.T) {
 
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			actual := NewWith(tc.opts...)
+			actual := New(tc.opts...)
 			if err := loggersEqual(actual, tc.expected); err != nil {
 				t.Errorf("logger does not match: %v", err)
 			}

emf/logger_test.go

@@ -181,7 +181,7 @@ func TestEmf(t *testing.T) {
 			}
 
 			var buf bytes.Buffer
-			logger := emf.NewFor(&buf)
+			logger := emf.New(emf.WithWriter(&buf))
 			tc.given(logger)
 			logger.Log()
 
@@ -196,7 +196,7 @@ func TestEmf(t *testing.T) {
 
 	t.Run("no metrics set", func(t *testing.T) {
 		var buf bytes.Buffer
-		logger := emf.NewFor(&buf)
+		logger := emf.New(emf.WithWriter(&buf))
 		logger.Log()
 
 		if buf.String() != "" {
@@ -206,7 +206,7 @@ func TestEmf(t *testing.T) {
 
 	t.Run("new context, no metrics set", func(t *testing.T) {
 		var buf bytes.Buffer
-		logger := emf.NewFor(&buf)
+		logger := emf.New(emf.WithWriter(&buf))
 		logger.NewContext().Namespace("galaxy")
 		logger.Log()