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

build+lnd+docs: start using slog and add commit_hash to log lines #9314

Merged
merged 13 commits into from
Dec 2, 2024

Conversation

ellemouton
Copy link
Collaborator

@ellemouton ellemouton commented Nov 27, 2024

This PR does a few things:

  1. adds a custom lll linter implementation that ignores log lines.
  2. Adds documentation for structured log lines
  3. adds an lll linter exception for log lines.
  4. Adds a new --logging.build-info option which can be used to toggle if build info (currently only a commit hash fingerprint) should be included in log lines. NOTE: default is on for prod and off for dev. Keep this in mind when testing :)
  5. updates the lnd Main function to add build info to its context & use structured logging for all its logs.

Example:

[INF] LTND: Network Info commit_hash=cf6617c8e9f7 active_chain=Bitcoin network=regtest
[INF] LTND: Waiting for chain backend to finish sync commit_hash=cf6617c8e9f7 start_height=473
[DBG] LTND: Syncing to block chain commit_hash=cf6617c8e9f7 best_block_time="2024-11-25 15:59:04 +0200 SAST" is_synced=false

Copy link
Contributor

coderabbitai bot commented Nov 27, 2024

Important

Review skipped

Auto reviews are limited to specific labels.

🏷️ Labels to auto review (1)
  • llm-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@ellemouton
Copy link
Collaborator Author

ellemouton commented Nov 28, 2024

damn - looks like the linter exclusion rule only works for single-line logs...

gonna see if i can write a linter plugin

Copy link
Collaborator

@guggero guggero left a comment

Choose a reason for hiding this comment

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

Very nice! The age of structured logs has finally arrived 🚀

docs/code_formatting_rules.md Show resolved Hide resolved
build/config.go Outdated Show resolved Hide resolved
lnd.go Show resolved Hide resolved
lnd.go Show resolved Hide resolved
lnd.go Outdated Show resolved Hide resolved
lnd.go Outdated Show resolved Hide resolved
In this commit, we copy the implementation of the golangci-lint lll
linter which we currently use in our CI flow during the `make lint`
check. This commit copies the code mostly as is (the only exception
being the line which trims white space before checking if a line starts
with "import"), and formats it to fit our codebase guidelines. A test is
also added so that we can be sure that the following commits which
adjust the implementation have the intended results.

The custom linter is put into its own module as this is requied by the
`golangci-lint custom` when building the custom linter binary which
includes the plugin.
This commit introduces the `LLPlugin` type and converts the existing lll
code such that the LLPlugin implements the register.LinterPlugin
interface. This will allow us to plug it into golangci-linter as a
plugin.
Copy link
Collaborator Author

@ellemouton ellemouton left a comment

Choose a reason for hiding this comment

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

Thanks @guggero 🙏

I've updated the PR with a custom lll linter implementation (let me know if you would prefer if I moved it to its own PR).

build/config.go Outdated Show resolved Hide resolved
lnd.go Outdated Show resolved Hide resolved
lnd.go Show resolved Hide resolved
lnd.go Show resolved Hide resolved
docs/code_formatting_rules.md Show resolved Hide resolved
tools/linters/go.mod Show resolved Hide resolved
tools/linters/ll.go Show resolved Hide resolved
@ellemouton ellemouton self-assigned this Nov 29, 2024
@ellemouton ellemouton added logging Related to the logging / debug output functionality CI continuous integration docs labels Nov 29, 2024
Copy link
Collaborator

@guggero guggero left a comment

Choose a reason for hiding this comment

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

Two suggestions, otherwise LGTM 🎉

Super nice features 💯

tools/linters/ll.go Outdated Show resolved Hide resolved
.golangci.yml Outdated Show resolved Hide resolved
build/version.go Outdated Show resolved Hide resolved
This commit adds a feature to our custom lll linter which will ignore
log lines (both single and multi-lined log lines) for the lll linter.
Add this file both to the main LND directory so that devs can use it for
local linter runs and also add it to the `tools` directory so that the
docker environment used to run the linter in CI has access to it. A
custom linter binary can be built via `golangci-lint custom`. This will
pull in and register all the plugins listed in the new config file when
building the new binary. The new binary can then be run using
`custom-gcl run`.
Find and replace all nolint instances refering to the `lll` linter and
replace with `ll` which is the name of our custom version of the `lll`
linter which can be used to ignore log lines during linting.

The next commit will do the configuration of the custom linter and
disable the default one.
lnd.go Show resolved Hide resolved
Copy link
Collaborator

@bhandras bhandras left a comment

Choose a reason for hiding this comment

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

LGTM, very nice work! 🥇

@guggero guggero merged commit 0474b4f into lightningnetwork:master Dec 2, 2024
22 of 32 checks passed
@ellemouton ellemouton deleted the slog1 branch December 2, 2024 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI continuous integration docs logging Related to the logging / debug output functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants