diff --git a/pkg/logs/aws_test.go b/pkg/logs/aws_test.go index 6b38a680a..d04e7f8f9 100644 --- a/pkg/logs/aws_test.go +++ b/pkg/logs/aws_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewAWSWrapper(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewAWSWrapper(zerolog.New(out).With().Caller().Logger()) logger.Log("foo") + + assert.Equal(t, " DBG aws_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/datadog_test.go b/pkg/logs/datadog_test.go index a5aded73e..41c6df410 100644 --- a/pkg/logs/datadog_test.go +++ b/pkg/logs/datadog_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewDatadogLogger(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewDatadogLogger(zerolog.New(out).With().Caller().Logger()) logger.Log("foo") + + assert.Equal(t, " DBG datadog_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/elastic_test.go b/pkg/logs/elastic_test.go index 9e7a2aee3..e00604dba 100644 --- a/pkg/logs/elastic_test.go +++ b/pkg/logs/elastic_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewElasticLogger(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewElasticLogger(zerolog.New(out).With().Caller().Logger()) logger.Errorf("foo") + + assert.Equal(t, " ERR elastic_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/gokit_test.go b/pkg/logs/gokit_test.go index 51a639812..791157bfe 100644 --- a/pkg/logs/gokit_test.go +++ b/pkg/logs/gokit_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewGoKitWrapper(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewGoKitWrapper(zerolog.New(out).With().Caller().Logger()) _ = logger.Log("foo") + + assert.Equal(t, " DBG gokit_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/haystack_test.go b/pkg/logs/haystack_test.go index c66a9b972..a6342bd99 100644 --- a/pkg/logs/haystack_test.go +++ b/pkg/logs/haystack_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewHaystackLogger(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewHaystackLogger(zerolog.New(out).With().Caller().Logger()) logger.Info("foo") + + assert.Equal(t, " INF haystack_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/hclog_test.go b/pkg/logs/hclog_test.go index f751fd65c..02681d7d6 100644 --- a/pkg/logs/hclog_test.go +++ b/pkg/logs/hclog_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewRetryableHTTPLogger(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewRetryableHTTPLogger(zerolog.New(out).With().Caller().Logger()) logger.Info("foo") + + assert.Equal(t, " INF hclog_test.go:21 > Foo\n", buf.String()) } diff --git a/pkg/logs/instana_test.go b/pkg/logs/instana_test.go index 827f5a45b..38b53f2a5 100644 --- a/pkg/logs/instana_test.go +++ b/pkg/logs/instana_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewInstanaLogger(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewInstanaLogger(zerolog.New(out).With().Caller().Logger()) logger.Info("foo") + + assert.Equal(t, " INF instana_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/jaeger_test.go b/pkg/logs/jaeger_test.go index 768e8c777..7ab6fe53d 100644 --- a/pkg/logs/jaeger_test.go +++ b/pkg/logs/jaeger_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewJaegerLogger(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewJaegerLogger(zerolog.New(out).With().Caller().Logger()) logger.Infof("foo") + + assert.Equal(t, " DBG jaeger_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/log_test.go b/pkg/logs/log_test.go index 14d749fad..5c80e76f8 100644 --- a/pkg/logs/log_test.go +++ b/pkg/logs/log_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNoLevel(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NoLevel(zerolog.New(out).With().Caller().Logger(), zerolog.DebugLevel) logger.Info().Msg("foo") + + assert.Equal(t, " INF log_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/logrus_test.go b/pkg/logs/logrus_test.go index cc3155044..af3c085c9 100644 --- a/pkg/logs/logrus_test.go +++ b/pkg/logs/logrus_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewLogrusStdWrapper(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewLogrusWrapper(zerolog.New(out).With().Caller().Logger()) logger.Println("foo") + + assert.Equal(t, " DBG logrus_test.go:21 > foo\n", buf.String()) } diff --git a/pkg/logs/oxy_test.go b/pkg/logs/oxy_test.go index 4ce102893..564598647 100644 --- a/pkg/logs/oxy_test.go +++ b/pkg/logs/oxy_test.go @@ -1,17 +1,24 @@ package logs import ( + "bytes" "os" "testing" "time" "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" ) func TestNewOxyWrapper(t *testing.T) { - out := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339} + buf := bytes.NewBuffer(nil) + cwb := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.RFC3339, NoColor: true} + + out := zerolog.MultiLevelWriter(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}, cwb) logger := NewOxyWrapper(zerolog.New(out).With().Caller().Logger()) logger.Info("foo") + + assert.Equal(t, " INF oxy_test.go:21 > foo\n", buf.String()) }