Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Propagate loggers via contexts #2103

Merged
merged 3 commits into from
Nov 8, 2018
Merged

Propagate loggers via contexts #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0d859b
Propagate loggers via contexts
scrye Nov 7, 2018
d566b44
Fix missing files
scrye Nov 7, 2018
427a8d1
Feedback #0
scrye Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions go/lib/infra/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/scionproto/scion/go/lib/common"
"github.com/scionproto/scion/go/lib/ctrl/cert_mgmt"
"github.com/scionproto/scion/go/lib/ctrl/path_mgmt"
"github.com/scionproto/scion/go/lib/log"
"github.com/scionproto/scion/go/lib/scrypto/cert"
"github.com/scionproto/scion/go/lib/scrypto/trc"
"github.com/scionproto/scion/go/proto"
Expand Down Expand Up @@ -77,24 +76,20 @@ type Request struct {
Peer net.Addr
// ID is the CtrlPld top-level ID.
ID uint64
// Logger can be used to write handler-scope messages in a way that can be
// easily correlated with server request/responses.
Logger log.Logger
// ctx is a server context, used in handlers when receiving messages from
// the network.
ctx context.Context
}

func NewRequest(ctx context.Context, msg, fullMsg proto.Cerealizable, peer net.Addr,
id uint64, logger log.Logger) *Request {
id uint64) *Request {

return &Request{
Message: msg,
FullMessage: fullMsg,
Peer: peer,
ctx: ctx,
ID: id,
Logger: logger,
}
}

