davsclaus commented on code in PR #26147: URL: https://github.com/apache/camel/pull/26147#discussion_r3949611119
########## .github/actions/incremental-build/reactor_timing.sh: ########## @@ -0,0 +1,242 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Helpers for parsing Maven reactor timing lines from incremental-test.log. + +parse_reactor_duration_seconds() { + local line="$1" + if [[ "$line" =~ \[[[:space:]]*([0-9]+(\.[0-9]+)?)[[:space:]]*s\][[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_status() { + local line="$1" + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*\[ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_module_name() { + local line="$1" + local name="${line#\[INFO\] }" + name=$(echo "$name" | sed 's/ \..*$//') + name=$(echo "$name" | sed 's/ *\[.*\]$//') + name=$(echo "$name" | sed 's/ SUCCESS$//; s/ FAILURE$//; s/ SKIPPED$//') + name=$(echo "$name" | sed 's/ *$//') + echo "$name" +} + +format_elapsed_seconds() { + local raw="$1" + if [[ -z "$raw" ]]; then + echo "n/a" + return 0 + fi + + awk -v seconds="$raw" ' + BEGIN { + if (seconds < 60) { + printf "%.1fs", seconds + } else { + mins = int(seconds / 60) + secs = seconds - (mins * 60) + if (mins < 60) { + printf "%dm %.0fs", mins, secs + } else { + hours = int(mins / 60) + mins = mins - (hours * 60) + printf "%dh %dm", hours, mins + } + } + }' +} + +parse_reactor_log_to_tsv() { + local log_file="$1" + local parsed="" + local line module duration status + + while IFS= read -r line; do + module=$(parse_reactor_module_name "$line") + duration=$(parse_reactor_duration_seconds "$line") + status=$(parse_reactor_status "$line") + if [[ -n "$module" ]]; then + parsed+="${module}"$'\t'"${duration}"$'\t'"${status}"$'\n' + fi + done < <(grep '^\[INFO\] Camel ::' "$log_file" || true) + + if [[ -z "$parsed" ]]; then + return 0 + fi + + echo "$parsed" | awk -F '\t' ' + { + key = $1 + if (key == "") { + next + } + duration = ($2 == "" ? -1 : $2) + status = $3 + if (!(key in seen) || duration > stored[key]) { + seen[key] = 1 + stored[key] = duration + statuses[key] = status + } + } + END { + for (key in seen) { + duration = stored[key] + if (duration < 0) { + duration = "" + } + printf "%s\t%s\t%s\n", key, duration, statuses[key] + } + }' | sort +} + +sum_elapsed_seconds_from_tsv() { + local tsv="$1" + if [[ -z "$tsv" ]]; then + echo "0" + return 0 + fi + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { total += $2 } + END { printf "%.3f", total + 0 }' +} + +render_top_slowest_modules() { + local tsv="$1" + local limit="${2:-5}" + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { Review Comment: The default limit of `5` is too low for a project with ~500 reactor modules — only 1% of modules would appear. Consider raising this to at least `20`, or introducing a named constant: ```suggestion local limit="${2:-20}" ``` ########## .github/actions/incremental-build/reactor_timing.sh: ########## @@ -0,0 +1,242 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Helpers for parsing Maven reactor timing lines from incremental-test.log. + +parse_reactor_duration_seconds() { + local line="$1" + if [[ "$line" =~ \[[[:space:]]*([0-9]+(\.[0-9]+)?)[[:space:]]*s\][[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_status() { + local line="$1" + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*\[ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_module_name() { + local line="$1" + local name="${line#\[INFO\] }" + name=$(echo "$name" | sed 's/ \..*$//') + name=$(echo "$name" | sed 's/ *\[.*\]$//') + name=$(echo "$name" | sed 's/ SUCCESS$//; s/ FAILURE$//; s/ SKIPPED$//') + name=$(echo "$name" | sed 's/ *$//') + echo "$name" +} + +format_elapsed_seconds() { + local raw="$1" + if [[ -z "$raw" ]]; then + echo "n/a" + return 0 + fi + + awk -v seconds="$raw" ' + BEGIN { + if (seconds < 60) { + printf "%.1fs", seconds + } else { + mins = int(seconds / 60) + secs = seconds - (mins * 60) + if (mins < 60) { + printf "%dm %.0fs", mins, secs + } else { + hours = int(mins / 60) + mins = mins - (hours * 60) + printf "%dh %dm", hours, mins + } + } + }' +} + +parse_reactor_log_to_tsv() { + local log_file="$1" + local parsed="" + local line module duration status + + while IFS= read -r line; do + module=$(parse_reactor_module_name "$line") + duration=$(parse_reactor_duration_seconds "$line") + status=$(parse_reactor_status "$line") + if [[ -n "$module" ]]; then + parsed+="${module}"$'\t'"${duration}"$'\t'"${status}"$'\n' + fi + done < <(grep '^\[INFO\] Camel ::' "$log_file" || true) + + if [[ -z "$parsed" ]]; then + return 0 + fi + + echo "$parsed" | awk -F '\t' ' + { + key = $1 + if (key == "") { + next + } + duration = ($2 == "" ? -1 : $2) + status = $3 + if (!(key in seen) || duration > stored[key]) { + seen[key] = 1 + stored[key] = duration + statuses[key] = status + } + } + END { + for (key in seen) { + duration = stored[key] + if (duration < 0) { + duration = "" + } + printf "%s\t%s\t%s\n", key, duration, statuses[key] + } + }' | sort +} + +sum_elapsed_seconds_from_tsv() { + local tsv="$1" + if [[ -z "$tsv" ]]; then + echo "0" + return 0 + fi + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { total += $2 } + END { printf "%.3f", total + 0 }' +} + +render_top_slowest_modules() { + local tsv="$1" + local limit="${2:-5}" + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { + printf "%s\t%s\n", $2, $1 + }' | sort -t $'\t' -k1,1nr | head -n "$limit" | while IFS=$'\t' read -r seconds module; do + local formatted + formatted=$(format_elapsed_seconds "$seconds") + echo "- \`${module}\` (${formatted})" + done +} + +append_reactor_timing_report() { + local log_file="$1" + local comment_file="$2" + local reactor_label="$3" + local step_summary_file="${4:-}" + + if [[ ! -f "$log_file" ]]; then + return 0 + fi + + local tsv + tsv=$(parse_reactor_log_to_tsv "$log_file") + if [[ -z "$tsv" ]]; then + return 0 + fi + + local count total_seconds total_formatted + count=$(echo "$tsv" | grep -c . || true) + total_seconds=$(sum_elapsed_seconds_from_tsv "$tsv") + total_formatted=$(format_elapsed_seconds "$total_seconds") + + { + echo "" + echo "<details><summary>${reactor_label} (${count} modules, ${total_formatted} total)</summary>" + echo "" + echo "**Total reactor time:** ${total_formatted}" + echo "" + echo "| Module | Duration | Status |" + echo "| --- | --- | --- |" + } >> "$comment_file" + + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { + printf "%s\t%s\t%s\n", $2, $1, $3 + } + $2 == "" { + printf "-1\t%s\t%s\n", $1, $3 + }' | sort -t $'\t' -k1,1nr | while IFS=$'\t' read -r sort_key module status; do + local duration_display="n/a" + if [[ "$sort_key" != "-1" ]]; then + duration_display=$(format_elapsed_seconds "$sort_key") + fi + echo "| ${module} | ${duration_display} | ${status:-} |" >> "$comment_file" + done + + local slowest + slowest=$(render_top_slowest_modules "$tsv" 5) + if [[ -n "$slowest" ]]; then + { Review Comment: This hardcoded `5` is independent of the `limit` parameter in `render_top_slowest_modules`. If you introduce a named constant (`TOP_SLOWEST_LIMIT`), use it here — otherwise bumping the default in the function still shows "Top 5" in the label. ```suggestion slowest=$(render_top_slowest_modules "$tsv" 20) ``` ########## .github/actions/incremental-build/reactor_timing.sh: ########## @@ -0,0 +1,242 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Helpers for parsing Maven reactor timing lines from incremental-test.log. + +parse_reactor_duration_seconds() { + local line="$1" + if [[ "$line" =~ \[[[:space:]]*([0-9]+(\.[0-9]+)?)[[:space:]]*s\][[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_status() { + local line="$1" + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*\[ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_module_name() { + local line="$1" + local name="${line#\[INFO\] }" + name=$(echo "$name" | sed 's/ \..*$//') + name=$(echo "$name" | sed 's/ *\[.*\]$//') + name=$(echo "$name" | sed 's/ SUCCESS$//; s/ FAILURE$//; s/ SKIPPED$//') + name=$(echo "$name" | sed 's/ *$//') + echo "$name" +} + +format_elapsed_seconds() { + local raw="$1" + if [[ -z "$raw" ]]; then + echo "n/a" + return 0 + fi + + awk -v seconds="$raw" ' + BEGIN { + if (seconds < 60) { + printf "%.1fs", seconds + } else { + mins = int(seconds / 60) + secs = seconds - (mins * 60) + if (mins < 60) { + printf "%dm %.0fs", mins, secs + } else { + hours = int(mins / 60) + mins = mins - (hours * 60) + printf "%dh %dm", hours, mins + } + } + }' +} + +parse_reactor_log_to_tsv() { + local log_file="$1" + local parsed="" + local line module duration status + + while IFS= read -r line; do + module=$(parse_reactor_module_name "$line") + duration=$(parse_reactor_duration_seconds "$line") + status=$(parse_reactor_status "$line") + if [[ -n "$module" ]]; then + parsed+="${module}"$'\t'"${duration}"$'\t'"${status}"$'\n' + fi + done < <(grep '^\[INFO\] Camel ::' "$log_file" || true) + + if [[ -z "$parsed" ]]; then + return 0 + fi + + echo "$parsed" | awk -F '\t' ' + { + key = $1 + if (key == "") { + next + } + duration = ($2 == "" ? -1 : $2) + status = $3 + if (!(key in seen) || duration > stored[key]) { + seen[key] = 1 + stored[key] = duration + statuses[key] = status + } + } + END { + for (key in seen) { + duration = stored[key] + if (duration < 0) { + duration = "" + } + printf "%s\t%s\t%s\n", key, duration, statuses[key] + } + }' | sort +} + +sum_elapsed_seconds_from_tsv() { + local tsv="$1" + if [[ -z "$tsv" ]]; then + echo "0" + return 0 + fi + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { total += $2 } + END { printf "%.3f", total + 0 }' +} + +render_top_slowest_modules() { + local tsv="$1" + local limit="${2:-5}" + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { + printf "%s\t%s\n", $2, $1 + }' | sort -t $'\t' -k1,1nr | head -n "$limit" | while IFS=$'\t' read -r seconds module; do + local formatted + formatted=$(format_elapsed_seconds "$seconds") + echo "- \`${module}\` (${formatted})" + done +} + +append_reactor_timing_report() { + local log_file="$1" + local comment_file="$2" + local reactor_label="$3" + local step_summary_file="${4:-}" + + if [[ ! -f "$log_file" ]]; then + return 0 + fi + + local tsv + tsv=$(parse_reactor_log_to_tsv "$log_file") + if [[ -z "$tsv" ]]; then + return 0 + fi + + local count total_seconds total_formatted + count=$(echo "$tsv" | grep -c . || true) + total_seconds=$(sum_elapsed_seconds_from_tsv "$tsv") + total_formatted=$(format_elapsed_seconds "$total_seconds") + + { + echo "" + echo "<details><summary>${reactor_label} (${count} modules, ${total_formatted} total)</summary>" + echo "" + echo "**Total reactor time:** ${total_formatted}" + echo "" + echo "| Module | Duration | Status |" + echo "| --- | --- | --- |" + } >> "$comment_file" + + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { + printf "%s\t%s\t%s\n", $2, $1, $3 + } + $2 == "" { + printf "-1\t%s\t%s\n", $1, $3 + }' | sort -t $'\t' -k1,1nr | while IFS=$'\t' read -r sort_key module status; do + local duration_display="n/a" + if [[ "$sort_key" != "-1" ]]; then + duration_display=$(format_elapsed_seconds "$sort_key") + fi + echo "| ${module} | ${duration_display} | ${status:-} |" >> "$comment_file" + done + + local slowest + slowest=$(render_top_slowest_modules "$tsv" 5) + if [[ -n "$slowest" ]]; then + { + echo "" + echo "**Top 5 slowest modules:**" + echo "$slowest" + } >> "$comment_file" + fi + + { + echo "" + echo "</details>" + } >> "$comment_file" + + if [[ -n "$step_summary_file" ]]; then + { + echo "" + echo "<details><summary><b>${reactor_label} (${count} modules, ${total_formatted} total)</b></summary>" Review Comment: The block that follows (lines ~207–242) is an exact copy of lines ~167–204 above, differing only in the output file. Consider extracting a helper: ```bash _write_timing_section() { local tsv="$1" slowest="$2" total_formatted="$3" label="$4" count="$5" outfile="$6" # ... shared rendering logic ... } ``` Then call it twice: once for `comment_file`, once for `step_summary_file`. ########## .github/actions/incremental-build/reactor_timing.sh: ########## @@ -0,0 +1,242 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Helpers for parsing Maven reactor timing lines from incremental-test.log. + +parse_reactor_duration_seconds() { + local line="$1" + if [[ "$line" =~ \[[[:space:]]*([0-9]+(\.[0-9]+)?)[[:space:]]*s\][[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_status() { + local line="$1" + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*\[ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + if [[ "$line" =~ [[:space:]](SUCCESS|FAILURE|SKIPPED)[[:space:]]*$ ]]; then + echo "${BASH_REMATCH[1]}" + return 0 + fi + echo "" +} + +parse_reactor_module_name() { + local line="$1" + local name="${line#\[INFO\] }" + name=$(echo "$name" | sed 's/ \..*$//') + name=$(echo "$name" | sed 's/ *\[.*\]$//') + name=$(echo "$name" | sed 's/ SUCCESS$//; s/ FAILURE$//; s/ SKIPPED$//') + name=$(echo "$name" | sed 's/ *$//') + echo "$name" +} + +format_elapsed_seconds() { + local raw="$1" + if [[ -z "$raw" ]]; then + echo "n/a" + return 0 + fi + + awk -v seconds="$raw" ' + BEGIN { + if (seconds < 60) { + printf "%.1fs", seconds + } else { + mins = int(seconds / 60) + secs = seconds - (mins * 60) + if (mins < 60) { + printf "%dm %.0fs", mins, secs + } else { + hours = int(mins / 60) + mins = mins - (hours * 60) + printf "%dh %dm", hours, mins + } + } + }' +} + +parse_reactor_log_to_tsv() { + local log_file="$1" + local parsed="" + local line module duration status + + while IFS= read -r line; do + module=$(parse_reactor_module_name "$line") + duration=$(parse_reactor_duration_seconds "$line") + status=$(parse_reactor_status "$line") + if [[ -n "$module" ]]; then + parsed+="${module}"$'\t'"${duration}"$'\t'"${status}"$'\n' + fi + done < <(grep '^\[INFO\] Camel ::' "$log_file" || true) + + if [[ -z "$parsed" ]]; then + return 0 + fi + + echo "$parsed" | awk -F '\t' ' + { + key = $1 + if (key == "") { + next + } + duration = ($2 == "" ? -1 : $2) + status = $3 + if (!(key in seen) || duration > stored[key]) { + seen[key] = 1 + stored[key] = duration + statuses[key] = status + } + } + END { + for (key in seen) { + duration = stored[key] + if (duration < 0) { + duration = "" + } + printf "%s\t%s\t%s\n", key, duration, statuses[key] + } + }' | sort +} + +sum_elapsed_seconds_from_tsv() { + local tsv="$1" + if [[ -z "$tsv" ]]; then + echo "0" + return 0 + fi + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { total += $2 } + END { printf "%.3f", total + 0 }' +} + +render_top_slowest_modules() { + local tsv="$1" + local limit="${2:-5}" + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { + printf "%s\t%s\n", $2, $1 + }' | sort -t $'\t' -k1,1nr | head -n "$limit" | while IFS=$'\t' read -r seconds module; do + local formatted + formatted=$(format_elapsed_seconds "$seconds") + echo "- \`${module}\` (${formatted})" + done +} + +append_reactor_timing_report() { + local log_file="$1" + local comment_file="$2" + local reactor_label="$3" + local step_summary_file="${4:-}" + + if [[ ! -f "$log_file" ]]; then + return 0 + fi + + local tsv + tsv=$(parse_reactor_log_to_tsv "$log_file") + if [[ -z "$tsv" ]]; then + return 0 + fi + + local count total_seconds total_formatted + count=$(echo "$tsv" | grep -c . || true) + total_seconds=$(sum_elapsed_seconds_from_tsv "$tsv") + total_formatted=$(format_elapsed_seconds "$total_seconds") + + { + echo "" + echo "<details><summary>${reactor_label} (${count} modules, ${total_formatted} total)</summary>" + echo "" + echo "**Total reactor time:** ${total_formatted}" + echo "" + echo "| Module | Duration | Status |" + echo "| --- | --- | --- |" + } >> "$comment_file" + + echo "$tsv" | awk -F '\t' ' + $2 != "" && $2 ~ /^[0-9]+(\.[0-9]+)?$/ { + printf "%s\t%s\t%s\n", $2, $1, $3 + } + $2 == "" { + printf "-1\t%s\t%s\n", $1, $3 + }' | sort -t $'\t' -k1,1nr | while IFS=$'\t' read -r sort_key module status; do + local duration_display="n/a" + if [[ "$sort_key" != "-1" ]]; then + duration_display=$(format_elapsed_seconds "$sort_key") + fi + echo "| ${module} | ${duration_display} | ${status:-} |" >> "$comment_file" + done + + local slowest + slowest=$(render_top_slowest_modules "$tsv" 5) + if [[ -n "$slowest" ]]; then + { + echo "" + echo "**Top 5 slowest modules:**" + echo "$slowest" + } >> "$comment_file" Review Comment: Label is hardcoded to match the `5` above. If the limit changes, this string must also be updated manually. Using a variable here (e.g. `**Top ${TOP_SLOWEST_LIMIT} slowest modules:**`) keeps them in sync automatically. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
