@@ -12,10 +12,10 @@ import (
1212 "time"
1313
1414 writer "github.com/ipfs/go-log/writer"
15- "github.com/whyrusleeping/go-logging"
1615
1716 opentrace "github.com/opentracing/opentracing-go"
1817 otExt "github.com/opentracing/opentracing-go/ext"
18+ "go.uber.org/zap"
1919)
2020
2121var log = Logger ("eventlog" )
@@ -159,46 +159,48 @@ type EventLogger interface {
159159 SerializeContext (ctx context.Context ) ([]byte , error )
160160}
161161
162- // Logger retrieves an event logger by name
163- func Logger (system string ) EventLogger {
162+ var _ EventLogger = Logger ("test-logger" )
164163
165- // TODO if we would like to adjust log levels at run-time. Store this event
166- // logger in a map (just like the util.Logger impl)
164+ // Logger retrieves an event logger by name
165+ func Logger ( system string ) * ZapEventLogger {
167166 if len (system ) == 0 {
168167 setuplog := getLogger ("setup-logger" )
169- setuplog .Warning ("Missing name parameter" )
168+ setuplog .Error ("Missing name parameter" )
170169 system = "undefined"
171170 }
172171
173172 logger := getLogger (system )
174173
175- return & eventLogger {system : system , Logger : * logger }
174+ return & ZapEventLogger {system : system , SugaredLogger : * logger }
176175}
177176
178- // eventLogger implements the EventLogger and wraps a go-logging Logger
179- type eventLogger struct {
180- logging. Logger
177+ // ZapEventLogger implements the EventLogger and wraps a go-logging Logger
178+ type ZapEventLogger struct {
179+ zap. SugaredLogger
181180
182181 system string
183182 // TODO add log-level
184183}
185184
186- func (el * eventLogger ) Warn (args ... interface {}) {
187- el .Warning (args ... )
185+ // Deprecated: use Warn
186+ func (el * ZapEventLogger ) Warning (args ... interface {}) {
187+ el .Warn (args ... )
188188}
189- func (el * eventLogger ) Warnf (format string , args ... interface {}) {
190- el .Warningf (format , args ... )
189+
190+ // Deprecated: use Warnf
191+ func (el * ZapEventLogger ) Warningf (format string , args ... interface {}) {
192+ el .Warnf (format , args ... )
191193}
192194
193195// Deprecated: Stop using go-log for event logging
194- func (el * eventLogger ) Start (ctx context.Context , operationName string ) context.Context {
196+ func (el * ZapEventLogger ) Start (ctx context.Context , operationName string ) context.Context {
195197 span , ctx := opentrace .StartSpanFromContext (ctx , operationName )
196198 span .SetTag ("system" , el .system )
197199 return ctx
198200}
199201
200202// Deprecated: Stop using go-log for event logging
201- func (el * eventLogger ) StartFromParentState (ctx context.Context , operationName string , parent []byte ) (context.Context , error ) {
203+ func (el * ZapEventLogger ) StartFromParentState (ctx context.Context , operationName string , parent []byte ) (context.Context , error ) {
202204 sc , err := deserializeContext (parent )
203205 if err != nil {
204206 return nil , err
@@ -211,7 +213,7 @@ func (el *eventLogger) StartFromParentState(ctx context.Context, operationName s
211213}
212214
213215// Deprecated: Stop using go-log for event logging
214- func (el * eventLogger ) SerializeContext (ctx context.Context ) ([]byte , error ) {
216+ func (el * ZapEventLogger ) SerializeContext (ctx context.Context ) ([]byte , error ) {
215217 gTracer := opentrace .GlobalTracer ()
216218 b := make ([]byte , 0 )
217219 carrier := bytes .NewBuffer (b )
@@ -223,7 +225,7 @@ func (el *eventLogger) SerializeContext(ctx context.Context) ([]byte, error) {
223225}
224226
225227// Deprecated: Stop using go-log for event logging
226- func (el * eventLogger ) LogKV (ctx context.Context , alternatingKeyValues ... interface {}) {
228+ func (el * ZapEventLogger ) LogKV (ctx context.Context , alternatingKeyValues ... interface {}) {
227229 span := opentrace .SpanFromContext (ctx )
228230 if span == nil {
229231 _ , file , line , _ := runtime .Caller (1 )
@@ -234,7 +236,7 @@ func (el *eventLogger) LogKV(ctx context.Context, alternatingKeyValues ...interf
234236}
235237
236238// Deprecated: Stop using go-log for event logging
237- func (el * eventLogger ) SetTag (ctx context.Context , k string , v interface {}) {
239+ func (el * ZapEventLogger ) SetTag (ctx context.Context , k string , v interface {}) {
238240 span := opentrace .SpanFromContext (ctx )
239241 if span == nil {
240242 _ , file , line , _ := runtime .Caller (1 )
@@ -245,7 +247,7 @@ func (el *eventLogger) SetTag(ctx context.Context, k string, v interface{}) {
245247}
246248
247249// Deprecated: Stop using go-log for event logging
248- func (el * eventLogger ) SetTags (ctx context.Context , tags map [string ]interface {}) {
250+ func (el * ZapEventLogger ) SetTags (ctx context.Context , tags map [string ]interface {}) {
249251 span := opentrace .SpanFromContext (ctx )
250252 if span == nil {
251253 _ , file , line , _ := runtime .Caller (1 )
@@ -257,7 +259,7 @@ func (el *eventLogger) SetTags(ctx context.Context, tags map[string]interface{})
257259 }
258260}
259261
260- func (el * eventLogger ) setErr (ctx context.Context , err error , skip int ) {
262+ func (el * ZapEventLogger ) setErr (ctx context.Context , err error , skip int ) {
261263 span := opentrace .SpanFromContext (ctx )
262264 if span == nil {
263265 _ , file , line , _ := runtime .Caller (skip )
@@ -273,12 +275,12 @@ func (el *eventLogger) setErr(ctx context.Context, err error, skip int) {
273275}
274276
275277// Deprecated: Stop using go-log for event logging
276- func (el * eventLogger ) SetErr (ctx context.Context , err error ) {
278+ func (el * ZapEventLogger ) SetErr (ctx context.Context , err error ) {
277279 el .setErr (ctx , err , 1 )
278280}
279281
280282// Deprecated: Stop using go-log for event logging
281- func (el * eventLogger ) Finish (ctx context.Context ) {
283+ func (el * ZapEventLogger ) Finish (ctx context.Context ) {
282284 span := opentrace .SpanFromContext (ctx )
283285 if span == nil {
284286 _ , file , line , _ := runtime .Caller (1 )
@@ -289,7 +291,7 @@ func (el *eventLogger) Finish(ctx context.Context) {
289291}
290292
291293// Deprecated: Stop using go-log for event logging
292- func (el * eventLogger ) FinishWithErr (ctx context.Context , err error ) {
294+ func (el * ZapEventLogger ) FinishWithErr (ctx context.Context , err error ) {
293295 el .setErr (ctx , err , 2 )
294296 el .Finish (ctx )
295297}
@@ -306,7 +308,7 @@ func deserializeContext(bCtx []byte) (opentrace.SpanContext, error) {
306308}
307309
308310// Deprecated: Stop using go-log for event logging
309- func (el * eventLogger ) EventBegin (ctx context.Context , event string , metadata ... Loggable ) * EventInProgress {
311+ func (el * ZapEventLogger ) EventBegin (ctx context.Context , event string , metadata ... Loggable ) * EventInProgress {
310312 ctx = el .Start (ctx , event )
311313
312314 for _ , m := range metadata {
@@ -329,12 +331,8 @@ func (el *eventLogger) EventBegin(ctx context.Context, event string, metadata ..
329331 return eip
330332}
331333
332- type activeEventKeyType struct {}
333-
334- var activeEventKey = activeEventKeyType {}
335-
336334// Deprecated: Stop using go-log for event logging
337- func (el * eventLogger ) Event (ctx context.Context , event string , metadata ... Loggable ) {
335+ func (el * ZapEventLogger ) Event (ctx context.Context , event string , metadata ... Loggable ) {
338336
339337 // short circuit if theres nothing to write to
340338 if ! writer .WriterGroup .Active () {
0 commit comments