1f8db2467b
This contains quite a bit (also bumps google/uuid to 1.3.0). Some HostProcess container improvements to get ready for whenever it goes to stable in Kubernetes, Hyper-V (windows) container support for CRI, and a plethora of other small additions and fixes. Signed-off-by: Daniel Canter <dcanter@microsoft.com>
46 lines
981 B
Go
46 lines
981 B
Go
package log
|
|
|
|
import (
|
|
"github.com/Microsoft/hcsshim/internal/logfields"
|
|
"github.com/sirupsen/logrus"
|
|
"go.opencensus.io/trace"
|
|
)
|
|
|
|
// Hook serves to intercept and format `logrus.Entry`s before they are passed
|
|
// to the ETW hook.
|
|
//
|
|
// The containerd shim discards the (formatted) logrus output, and outputs only via ETW.
|
|
// The Linux GCS outputs logrus entries over stdout, which is consumed by the shim and
|
|
// then re-output via the ETW hook.
|
|
type Hook struct{}
|
|
|
|
var _ logrus.Hook = &Hook{}
|
|
|
|
func NewHook() *Hook {
|
|
return &Hook{}
|
|
}
|
|
|
|
func (h *Hook) Levels() []logrus.Level {
|
|
return logrus.AllLevels
|
|
}
|
|
|
|
func (h *Hook) Fire(e *logrus.Entry) (err error) {
|
|
h.addSpanContext(e)
|
|
|
|
return nil
|
|
}
|
|
|
|
func (h *Hook) addSpanContext(e *logrus.Entry) {
|
|
ctx := e.Context
|
|
if ctx == nil {
|
|
return
|
|
}
|
|
span := trace.FromContext(ctx)
|
|
if span == nil {
|
|
return
|
|
}
|
|
sctx := span.SpanContext()
|
|
e.Data[logfields.TraceID] = sctx.TraceID.String()
|
|
e.Data[logfields.SpanID] = sctx.SpanID.String()
|
|
}
|