From aef90e2bbbedf9d41c89d4d477b29e2c1e6cc426 Mon Sep 17 00:00:00 2001 From: matst80 Date: Wed, 5 Nov 2025 17:56:04 +0100 Subject: [PATCH] update --- cmd/cart/main.go | 5 +++-- cmd/cart/pool-server.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/cart/main.go b/cmd/cart/main.go index b5b231d..601644f 100644 --- a/cmd/cart/main.go +++ b/cmd/cart/main.go @@ -22,6 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" ) var ( @@ -167,7 +168,7 @@ func main() { log.Fatalf("Unable to start otel %v", err) } - mux.Handle("/cart/", syncedServer.Serve()) + mux.Handle("/cart", syncedServer.Serve()) // only for local mux.HandleFunc("GET /add/remote/{host}", func(w http.ResponseWriter, r *http.Request) { pool.AddRemote(r.PathValue("host")) @@ -216,7 +217,7 @@ func main() { BaseContext: func(net.Listener) context.Context { return ctx }, ReadTimeout: 10 * time.Second, WriteTimeout: 20 * time.Second, - Handler: mux, + Handler: otelhttp.NewHandler(mux, "/"), } defer func() { diff --git a/cmd/cart/pool-server.go b/cmd/cart/pool-server.go index 0dca476..576376f 100644 --- a/cmd/cart/pool-server.go +++ b/cmd/cart/pool-server.go @@ -579,10 +579,10 @@ func (s *PoolServer) Serve() *http.ServeMux { mux.Handle(pattern, handler) } - handleFunc("GET /cart/", CookieCartIdHandler(s.ProxyHandler(s.GetCartHandler))) + handleFunc("GET /cart", CookieCartIdHandler(s.ProxyHandler(s.GetCartHandler))) handleFunc("GET /cart/add/{sku}", CookieCartIdHandler(s.ProxyHandler(s.AddSkuToCartHandler))) handleFunc("POST /cart/add", CookieCartIdHandler(s.ProxyHandler(s.AddMultipleItemHandler))) - handleFunc("POST /cart/", CookieCartIdHandler(s.ProxyHandler(s.AddSkuRequestHandler))) + handleFunc("POST /cart", CookieCartIdHandler(s.ProxyHandler(s.AddSkuRequestHandler))) handleFunc("POST /cart/set", CookieCartIdHandler(s.ProxyHandler(s.SetCartItemsHandler))) handleFunc("DELETE /cart/{itemId}", CookieCartIdHandler(s.ProxyHandler(s.DeleteItemHandler))) handleFunc("PUT /cart/", CookieCartIdHandler(s.ProxyHandler(s.QuantityChangeHandler)))