cmd: route libp2p to charon logger #1810
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
corverroos
commented
Feb 15, 2023
|
|
||
| continue | ||
| } | ||
|
|
||
| filtered = append(filtered, f) | ||
| } | ||
|
|
||
| ent.LoggerName = (ent.LoggerName + " ")[:10] // Align topic/LoggerName spacing. |
There was a problem hiding this comment.
pad and color LoggerName to include libp2p logger names as topics.
Codecov ReportBase: 55.12% // Head: 55.11% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## main #1810 +/- ##
==========================================
- Coverage 55.12% 55.11% -0.02%
==========================================
Files 168 168
Lines 22005 22022 +17
==========================================
+ Hits 12131 12138 +7
- Misses 8312 8324 +12
+ Partials 1562 1560 -2
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
dB2510
approved these changes
Feb 15, 2023
xenowits
reviewed
Feb 15, 2023
| @@ -52,7 +52,7 @@ type Config struct { | |||
| AutoP2PKey bool | |||
| MaxResPerPeer int | |||
| MaxConns int | |||
| RelayLogLevel string | |||
| RelayLogLevel string // TODO(corver): Rename to LibP2PLogLevel. | |||
There was a problem hiding this comment.
why did you defer this renaming refactor?
There was a problem hiding this comment.
since it includes a flag rename and we have old relays still running, want to avoid two different flags in production
xenowits
approved these changes
Feb 15, 2023
corverroos
added
the
merge when ready
gsora
added a commit
that referenced
this pull request
Feb 20, 2023
commit a04ce78 Author: Dhruv Bodani <[email protected]> Date: Mon Feb 20 20:04:37 2023 +0530 *: upgrade to go1.20.1 (#1824) Upgrades go version to 1.20.1. category: misc ticket: #1821 commit c63199e Author: corver <[email protected]> Date: Mon Feb 20 15:36:34 2023 +0200 gomod: upgrade libp2p (#1823) Upgrades libp2p to v0.25.1 category: refactor ticket: none commit e3161a3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Feb 20 10:41:34 2023 +0000 build(deps): Bump golang.org/x/net from 0.6.0 to 0.7.0 (#1822) (dependabot) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.6.0 to 0.7.0. commit ce76297 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Feb 20 10:36:13 2023 +0000 build(deps): Bump github.com/attestantio/go-eth2-client from 0.15.3 to 0.15.4 (#1819) Bumps [github.com/attestantio/go-eth2-client](https://github.com/attestantio/go-eth2-client) from 0.15.3 to 0.15.4. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/attestantio/go-eth2-client/commit/c06075ae2b1cce11556e07dde1ff7b650668b80c"><code>c06075a</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/attestantio/go-eth2-client/issues/46">#46</a> from attestantio/dvt</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/776af407e5ea768d2e534331cf85a7fb3ac59d59"><code>776af40</code></a> Merge branch 'master' into dvt</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/d21be8e84af4a8e953b996de7818e8698e8bdb2d"><code>d21be8e</code></a> Fixes</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/6a22388d146182276771328f6e415c4fa17bb362"><code>6a22388</code></a> Update http/blindedbeaconblockproposal.go</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/c2b26ac084e7227396e33021bd1035b1a9fdb9b2"><code>c2b26ac</code></a> Update http/blindedbeaconblockproposal.go</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/3ca9b6d4dee2ddfb607808cfcd52862be5ad8f2e"><code>3ca9b6d</code></a> Update http/beaconblockproposal.go</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/9646809365152d3eb7c239d0339e4aac91bef58a"><code>9646809</code></a> Update http/beaconblockproposal.go</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/d29581f31c965436f465c034b56c507c5e0f73e9"><code>d29581f</code></a> Update http/beaconblockproposal.go</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/870a2f3a67465c8a7c2476dc284103d0a05a06e0"><code>870a2f3</code></a> Update http/beaconblockproposal.go</li> <li><a href="https://github.com/attestantio/go-eth2-client/commit/097a53c5ef6c46b844c2804693bff3967f99db86"><code>097a53c</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/attestantio/go-eth2-client/issues/45">#45</a> from avalkov/support-extra-headers</li> <li>Additional commits viewable in <a href="https://github.com/attestantio/go-eth2-client/compare/v0.15.3...v0.15.4">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> commit bf0f469 Author: corver <[email protected]> Date: Fri Feb 17 15:48:09 2023 +0200 dkg: add deposit data to lock file (#1815) Populates the deposit data field in the generated lock files. category: feature ticket: #1775 commit b16fd01 Author: Gianguido Sorà <[email protected]> Date: Thu Feb 16 17:45:18 2023 +0100 p2p: remove pointless "No connections to relay" log line (#1816) That log line wasn't useful anyway. category: refactor ticket: none commit 14d6b7c Author: corver <[email protected]> Date: Thu Feb 16 17:43:32 2023 +0200 cluster: draft v1.6 lock with deposit data (#1813) Adds a new draft lock version v1.6 which includes deposit data in the lock's distributed validators. category: feature ticket: #1775 commit d56cfd5 Author: corver <[email protected]> Date: Wed Feb 15 16:25:55 2023 +0200 cmd: route libp2p to charon logger (#1810) Fixes issue with libp2p using its own logger. Instead, it now logs via the configured charon logger (incl pushing to loki if enabled). category: refactor ticket: none commit f1d260b Author: corver <[email protected]> Date: Wed Feb 15 09:17:04 2023 +0200 app: add a test for remote relay connections (#1808) Adds a test/script to test remote relay connection count. category: test ticket: none commit 3c91888 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Feb 14 17:07:50 2023 +0000 build(deps): Bump go.uber.org/goleak from 1.2.0 to 1.2.1 (#1807) (dependabot) Bumps [go.uber.org/goleak](https://github.com/uber-go/goleak) from 1.2.0 to 1.2.1. commit fbfbfdf Author: corver <[email protected]> Date: Tue Feb 14 17:45:11 2023 +0200 cmd/relay: fix connection limits (#1805) Fixes issue with relay limits not being applied correctly getting stuck at 256 connections. category: bug ticket: none commit bc73565 Author: Dhruv Bodani <[email protected]> Date: Tue Feb 14 21:00:09 2023 +0530 compose: fix very large smoke test (#1797) Enables very large smoke test with 7 of 10 cluster and 100 validators. category: test ticket: #1471 commit 2403c2a Author: Abhishek Kumar <[email protected]> Date: Tue Feb 14 16:48:02 2023 +0530 validatorapi: fix content type in http response (#1803) Fixes sending incorrect `Content-Type` header in HTTP response. Found this bug while integrating nimbus VC which errored when charon sent `text/plain` instead of `application/json`. category: bug ticket: none
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes issue with libp2p using its own logger. Instead, it now logs via the configured charon logger (incl pushing to loki if enabled).
category: refactor
ticket: none