fixes

pkg/auth/cookie.go

@@ -236,8 +236,8 @@ func ApplicationName(hostname string, appnames ApplicationServername) (Applicati
 }
 
 // SessionCookieMiddleware handle serializing and de-serializing the session between the user_session cookie and the request context
-func SessionCookieMiddleware(logger Logger, secret string, noSessionTimeout bool, appnames ApplicationServername, useSecureCookie bool) func(next http.Handler) http.Handler {
-	logger.Info("Creating session",
+func SessionCookieMiddleware(serverLogger Logger, secret string, noSessionTimeout bool, appnames ApplicationServername, useSecureCookie bool) func(next http.Handler) http.Handler {
+	serverLogger.Info("Creating session",
 		zap.String("milServername", appnames.MilServername),
 		zap.String("officeServername", appnames.OfficeServername),
 		zap.String("tspServername", appnames.TspServername),
@@ -247,7 +247,12 @@ func SessionCookieMiddleware(logger Logger, secret string, noSessionTimeout bool
 
 			ctx := r.Context()
 
-			logger := logging.FromContext(ctx).(Logger)
+			var logger Logger
+			if requestLogger, ok := logging.FromContext(ctx).(Logger); ok {
+				logger = requestLogger
+			} else {
+				logger = serverLogger
+			}
 
 			ctx, span := beeline.StartSpan(ctx, "SessionCookieMiddleware")
 			defer span.Send()

pkg/handlers/internalapi/service_members.go

@@ -309,10 +309,12 @@ type ShowServiceMemberOrdersHandler struct {
 // Handle retrieves orders for a service member
 func (h ShowServiceMemberOrdersHandler) Handle(params servicememberop.ShowServiceMemberOrdersParams) middleware.Responder {
 
-	ctx, span := beeline.StartSpan(params.HTTPRequest.Context(), reflect.TypeOf(h).Name())
+	ctx := params.HTTPRequest.Context()
+
+	ctx, span := beeline.StartSpan(ctx, reflect.TypeOf(h).Name())
 	defer span.Send()
 
-	session, logger := h.SessionAndLoggerFromRequest(params.HTTPRequest)
+	session, logger := h.SessionAndLoggerFromContext(ctx)
 
 	serviceMemberID, _ := uuid.FromString(params.ServiceMemberID.String())
 	serviceMember, err := models.FetchServiceMemberForUser(ctx, h.DB(), session, serviceMemberID)

pkg/handlers/internalapi/shipments.go

@@ -1,6 +1,7 @@
 package internalapi
 
 import (
+	"reflect"
 	"time"
 
 	"github.com/facebookgo/clock"
@@ -9,6 +10,8 @@ import (
 	"github.com/gofrs/uuid"
 	"go.uber.org/zap"
 
+	"github.com/honeycombio/beeline-go"
+
 	"github.com/transcom/mymove/pkg/auth"
 	shipmentop "github.com/transcom/mymove/pkg/gen/internalapi/internaloperations/shipments"
 	"github.com/transcom/mymove/pkg/gen/internalmessages"
@@ -140,12 +143,7 @@ type CreateShipmentHandler struct {
 
 // Handle is the handler
 func (h CreateShipmentHandler) Handle(params shipmentop.CreateShipmentParams) middleware.Responder {
-
-	ctx := params.HTTPRequest.Context()
-
-	logger := logging.FromContext(ctx).(Logger)
-
-	session := auth.SessionFromContext(ctx)
+	session, logger := h.SessionAndLoggerFromRequest(params.HTTPRequest)
 
 	// #nosec UUID is pattern matched by swagger and will be ok
 	moveID, _ := uuid.FromString(params.MoveID.String())
@@ -329,11 +327,7 @@ type PatchShipmentHandler struct {
 
 // Handle is the handler
 func (h PatchShipmentHandler) Handle(params shipmentop.PatchShipmentParams) middleware.Responder {
-	ctx := params.HTTPRequest.Context()
-
-	logger := logging.FromContext(ctx).(Logger)
-
-	session := auth.SessionFromContext(ctx)
+	session, logger := h.SessionAndLoggerFromRequest(params.HTTPRequest)
 
 	// #nosec UUID is pattern matched by swagger and will be ok
 	shipmentID, _ := uuid.FromString(params.ShipmentID.String())
@@ -432,9 +426,10 @@ func (h ApproveHHGHandler) Handle(params shipmentop.ApproveHHGParams) middleware
 
 	ctx := params.HTTPRequest.Context()
 
-	logger := logging.FromContext(ctx).(Logger)
+	ctx, span := beeline.StartSpan(ctx, reflect.TypeOf(h).Name())
+	defer span.Send()
 
-	session := auth.SessionFromContext(ctx)
+	session, logger := h.SessionAndLoggerFromContext(ctx)
 	if !session.IsOfficeUser() {
 		return shipmentop.NewApproveHHGForbidden()
 	}
@@ -472,11 +467,7 @@ type ShipmentInvoiceHandler struct {
 // Handle is the handler
 func (h ShipmentInvoiceHandler) Handle(params shipmentop.CreateAndSendHHGInvoiceParams) middleware.Responder {
 
-	ctx := params.HTTPRequest.Context()
-
-	logger := logging.FromContext(ctx).(Logger)
-
-	session := auth.SessionFromContext(ctx)
+	session, logger := h.SessionAndLoggerFromRequest(params.HTTPRequest)
 	if !session.IsOfficeUser() {
 		return shipmentop.NewCreateAndSendHHGInvoiceForbidden()
 	}