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

Fixes #20944: Broken reporting for double nested method calls #1348

Conversation

amousset
Copy link
Member

@amousset amousset requested a review from ncharles March 28, 2022 17:27
@amousset amousset added the Trigger test Trigger jenkins build label Mar 28, 2022
"stack_len" int => length("method_id_unique.stack");
"method_id" string => nth("method_id_unique.stack", "0");
Copy link
Member

Choose a reason for hiding this comment

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

I think that method_id should be only the stack is not empty
so here
not_empty_stack.!pass2::
"method_id" string => nth("method_id_unique.stack", "0");

and
pass1.!pass2::
"not_empty_stack" expression => isgreaterthan("${stack_len}", "0");

@amousset amousset added Trigger test Trigger jenkins build and removed Trigger test Trigger jenkins build labels Mar 28, 2022
@amousset
Copy link
Member Author

PR updated with a new commit

@amousset amousset added Trigger test Trigger jenkins build and removed Trigger test Trigger jenkins build labels Mar 28, 2022
@amousset
Copy link
Member Author

PR updated with a new commit

@@ -48,7 +48,6 @@ bundle agent service_stopped(name)
"${report_data.method_id}_${name}" usebundle => call_method("ncf_services_check");
"${report_data.method_id}_${name}" usebundle => ncf_services("${name}", "is-active");
"${report_data.method_id}_${name}" usebundle => call_method_classes("${report_data.method_id}_ncf_services_check");
"${report_data.method_id}_${name}" usebundle => call_method_classes_caller;
Copy link
Member

Choose a reason for hiding this comment

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

why are you removing it ?

@Normation-Quality-Assistant
Copy link
Contributor

OK, squash merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant force-pushed the bug_20944/broken_reporting_for_double_nested_method_calls branch from 091dce2 to ea8bd35 Compare March 29, 2022 20:35
@Normation-Quality-Assistant Normation-Quality-Assistant merged commit ea8bd35 into Normation:branches/rudder/7.1 Mar 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Trigger test Trigger jenkins build
Projects
None yet
3 participants