diff --git a/internal/runnable/grpc.go b/internal/runnable/grpc.go index 82b7b85e2..5db5f9ed5 100644 --- a/internal/runnable/grpc.go +++ b/internal/runnable/grpc.go @@ -37,8 +37,7 @@ func GRPCServer(name string, srv *grpc.Server, port int) manager.Runnable { // Start listening. lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port)) if err != nil { - log.Error(err, "gRPC server failed to listen") - return err + return fmt.Errorf("gRPC server failed to listen - %w", err) } log.Info("gRPC server listening", "port", port) @@ -59,8 +58,7 @@ func GRPCServer(name string, srv *grpc.Server, port int) manager.Runnable { // Keep serving until terminated. if err := srv.Serve(lis); err != nil && err != grpc.ErrServerStopped { - log.Error(err, "gRPC server failed") - return err + return fmt.Errorf("gRPC server failed - %w", err) } log.Info("gRPC server terminated") return nil diff --git a/pkg/bbr/handlers/server.go b/pkg/bbr/handlers/server.go index 499d6af28..6488453be 100644 --- a/pkg/bbr/handlers/server.go +++ b/pkg/bbr/handlers/server.go @@ -61,9 +61,6 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error { return nil } if recvErr != nil { - // This error occurs very frequently, though it doesn't seem to have any impact. - // TODO Figure out if we can remove this noise. - loggerVerbose.Error(recvErr, "Cannot receive stream request") return status.Errorf(codes.Unknown, "cannot receive stream request: %v", recvErr) } diff --git a/pkg/bbr/server/runserver.go b/pkg/bbr/server/runserver.go index ec2880b24..ac6ac414e 100644 --- a/pkg/bbr/server/runserver.go +++ b/pkg/bbr/server/runserver.go @@ -19,6 +19,7 @@ package server import ( "context" "crypto/tls" + "fmt" extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3" "github.com/go-logr/logr" @@ -54,8 +55,7 @@ func (r *ExtProcServerRunner) AsRunnable(logger logr.Logger) manager.Runnable { if r.SecureServing { cert, err := tlsutil.CreateSelfSignedTLSCertificate(logger) if err != nil { - logger.Error(err, "Failed to create self signed certificate") - return err + return fmt.Errorf("failed to create self signed certificate - %w", err) } creds := credentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{cert}}) srv = grpc.NewServer(grpc.Creds(creds)) diff --git a/pkg/epp/controller/inferenceobjective_reconciler.go b/pkg/epp/controller/inferenceobjective_reconciler.go index 53bce8646..c8ac5a6c3 100644 --- a/pkg/epp/controller/inferenceobjective_reconciler.go +++ b/pkg/epp/controller/inferenceobjective_reconciler.go @@ -18,6 +18,7 @@ package controller import ( "context" + "fmt" "k8s.io/apimachinery/pkg/api/errors" ctrl "sigs.k8s.io/controller-runtime" @@ -48,8 +49,7 @@ func (c *InferenceObjectiveReconciler) Reconcile(ctx context.Context, req ctrl.R notFound := false if err := c.Get(ctx, req.NamespacedName, infObjective); err != nil { if !errors.IsNotFound(err) { - logger.Error(err, "Unable to get InferenceObjective") - return ctrl.Result{}, err + return ctrl.Result{}, fmt.Errorf("unable to get InferenceObjective - %w", err) } notFound = true } diff --git a/pkg/epp/controller/inferencepool_reconciler.go b/pkg/epp/controller/inferencepool_reconciler.go index d8b7668e2..3b52de0ae 100644 --- a/pkg/epp/controller/inferencepool_reconciler.go +++ b/pkg/epp/controller/inferencepool_reconciler.go @@ -56,9 +56,7 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques obj = &v1alpha2.InferencePool{} default: // Handle unsupported groups gracefully. - err := fmt.Errorf("unsupported API group: %s", c.PoolGKNN.Group) - logger.Error(err, "Cannot reconcile InferencePool") - return ctrl.Result{}, err + return ctrl.Result{}, fmt.Errorf("cannot reconcile InferencePool - unsupported API group: %s", c.PoolGKNN.Group) } // 2. Perform a single, generic fetch for the object. @@ -68,8 +66,7 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques c.Datastore.Clear() return ctrl.Result{}, nil } - logger.Error(err, "Unable to get InferencePool") - return ctrl.Result{}, err + return ctrl.Result{}, fmt.Errorf("unable to get InferencePool - %w", err) } // 3. Perform common checks using the client.Object interface. @@ -90,16 +87,14 @@ func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reques var err error err = pool.ConvertTo(v1infPool) if err != nil { - logger.Error(err, "Failed to convert XInferencePool to InferencePool") - return ctrl.Result{}, err + return ctrl.Result{}, fmt.Errorf("failed to convert XInferencePool to InferencePool - %w", err) } default: return ctrl.Result{}, fmt.Errorf("unsupported API group: %s", c.PoolGKNN.Group) } if err := c.Datastore.PoolSet(ctx, c.Reader, v1infPool); err != nil { - logger.Error(err, "Failed to update datastore") - return ctrl.Result{}, err + return ctrl.Result{}, fmt.Errorf("failed to update datastore - %w", err) } return ctrl.Result{}, nil diff --git a/pkg/epp/controller/pod_reconciler.go b/pkg/epp/controller/pod_reconciler.go index 3cd7c2574..ce77b2cfd 100644 --- a/pkg/epp/controller/pod_reconciler.go +++ b/pkg/epp/controller/pod_reconciler.go @@ -18,6 +18,7 @@ package controller import ( "context" + "fmt" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" @@ -55,8 +56,7 @@ func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R c.Datastore.PodDelete(req.NamespacedName) return ctrl.Result{}, nil } - logger.V(logutil.DEFAULT).Error(err, "Unable to get pod") - return ctrl.Result{}, err + return ctrl.Result{}, fmt.Errorf("unable to get pod - %w", err) } c.updateDatastore(logger, pod) diff --git a/pkg/epp/handlers/response.go b/pkg/epp/handlers/response.go index 0ccaf81df..7dfaf3b2e 100644 --- a/pkg/epp/handlers/response.go +++ b/pkg/epp/handlers/response.go @@ -19,6 +19,7 @@ package handlers import ( "context" "encoding/json" + "fmt" "strings" configPb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" @@ -39,8 +40,7 @@ func (s *StreamingServer) HandleResponseBody(ctx context.Context, reqCtx *Reques logger := log.FromContext(ctx) responseBytes, err := json.Marshal(response) if err != nil { - logger.V(logutil.DEFAULT).Error(err, "error marshalling responseBody") - return reqCtx, err + return reqCtx, fmt.Errorf("error marshalling responseBody - %w", err) } if response["usage"] != nil { usg := response["usage"].(map[string]any) diff --git a/pkg/epp/handlers/server.go b/pkg/epp/handlers/server.go index 6a5c116d5..ddfb3316c 100644 --- a/pkg/epp/handlers/server.go +++ b/pkg/epp/handlers/server.go @@ -177,9 +177,6 @@ func (s *StreamingServer) Process(srv extProcPb.ExternalProcessor_ProcessServer) return nil } if recvErr != nil { - // This error occurs very frequently, though it doesn't seem to have any impact. - // TODO Figure out if we can remove this noise. - logger.V(logutil.DEFAULT).Error(err, "Cannot receive stream request") return status.Errorf(codes.Unknown, "cannot receive stream request: %v", err) } diff --git a/pkg/epp/server/runserver.go b/pkg/epp/server/runserver.go index 69a928eda..870acc70b 100644 --- a/pkg/epp/server/runserver.go +++ b/pkg/epp/server/runserver.go @@ -157,8 +157,7 @@ func (r *ExtProcServerRunner) AsRunnable(logger logr.Logger) manager.Runnable { cert, err = tlsutil.CreateSelfSignedTLSCertificate(logger) } if err != nil { - logger.Error(err, "Failed to create self signed certificate") - return err + return fmt.Errorf("failed to create self signed certificate - %w", err) } creds := credentials.NewTLS(&tls.Config{