Expand Down
101 changes: 45 additions & 56 deletions go/lib/infra/messenger/messenger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ func New(ia addr.IA, dispatcher *disp.Dispatcher, store infra.TrustStore, logger
func (m *Messenger) GetTRC(ctx context.Context, msg *cert_mgmt.TRCReq,
a net.Addr, id uint64) (*cert_mgmt.TRC, error) {

debug_id := util.GetDebugID()
logger := m.log.New("debug_id", debug_id)
logger := log.FromCtx(ctx)
pld, err := ctrl.NewCertMgmtPld(msg, nil, &ctrl.Data{ReqId: id})
if err != nil {
return nil, err
Expand All @@ -189,18 +188,16 @@ func (m *Messenger) GetTRC(ctx context.Context, msg *cert_mgmt.TRCReq,
"msg_id", id, "request", msg, "peer", a)
replyCtrlPld, _, err := m.getRequester(infra.TRCRequest, infra.TRC).Request(ctx, pld, a)
if err != nil {
return nil, common.NewBasicError("[Messenger] Request error", err, "debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Request error", err)
}
_, replyMsg, err := m.validate(replyCtrlPld)
if err != nil {
return nil, common.NewBasicError("[Messenger] Reply validation failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Reply validation failed", err)
}
reply, ok := replyMsg.(*cert_mgmt.TRC)
if !ok {
err := newTypeAssertErr("*cert_mgmt.TRC", replyMsg)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err)
}
logger.Trace("[Messenger] Received reply", "reply", reply)
return reply, nil
Expand All @@ -212,7 +209,8 @@ func (m *Messenger) SendTRC(ctx context.Context, msg *cert_mgmt.TRC, a net.Addr,
if err != nil {
return err
}
m.log.Trace("[Messenger] Sending Notify", "type", infra.TRC, "to", a, "id", id)
logger := log.FromCtx(ctx)
logger.Trace("[Messenger] Sending Notify", "type", infra.TRC, "to", a, "id", id)
return m.getRequester(infra.TRC, infra.None).Notify(ctx, pld, a)
}

Expand All @@ -221,8 +219,7 @@ func (m *Messenger) SendTRC(ctx context.Context, msg *cert_mgmt.TRC, a net.Addr,
func (m *Messenger) GetCertChain(ctx context.Context, msg *cert_mgmt.ChainReq,
a net.Addr, id uint64) (*cert_mgmt.Chain, error) {

debug_id := util.GetDebugID()
logger := m.log.New("debug_id", debug_id)
logger := log.FromCtx(ctx)
pld, err := ctrl.NewCertMgmtPld(msg, nil, &ctrl.Data{ReqId: id})
if err != nil {
return nil, err
Expand All @@ -231,18 +228,16 @@ func (m *Messenger) GetCertChain(ctx context.Context, msg *cert_mgmt.ChainReq,
"msg_id", id, "request", msg, "peer", a)
replyCtrlPld, _, err := m.getRequester(infra.ChainRequest, infra.Chain).Request(ctx, pld, a)
if err != nil {
return nil, common.NewBasicError("[Messenger] Request error", err, "debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Request error", err)
}
_, replyMsg, err := m.validate(replyCtrlPld)
if err != nil {
return nil, common.NewBasicError("[Messenger] Reply validation failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Reply validation failed", err)
}
reply, ok := replyMsg.(*cert_mgmt.Chain)
if !ok {
err := newTypeAssertErr("*cert_mgmt.Chain", replyMsg)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err)
}
logger.Trace("[Messenger] Received reply", "reply", reply)
return reply, nil
Expand All @@ -256,7 +251,8 @@ func (m *Messenger) SendCertChain(ctx context.Context, msg *cert_mgmt.Chain, a n
if err != nil {
return err
}
m.log.Trace("[Messenger] Sending Notify", "type", infra.Chain, "to", a, "id", id)
logger := log.FromCtx(ctx)
logger.Trace("[Messenger] Sending Notify", "type", infra.Chain, "to", a, "id", id)
return m.getRequester(infra.Chain, infra.None).Notify(ctx, pld, a)
}

Expand All @@ -265,8 +261,7 @@ func (m *Messenger) SendCertChain(ctx context.Context, msg *cert_mgmt.Chain, a n
func (m *Messenger) GetSegs(ctx context.Context, msg *path_mgmt.SegReq,
a net.Addr, id uint64) (*path_mgmt.SegReply, error) {

debug_id := util.GetDebugID()
logger := m.log.New("debug_id", debug_id)
logger := log.FromCtx(ctx)
pld, err := ctrl.NewPathMgmtPld(msg, nil, &ctrl.Data{ReqId: id})
if err != nil {
return nil, err
Expand All @@ -276,22 +271,19 @@ func (m *Messenger) GetSegs(ctx context.Context, msg *path_mgmt.SegReq,
replyCtrlPld, _, err :=
m.getRequester(infra.SegRequest, infra.SegReply).Request(ctx, pld, a)
if err != nil {
return nil, common.NewBasicError("[Messenger] Request error", err, "debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Request error", err)
}
_, replyMsg, err := m.validate(replyCtrlPld)
if err != nil {
return nil, common.NewBasicError("[Messenger] Reply validation failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Reply validation failed", err)
}
reply, ok := replyMsg.(*path_mgmt.SegReply)
if !ok {
err := newTypeAssertErr("*path_mgmt.SegReply", replyMsg)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err)
}
if err := reply.ParseRaw(); err != nil {
return nil, common.NewBasicError("[Messenger] Failed to parse reply", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Failed to parse reply", err)
}
logger.Trace("[Messenger] Received reply")
return reply, nil
Expand All @@ -305,7 +297,8 @@ func (m *Messenger) SendSegReply(ctx context.Context,
if err != nil {
return err
}
m.log.Trace("[Messenger] Sending Notify", "type", infra.SegReply, "to", a, "id", id)
logger := log.FromCtx(ctx)
logger.Trace("[Messenger] Sending Notify", "type", infra.SegReply, "to", a, "id", id)
return m.getRequester(infra.SegReply, infra.None).Notify(ctx, pld, a)
}

Expand All @@ -317,15 +310,15 @@ func (m *Messenger) SendSegSync(ctx context.Context,
if err != nil {
return err
}
m.log.Trace("[Messenger] Sending Notify", "type", infra.SegSync, "to", a, "id", id)
logger := log.FromCtx(ctx)
logger.Trace("[Messenger] Sending Notify", "type", infra.SegSync, "to", a, "id", id)
return m.getRequester(infra.SegSync, infra.None).Notify(ctx, pld, a)
}

func (m *Messenger) GetSegChangesIds(ctx context.Context, msg *path_mgmt.SegChangesIdReq,
a net.Addr, id uint64) (*path_mgmt.SegChangesIdReply, error) {

debug_id := util.GetDebugID()
logger := m.log.New("debug_id", debug_id)
logger := log.FromCtx(ctx)
pld, err := ctrl.NewPathMgmtPld(msg, nil, &ctrl.Data{ReqId: id})
if err != nil {
return nil, err
Expand All @@ -335,18 +328,16 @@ func (m *Messenger) GetSegChangesIds(ctx context.Context, msg *path_mgmt.SegChan
replyCtrlPld, _, err := m.getRequester(infra.SegChangesIdReq,
infra.SegChangesIdReply).Request(ctx, pld, a)
if err != nil {
return nil, common.NewBasicError("[Messenger] Request error", err, "debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Request error", err)
}
_, replyMsg, err := m.validate(replyCtrlPld)
if err != nil {
return nil, common.NewBasicError("[Messenger] Reply validation failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Reply validation failed", err)
}
reply, ok := replyMsg.(*path_mgmt.SegChangesIdReply)
if !ok {
err := newTypeAssertErr("*path_mgmt.SegChangesIdReply", replyMsg)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err)
}
logger.Trace("[Messenger] Received reply")
return reply, nil
Expand All @@ -359,16 +350,16 @@ func (m *Messenger) SendSegChangesIdReply(ctx context.Context,
if err != nil {
return err
}
m.log.Trace("[Messenger] Sending Notify",
logger := log.FromCtx(ctx)
logger.Trace("[Messenger] Sending Notify",
"type", infra.SegChangesIdReply, "to", a, "id", id)
return m.getRequester(infra.SegChangesIdReply, infra.None).Notify(ctx, pld, a)
}

func (m *Messenger) GetSegChanges(ctx context.Context, msg *path_mgmt.SegChangesReq,
a net.Addr, id uint64) (*path_mgmt.SegChangesReply, error) {

debug_id := util.GetDebugID()
logger := m.log.New("debug_id", debug_id)
logger := log.FromCtx(ctx)
pld, err := ctrl.NewPathMgmtPld(msg, nil, &ctrl.Data{ReqId: id})
if err != nil {
return nil, err
Expand All @@ -378,22 +369,19 @@ func (m *Messenger) GetSegChanges(ctx context.Context, msg *path_mgmt.SegChanges
replyCtrlPld, _, err := m.getRequester(infra.SegChangesReq,
infra.SegChangesIdReply).Request(ctx, pld, a)
if err != nil {
return nil, common.NewBasicError("[Messenger] Request error", err, "debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Request error", err)
}
_, replyMsg, err := m.validate(replyCtrlPld)
if err != nil {
return nil, common.NewBasicError("[Messenger] Reply validation failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Reply validation failed", err)
}
reply, ok := replyMsg.(*path_mgmt.SegChangesReply)
if !ok {
err := newTypeAssertErr("*path_mgmt.SegChangesReply", replyMsg)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err)
}
if err := reply.ParseRaw(); err != nil {
return nil, common.NewBasicError("[Messenger] Failed to parse reply", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Failed to parse reply", err)
}
logger.Trace("[Messenger] Received reply")
return reply, nil
Expand All @@ -406,16 +394,16 @@ func (m *Messenger) SendSegChangesReply(ctx context.Context,
if err != nil {
return err
}
m.log.Trace("[Messenger] Sending Notify",
logger := log.FromCtx(ctx)
logger.Trace("[Messenger] Sending Notify",
"type", infra.SegChangesReply, "to", a, "id", id)
return m.getRequester(infra.SegChangesReply, infra.None).Notify(ctx, pld, a)
}

func (m *Messenger) RequestChainIssue(ctx context.Context, msg *cert_mgmt.ChainIssReq, a net.Addr,
id uint64) (*cert_mgmt.ChainIssRep, error) {

debug_id := util.GetDebugID()
logger := m.log.New("debug_id", debug_id)
logger := log.FromCtx(ctx)
pld, err := ctrl.NewCertMgmtPld(msg, nil, &ctrl.Data{ReqId: id})
if err != nil {
return nil, err
Expand All @@ -425,18 +413,16 @@ func (m *Messenger) RequestChainIssue(ctx context.Context, msg *cert_mgmt.ChainI
replyCtrlPld, _, err :=
m.getRequester(infra.ChainIssueRequest, infra.ChainIssueReply).Request(ctx, pld, a)
if err != nil {
return nil, common.NewBasicError("[Messenger] Request error", err, "debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Request error", err)
}
_, replyMsg, err := m.validate(replyCtrlPld)
if err != nil {
return nil, common.NewBasicError("[Messenger] Reply validation failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Reply validation failed", err)
}
reply, ok := replyMsg.(*cert_mgmt.ChainIssRep)
if !ok {
err := newTypeAssertErr("*cert_mgmt.ChainIssRep", replyMsg)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err,
"debug_id", debug_id)
return nil, common.NewBasicError("[Messenger] Type assertion failed", err)
}
logger.Trace("[Messenger] Received reply")
return reply, nil
Expand All @@ -449,7 +435,8 @@ func (m *Messenger) SendChainIssueReply(ctx context.Context, msg *cert_mgmt.Chai
if err != nil {
return err
}
m.log.Trace("[Messenger] Sending Notify", "type", infra.ChainIssueReply, "to", a, "id", id)
logger := log.FromCtx(ctx)
logger.Trace("[Messenger] Sending Notify", "type", infra.ChainIssueReply, "to", a, "id", id)
return m.getRequester(infra.ChainIssueReply, infra.None).Notify(ctx, pld, a)
}

Expand Down Expand Up @@ -511,7 +498,7 @@ func (m *Messenger) ListenAndServe() {
serveCancelF()
continue
}
m.serve(serveCtx, serveCancelF, pld, signedPld, address, logger)
m.serve(log.CtxWith(serveCtx, logger), serveCancelF, pld, signedPld, address)
}
}

Expand All @@ -536,8 +523,9 @@ func (m *Messenger) verifySignedPld(ctx context.Context, signedPld *ctrl.SignedP
}

func (m *Messenger) serve(ctx context.Context, cancelF context.CancelFunc, pld *ctrl.Pld,
signedPld *ctrl.SignedPld, address net.Addr, logger log.Logger) {
signedPld *ctrl.SignedPld, address net.Addr) {

logger := log.FromCtx(ctx)
// Validate that the message is of acceptable type, and that its top-level
// signature is correct.
msgType, msg, err := m.validate(pld)
Expand All @@ -559,7 +547,8 @@ func (m *Messenger) serve(ctx context.Context, cancelF context.CancelFunc, pld *
go func() {
defer log.LogPanicAndExit()
defer cancelF()
handler.Handle(infra.NewRequest(ctx, msg, signedPld, address, pld.ReqId, logger))
handler.Handle(
infra.NewRequest(log.CtxWith(ctx, logger), msg, signedPld, address, pld.ReqId))
}()
}

Expand Down
9 changes: 5 additions & 4 deletions go/lib/infra/modules/trust/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/scionproto/scion/go/lib/common"
"github.com/scionproto/scion/go/lib/ctrl/cert_mgmt"
"github.com/scionproto/scion/go/lib/infra"
"github.com/scionproto/scion/go/lib/log"
)

// trcReqHandler contains the state of a handler for a specific TRC Request
Expand All @@ -33,7 +34,7 @@ type trcReqHandler struct {
}

func (h *trcReqHandler) Handle() {
logger := h.request.Logger
logger := log.FromCtx(h.request.Context())
trcReq, ok := h.request.Message.(*cert_mgmt.TRCReq)
if !ok {
logger.Error("[TrustStore:trcReqHandler] wrong message type, expected cert_mgmt.TRCReq",
Expand Down Expand Up @@ -88,7 +89,7 @@ type chainReqHandler struct {
}

func (h *chainReqHandler) Handle() {
logger := h.request.Logger
logger := log.FromCtx(h.request.Context())
chainReq, ok := h.request.Message.(*cert_mgmt.ChainReq)
if !ok {
logger.Error("[TrustStore:chainReqHandler] wrong message type, expected cert_mgmt.ChainReq",
Expand Down Expand Up @@ -139,7 +140,7 @@ type trcPushHandler struct {
}

func (h *trcPushHandler) Handle() {
logger := h.request.Logger
logger := log.FromCtx(h.request.Context())
// FIXME(scrye): In case a TRC update will invalidate the local certificate
// chain after the gracePeriod, CSes must use this gracePeriod to fetch a
// new chain from the issuer. If a chain is not obtained within the
Expand Down Expand Up @@ -177,7 +178,7 @@ type chainPushHandler struct {
}

func (h *chainPushHandler) Handle() {
logger := h.request.Logger
logger := log.FromCtx(h.request.Context())
chainPush, ok := h.request.Message.(*cert_mgmt.Chain)
if !ok {
logger.Error("[TrustStore:chainPushHandler] Wrong message type, expected cert_mgmt.Chain",
Expand Down
Loading