Skip to content

[ToolingLog] remove some manual indent management#126636

Merged
spalger merged 4 commits intoelastic:mainfrom
spalger:remove/some-manual-log-intent-management
Mar 3, 2022
Merged

[ToolingLog] remove some manual indent management#126636
spalger merged 4 commits intoelastic:mainfrom
spalger:remove/some-manual-log-intent-management

Conversation

@spalger
Copy link
Copy Markdown
Contributor

@spalger spalger commented Mar 1, 2022

There is some indentation level missmatching happening in our logging output, so rather than using manual indent incrementing/decrementing we should try to use the block version of indent() as often as feasible. This waits for the block to complete or fail and then resets the log level to where it was before the block started.

@spalger spalger force-pushed the remove/some-manual-log-intent-management branch from a9afb8b to 620812f Compare March 1, 2022 21:20
@spalger spalger force-pushed the remove/some-manual-log-intent-management branch from 620812f to 3d15a81 Compare March 2, 2022 15:47
@spalger spalger added auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Operations Kibana-Operations Team v7.16.3 v8.0.0 v8.1.0 v8.2.0 labels Mar 2, 2022
@spalger spalger marked this pull request as ready for review March 2, 2022 18:31
@spalger spalger requested review from a team as code owners March 2, 2022 18:31
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@spalger spalger added v7.17.2 and removed v7.16.3 labels Mar 2, 2022
Copy link
Copy Markdown
Member

@afharo afharo left a comment

Choose a reason for hiding this comment

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

LGTM! I noticed we are removing the indentation and one log from src/core/test_helpers/kbn_server.ts, but I see where you're coming from. All good on my end.

@spalger
Copy link
Copy Markdown
Contributor Author

spalger commented Mar 3, 2022

@elasticmachine merge upstream

@spalger spalger enabled auto-merge (squash) March 3, 2022 13:50
@spalger spalger merged commit 4f2321d into elastic:main Mar 3, 2022
@kibana-ci
Copy link
Copy Markdown

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
@kbn/dev-utils 200 203 +3

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@spalger spalger deleted the remove/some-manual-log-intent-management branch March 3, 2022 15:15
kibanamachine added a commit that referenced this pull request Mar 3, 2022
* [ToolingLog] remove some manual indent management

* improve log message

* [dev/build] write the newline after a failed step

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 4f2321d)
kibanamachine added a commit that referenced this pull request Mar 3, 2022
* [ToolingLog] remove some manual indent management

* improve log message

* [dev/build] write the newline after a failed step

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 4f2321d)
@kibanamachine
Copy link
Copy Markdown
Contributor

💔 Some backports could not be created

Status Branch Result
8.0
8.1
7.17 Backport failed because of merge conflicts

You might need to backport the following PRs to 7.17:
- [kbn/es] add support for --ready-timeout (#126217)

Manual backport

To create the backport manually run:

node scripts/backport --pr 126636

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

spalger pushed a commit to spalger/kibana that referenced this pull request Mar 3, 2022
* [ToolingLog] remove some manual indent management

* improve log message

* [dev/build] write the newline after a failed step

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 4f2321d)

# Conflicts:
#	packages/kbn-es/src/cluster.js
kibanamachine added a commit that referenced this pull request Mar 3, 2022
* [ToolingLog] remove some manual indent management

* improve log message

* [dev/build] write the newline after a failed step

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 4f2321d)

Co-authored-by: Spencer <spencer@elastic.co>
kibanamachine added a commit that referenced this pull request Mar 3, 2022
* [ToolingLog] remove some manual indent management

* improve log message

* [dev/build] write the newline after a failed step

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 4f2321d)

Co-authored-by: Spencer <spencer@elastic.co>
@spalger spalger removed the v7.17.2 label Mar 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Operations Kibana-Operations Team v8.0.0 v8.1.0 v8.2.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants