-
Notifications
You must be signed in to change notification settings - Fork 961
JSON logging for multiclusterservice controllers #6546
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.
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
base: master
Are you sure you want to change the base?
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary of Changes
Hello @Bhaumik10, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
This pull request significantly enhances the logging capabilities of the multiclusterservice
controllers by transitioning from traditional formatted strings to structured logging. By adopting klog.InfoS
and klog.ErrorS
, the logs now provide key-value pairs, making them machine-readable and much easier to query, filter, and analyze with logging tools. This change improves the overall observability and debugging experience for these critical components.
Highlights
- Structured Logging Adoption: All
klog.Infof
andklog.Errorf
calls within themulticlusterservice
controllers have been migrated to useklog.InfoS
andklog.ErrorS
respectively. This change introduces structured logging (key-value pairs) for improved log parsing and analysis acrossendpointslice_collect_controller.go
,endpointslice_dispatch_controller.go
, andmcs_controller.go
. - Logging Level Refinement: Several
klog.Warningf
calls have been adjusted toklog.V(4).InfoS
. This indicates a re-evaluation of their severity from warnings to verbose informational messages, aligning with the new structured logging approach and ensuring more precise log categorization.
Using Gemini Code Assist
The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.
Invoking Gemini
You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command>
or @gemini-code-assist <command>
. Below is a summary of the supported commands.
Feature | Command | Description |
---|---|---|
Code Review | /gemini review |
Performs a code review for the current pull request in its current state. |
Pull Request Summary | /gemini summary |
Provides a summary of the current pull request in its current state. |
Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in issue comments and review comments. |
Help | /gemini help |
Displays a list of available commands. |
Customization
To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/
folder in the base of the repository. Detailed instructions can be found here.
Limitations & Feedback
Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.
You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.
Footnotes
-
Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request migrates the logging in multiclusterservice controllers to use structured JSON format via klog
. I've identified areas for improvement, mainly around ensuring log messages and keys are clear and consistent, and fixing a couple of minor bugs in the new logging statements. Addressing these points will help maximize the benefits of structured logging.
pkg/controllers/multiclusterservice/endpointslice_dispatch_controller.go
Outdated
Show resolved
Hide resolved
pkg/controllers/multiclusterservice/endpointslice_collect_controller.go
Outdated
Show resolved
Hide resolved
@@ -245,7 +245,7 @@ | |||
curObj := obj.(runtime.Object) | |||
key, err := keys.FederatedKeyFunc(clusterName, curObj) | |||
if err != nil { | |||
klog.Warningf("Failed to generate key for obj: %s", curObj.GetObjectKind().GroupVersionKind()) | |||
klog.V(4).InfoS("Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change demotes a klog.Warningf
to a klog.V(4).InfoS
. Use klog.WarningS
to maintain the same log level and log the err
object for context.
klog.V(4).InfoS("Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) | |
klog.WarningS(err, "Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it is warningS
method in first-place.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jabellard Do you know why Klog does not provide klog.WarningS
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ Bhaumik10, this log shows an unusual situation; we should log it with a warning or error level.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@RainbowMango Seems it is not available in package. I can either move to Error or Info with higher level as I mentioned with V(4). Do you have preference to go with Error?
@@ -258,7 +258,7 @@ | |||
if !reflect.DeepEqual(oldObj, newObj) { | |||
key, err := keys.FederatedKeyFunc(clusterName, curObj) | |||
if err != nil { | |||
klog.Warningf("Failed to generate key for obj: %s", curObj.GetObjectKind().GroupVersionKind()) | |||
klog.V(4).InfoS("Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change demotes a klog.Warningf
to a klog.V(4).InfoS
. Use klog.WarningS
to maintain the same log level and log the err
object for context.
klog.V(4).InfoS("Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) | |
klog.WarningS(err, "Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto.
pkg/controllers/multiclusterservice/endpointslice_dispatch_controller.go
Outdated
Show resolved
Hide resolved
pkg/controllers/multiclusterservice/endpointslice_dispatch_controller.go
Outdated
Show resolved
Hide resolved
pkg/controllers/multiclusterservice/endpointslice_dispatch_controller.go
Outdated
Show resolved
Hide resolved
pkg/controllers/multiclusterservice/endpointslice_dispatch_controller.go
Outdated
Show resolved
Hide resolved
Codecov ReportAttention: Patch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## master #6546 +/- ##
==========================================
+ Coverage 45.43% 45.45% +0.01%
==========================================
Files 687 687
Lines 56334 56337 +3
==========================================
+ Hits 25594 25606 +12
+ Misses 29140 29134 -6
+ Partials 1600 1597 -3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
/assign |
pkg/controllers/multiclusterservice/endpointslice_collect_controller.go
Outdated
Show resolved
Hide resolved
pkg/controllers/multiclusterservice/endpointslice_collect_controller.go
Outdated
Show resolved
Hide resolved
pkg/controllers/multiclusterservice/endpointslice_collect_controller.go
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left a couple comments. Other than that, generally looks good!
/cc @RainbowMango for another look. |
/retest |
Signed-off-by: Bhaumik Patel <[email protected]> Address comments Signed-off-by: Bhaumik Patel <[email protected]> Address comments
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/assign
@@ -84,7 +85,7 @@ const EndpointSliceCollectControllerName = "endpointslice-collect-controller" | |||
|
|||
// Reconcile performs a full reconciliation for the object referred to by the Request. | |||
func (c *EndpointSliceCollectController) Reconcile(ctx context.Context, req controllerruntime.Request) (controllerruntime.Result, error) { | |||
klog.V(4).Infof("Reconciling Work %s", req.NamespacedName.String()) | |||
klog.V(4).InfoS("Reconciling Work", "namespacedName", req.NamespacedName.String(), "namespace", req.Namespace, "name", req.Name) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
klog.V(4).InfoS("Reconciling Work", "namespacedName", req.NamespacedName.String(), "namespace", req.Namespace, "name", req.Name) | |
klog.V(4).InfoS("Reconciling Work", "namespace", req.Namespace, "name", req.Name) |
The namespaceName is redundant.
@@ -245,7 +245,7 @@ | |||
curObj := obj.(runtime.Object) | |||
key, err := keys.FederatedKeyFunc(clusterName, curObj) | |||
if err != nil { | |||
klog.Warningf("Failed to generate key for obj: %s", curObj.GetObjectKind().GroupVersionKind()) | |||
klog.V(4).InfoS("Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jabellard Do you know why Klog does not provide klog.WarningS
?
@@ -245,7 +245,7 @@ | |||
curObj := obj.(runtime.Object) | |||
key, err := keys.FederatedKeyFunc(clusterName, curObj) | |||
if err != nil { | |||
klog.Warningf("Failed to generate key for obj: %s", curObj.GetObjectKind().GroupVersionKind()) | |||
klog.V(4).InfoS("Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ Bhaumik10, this log shows an unusual situation; we should log it with a warning or error level.
@@ -258,7 +258,7 @@ | |||
if !reflect.DeepEqual(oldObj, newObj) { | |||
key, err := keys.FederatedKeyFunc(clusterName, curObj) | |||
if err != nil { | |||
klog.Warningf("Failed to generate key for obj: %s", curObj.GetObjectKind().GroupVersionKind()) | |||
klog.V(4).InfoS("Failed to generate key for obj", "gvk", curObj.GetObjectKind().GroupVersionKind()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto.
@@ -93,7 +93,7 @@ func (c *EndpointsliceDispatchController) Reconcile(ctx context.Context, req con | |||
mcs := &networkingv1alpha1.MultiClusterService{} | |||
if err := c.Client.Get(ctx, types.NamespacedName{Namespace: mcsNS, Name: mcsName}, mcs); err != nil { | |||
if apierrors.IsNotFound(err) { | |||
klog.Warningf("MultiClusterService %s/%s is not found", mcsNS, mcsName) | |||
klog.V(4).InfoS("MultiClusterService is not found", "namespace", mcsNS, "name", mcsName) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it's a normal case that when reconciling Work, but found the MultiClusterService
is gone.
@XiShanYongYe-Chang could you confirm that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will wait for @XiShanYongYe-Chang to respond. For other comments, I have move those from Warning to Error level.
What type of PR is this?
JSON logging support. More details are highlighted in #6230.
Which issue(s) this PR fixes:
Fixes #
Partof #6230
Special notes for your reviewer:
Does this PR introduce a user-facing change?:
NONE