diff --git a/log/mocks/Logger.go b/log/mocks/Logger.go new file mode 100644 index 00000000..2e2d6013 --- /dev/null +++ b/log/mocks/Logger.go @@ -0,0 +1,120 @@ +// Code generated by mockery v2.15.0. DO NOT EDIT. + +package mocks + +import ( + log "github.com/getamis/sirius/log" + mock "github.com/stretchr/testify/mock" +) + +// Logger is an autogenerated mock type for the Logger type +type Logger struct { + mock.Mock +} + +// Crit provides a mock function with given fields: msg, ctx +func (_m *Logger) Crit(msg string, ctx ...interface{}) { + var _ca []interface{} + _ca = append(_ca, msg) + _ca = append(_ca, ctx...) + _m.Called(_ca...) +} + +// Debug provides a mock function with given fields: msg, ctx +func (_m *Logger) Debug(msg string, ctx ...interface{}) { + var _ca []interface{} + _ca = append(_ca, msg) + _ca = append(_ca, ctx...) + _m.Called(_ca...) +} + +// Error provides a mock function with given fields: msg, ctx +func (_m *Logger) Error(msg string, ctx ...interface{}) { + var _ca []interface{} + _ca = append(_ca, msg) + _ca = append(_ca, ctx...) + _m.Called(_ca...) +} + +// GetHandler provides a mock function with given fields: +func (_m *Logger) GetHandler() log.Handler { + ret := _m.Called() + + var r0 log.Handler + if rf, ok := ret.Get(0).(func() log.Handler); ok { + r0 = rf() + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(log.Handler) + } + } + + return r0 +} + +// Info provides a mock function with given fields: msg, ctx +func (_m *Logger) Info(msg string, ctx ...interface{}) { + var _ca []interface{} + _ca = append(_ca, msg) + _ca = append(_ca, ctx...) + _m.Called(_ca...) +} + +// New provides a mock function with given fields: ctx +func (_m *Logger) New(ctx ...interface{}) log.Logger { + var _ca []interface{} + _ca = append(_ca, ctx...) + ret := _m.Called(_ca...) + + var r0 log.Logger + if rf, ok := ret.Get(0).(func(...interface{}) log.Logger); ok { + r0 = rf(ctx...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(log.Logger) + } + } + + return r0 +} + +// SetHandler provides a mock function with given fields: h +func (_m *Logger) SetHandler(h log.Handler) { + _m.Called(h) +} + +// SetSkipLevel provides a mock function with given fields: skip +func (_m *Logger) SetSkipLevel(skip int) { + _m.Called(skip) +} + +// Trace provides a mock function with given fields: msg, ctx +func (_m *Logger) Trace(msg string, ctx ...interface{}) { + var _ca []interface{} + _ca = append(_ca, msg) + _ca = append(_ca, ctx...) + _m.Called(_ca...) +} + +// Warn provides a mock function with given fields: msg, ctx +func (_m *Logger) Warn(msg string, ctx ...interface{}) { + var _ca []interface{} + _ca = append(_ca, msg) + _ca = append(_ca, ctx...) + _m.Called(_ca...) +} + +type mockConstructorTestingTNewLogger interface { + mock.TestingT + Cleanup(func()) +} + +// NewLogger creates a new instance of Logger. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewLogger(t mockConstructorTestingTNewLogger) *Logger { + mock := &Logger{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/log/rollbar.go b/log/rollbar.go index c87094ed..3fc5822f 100644 --- a/log/rollbar.go +++ b/log/rollbar.go @@ -51,10 +51,7 @@ func (h *RollbarHandler) Log(r *Record) error { interfaces = append(interfaces, h.SkipLevel) } - // Add timestamp metaData := make(map[string]interface{}) - metaData["timestamp"] = r.Time.Format(termTimeFormat) - // Append location if atomic.LoadUint32(&locationEnabled) != 0 { // Log origin printing was requested, format the location path and line number