update

cmd/cart/checkout_server.go

@@ -153,7 +153,7 @@ func (a *App) HandleCheckoutRequests(amqpUrl string, mux *http.ServeMux, invento
 
 		if inventoryService != nil {
 			inventoryRequests := getInventoryRequests(grain.Items)
-			err = inventoryService.ReserveInventory(inventoryRequests...)
+			err = inventoryService.ReserveInventory(r.Context(), inventoryRequests...)
 			if err != nil {
 				logger.WarnContext(r.Context(), "placeorder inventory reservation failed")
 				w.WriteHeader(http.StatusNotAcceptable)
@@ -182,7 +182,7 @@ func (a *App) HandleCheckoutRequests(amqpUrl string, mux *http.ServeMux, invento
 		}
 		if inventoryService != nil {
 			inventoryRequests := getInventoryRequests(grain.Items)
-			_, err = inventoryService.ReservationCheck(inventoryRequests...)
+			_, err = inventoryService.ReservationCheck(r.Context(), inventoryRequests...)
 			if err != nil {
 				logger.WarnContext(r.Context(), "placeorder inventory check failed")
 				w.WriteHeader(http.StatusNotAcceptable)

cmd/cart/main.go

@@ -133,7 +133,7 @@ func main() {
 		Password: redisPassword,
 		DB:       0,
 	})
-	inventoryService, err := inventory.NewRedisInventoryService(rdb, context.Background())
+	inventoryService, err := inventory.NewRedisInventoryService(rdb)
 	if err != nil {
 		log.Fatalf("Error creating inventory service: %v\n", err)
 	}

cmd/cart/pool-server.go

@@ -356,7 +356,7 @@ func (s *PoolServer) CreateOrUpdateCheckout(ctx context.Context, host string, id
 	}
 	if s.inventoryService != nil {
 		inventoryRequests := getInventoryRequests(grain.Items)
-		failingRequest, err := s.inventoryService.ReservationCheck(inventoryRequests...)
+		failingRequest, err := s.inventoryService.ReservationCheck(ctx, inventoryRequests...)
 		if err != nil {
 			logger.WarnContext(ctx, "inventory check failed", string(failingRequest.SKU), string(failingRequest.LocationID))
 			return nil, err
@@ -632,6 +632,7 @@ func (s *PoolServer) Serve(mux *http.ServeMux) {
 		attr := attribute.String("http.route", pattern)
 		mux.HandleFunc(pattern, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			span := trace.SpanFromContext(r.Context())
+			span.SetName(pattern)
 			span.SetAttributes(attr)
 
 			labeler, _ := otelhttp.LabelerFromContext(r.Context())

cmd/inventory/main.go

@@ -43,7 +43,7 @@ func (srv *Server) getInventoryHandler(w http.ResponseWriter, r *http.Request) {
 	sku := inventory.SKU(parts[1])
 	locationID := inventory.LocationID(parts[2])
 
-	quantity, err := srv.service.GetInventory(sku, locationID)
+	quantity, err := srv.service.GetInventory(r.Context(), sku, locationID)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -81,7 +81,7 @@ func main() {
 			Mode: maintnotifications.ModeDisabled,
 		},
 	})
-	s, err := inventory.NewRedisInventoryService(rdb, ctx)
+	s, err := inventory.NewRedisInventoryService(rdb)
 	if err != nil {
 		log.Fatalf("Unable to connect to inventory redis: %v", err)
 		return

cmd/inventory/stockhandler.go

@@ -21,6 +21,7 @@ type StockHandler struct {
 
 func (s *StockHandler) HandleItem(item types.Item, wg *sync.WaitGroup) {
 	wg.Go(func() {
+		ctx := s.ctx
 		pipe := s.rdb.Pipeline()
 		centralStockString, ok := item.GetStringFieldValue(3)
 		if !ok {
@@ -35,12 +36,12 @@ func (s *StockHandler) HandleItem(item types.Item, wg *sync.WaitGroup) {
 			log.Printf("unable to parse central stock for item %s: %v", item.GetSku(), err)
 			centralStock = 0
 		} else {
-			s.svc.UpdateInventory(pipe, inventory.SKU(item.GetSku()), s.MainStockLocationID, int64(centralStock))
+			s.svc.UpdateInventory(ctx, pipe, inventory.SKU(item.GetSku()), s.MainStockLocationID, int64(centralStock))
 		}
 		for id, value := range item.GetStock() {
-			s.svc.UpdateInventory(pipe, inventory.SKU(item.GetSku()), inventory.LocationID(id), int64(value))
+			s.svc.UpdateInventory(ctx, pipe, inventory.SKU(item.GetSku()), inventory.LocationID(id), int64(value))
 		}
-		_, err = pipe.Exec(s.ctx)
+		_, err = pipe.Exec(ctx)
 		if err != nil {
 			log.Printf("unable to update stock: %v", err)
 		}