Merge pull request #46 from go-kit/remove-default-logger
Remove DefaultLogger
Peter Bourgon
8 years ago
| 49 | 49 |
var logger kitlog.Logger
|
| 50 | 50 |
logger = kitlog.NewPrefixLogger(os.Stderr)
|
| 51 | 51 |
logger = kitlog.With(logger, "ts", kitlog.DefaultTimestampUTC)
|
| 52 | |
kitlog.DefaultLogger = logger // for other gokit components
|
| 53 | 52 |
stdlog.SetOutput(kitlog.NewStdlibAdapter(logger)) // redirect stdlib logging to us
|
| 54 | 53 |
stdlog.SetFlags(0) // flags are handled in our logger
|
| 55 | 54 |
|
|
| 77 | 76 |
|
| 78 | 77 |
// `package tracing` domain
|
| 79 | 78 |
zipkinHost := "my-host"
|
| 80 | |
zipkinCollector := loggingCollector{}
|
|
79 |
zipkinCollector := loggingCollector{logger}
|
| 81 | 80 |
zipkinAddName := "ADD" // is that right?
|
| 82 | 81 |
zipkinAddSpanFunc := zipkin.NewSpanFunc(zipkinHost, zipkinAddName)
|
| 83 | 82 |
|
|
| 207 | 206 |
return fmt.Errorf("%s", <-c)
|
| 208 | 207 |
}
|
| 209 | 208 |
|
| 210 | |
type loggingCollector struct{}
|
| 211 | |
|
| 212 | |
func (loggingCollector) Collect(s *zipkin.Span) error {
|
| 213 | |
kitlog.With(kitlog.DefaultLogger, "caller", kitlog.DefaultCaller).Log(
|
|
209 |
type loggingCollector struct{ kitlog.Logger }
|
|
210 |
|
|
211 |
func (c loggingCollector) Collect(s *zipkin.Span) error {
|
|
212 |
kitlog.With(c.Logger, "caller", kitlog.DefaultCaller).Log(
|
| 214 | 213 |
"trace_id", s.TraceID(),
|
| 215 | 214 |
"span_id", s.SpanID(),
|
| 216 | 215 |
"parent_span_id", s.ParentSpanID(),
|
| 0 | |
package log
|
| 1 | |
|
| 2 | |
// DefaultLogger is used by gokit components. By default, it's a PrefixLogger
|
| 3 | |
// that writes to the stdlib log.
|
| 4 | |
var DefaultLogger = NewPrefixLogger(StdlibWriter{})
|
| 9 | 9 |
|
| 10 | 10 |
"github.com/apache/thrift/lib/go/thrift"
|
| 11 | 11 |
|
| 12 | |
"github.com/go-kit/kit/log"
|
| 13 | 12 |
"github.com/go-kit/kit/tracing/zipkin/_thrift/gen-go/scribe"
|
| 14 | 13 |
)
|
| 15 | 14 |
|
|
| 82 | 81 |
case <-c.sendc:
|
| 83 | 82 |
c.nextSend = time.Now().Add(c.batchInterval)
|
| 84 | 83 |
if err := c.send(c.batch); err != nil {
|
| 85 | |
log.DefaultLogger.Log("err", err.Error())
|
|
84 |
Log.Log("err", err.Error())
|
| 86 | 85 |
continue
|
| 87 | 86 |
}
|
| 88 | 87 |
c.batch = c.batch[:0]
|
| 6 | 6 |
|
| 7 | 7 |
"golang.org/x/net/context"
|
| 8 | 8 |
|
|
9 |
"github.com/go-kit/kit/log"
|
| 9 | 10 |
"github.com/go-kit/kit/server"
|
| 10 | 11 |
)
|
|
12 |
|
|
13 |
// Log is used to report diagnostic information. To enable it, swap in your
|
|
14 |
// application's logger.
|
|
15 |
var Log log.SwapLogger
|
| 11 | 16 |
|
| 12 | 17 |
// http://www.slideshare.net/johanoskarsson/zipkin-runtime-open-house
|
| 13 | 18 |
// https://groups.google.com/forum/#!topic/zipkin-user/KilwtSA0g1k
|