Skip to content
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

switch to structured logging #304

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

pinikomarov
Copy link
Contributor

@pinikomarov pinikomarov commented Sep 3, 2023

This automatically adds additional fields like reconcile_id etc.. from the controller context.

before :

2023-05-18T01:53:14+03:00 INFO controllers.KeystoneAPI Reconciled Service init successfully

after:

2023-10-19T12:31:34+03:00 INFO Controllers.Glance Reconciling Service 'glance' init {"controller": "glance", "contr ollerGroup": "glance.openstack.org", "controllerKind": "Glance", "Glance": {"name":"glance","namespace":"openstack"}, "namespace": "ope nstack", "name": "glance", "reconcileID": "b00689f2-c505-49c4-a63e-7fb1f8d8cba2"}

*by using per reconcile function respective logger objects, the intention is to lay the ground for parallel reconciliation in future and avoid race conditions as ctx objects are reconcile run specific.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 3, 2023

Hi @pinikomarov. Thanks for your PR.

I'm waiting for a openstack-k8s-operators member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@fmount
Copy link
Contributor

fmount commented Oct 24, 2023

/ok-to-test

@pinikomarov
Copy link
Contributor Author

/retest-required

@pinikomarov
Copy link
Contributor Author

@fmount are we good here ? can we proceed ?

@fmount
Copy link
Contributor

fmount commented Dec 19, 2023

@fmount are we good here ? can we proceed ?

Checking the patch.

Scheme *runtime.Scheme
}

// GetLogger returns a logger object with a logging prefix of "controller.name" and additional controller context fields
func (r *GlanceReconciler) GetLogger(ctx context.Context) logr.Logger {
return log.FromContext(ctx).WithName("Controllers").WithName("Glance")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about having: return log.FromContext(ctx).WithName("Controllers").WithName(string(glance.Glance))

Scheme *runtime.Scheme
}

// GetLogger returns a logger object with a logging prefix of "controller.name" and additional controller context fields
func (r *GlanceAPIReconciler) GetLogger(ctx context.Context) logr.Logger {
return log.FromContext(ctx).WithName("Controllers").WithName("GlanceAPI")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about having: return log.FromContext(ctx).WithName("Controllers").WithName(string(glance.GlanceAPI))

Scheme *runtime.Scheme
}

// GetLogger returns a logger object with a logging prefix of "controller.name" and additional controller context fields
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if we can move the GetLogger function in glance_common.go and eventually pass (as input) the component.
This way we can extend the behavior and we don't have to define it twice, as well as we can make it independent from the caller. @pinikomarov can you check this?

Copy link
Contributor

@fmount fmount Dec 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically add:

// GetLogger returns a logger object with a logging prefix of "controller.name" and additional controller context fields
func GetLogger(ctx context.Context, caller string) logr.Logger {
	return log.FromContext(ctx).WithName("Controllers").WithName(caller)
}

to glance_common.go, and in both glance_controller.go and glanceapi_controller.go change the GetLogger call to something like:

// Reconcile reconcile Glance API requests
func (r *GlanceAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, _err error) {
	Log := GetLogger(ctx, string(glance.GlanceAPI))
...
...

and

// Reconcile reconcile Glance requests
func (r *GlanceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, _err error) {
	Log := GetLogger(ctx, string(glance.Glance))
...
...

By doing the above, you can define the logr.logger once and pass it to the underlying functions.
For instance, the reconcileDelete (but it applies to the other functions), can be changed to have in its signature the Log parameter:

func (r *GlanceReconciler) reconcileDelete(ctx context.Context, instance *glancev1.Glance, helper *helper.Helper, Log logr.Logger) (ctrl.Result, error) {
   ...
   ...

and you don't have to call GetLogger every time, because it's already available and it has been instantiated in the main reconcile loop.

update controller str
Copy link
Contributor

openshift-ci bot commented Dec 21, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pinikomarov
Once this PR has been reviewed and has the lgtm label, please ask for approval from fmount. For more information see the Kubernetes Code Review Process.

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

openshift-ci bot commented Dec 21, 2023

@pinikomarov: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/functional 741f5f4 link true /test functional
ci/prow/precommit-check 741f5f4 link true /test precommit-check
ci/prow/glance-operator-build-deploy-tempest 741f5f4 link true /test glance-operator-build-deploy-tempest
ci/prow/glance-operator-build-deploy-kuttl 741f5f4 link true /test glance-operator-build-deploy-kuttl

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants