From 7d29afbae85a69ba00ec3b65e5935bbe01b15974 Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Tue, 4 Mar 2025 13:05:03 +1100 Subject: [PATCH] filter out log topics that are making too much noise - set disabled topics during codex compilation due to lack of support for disabling chronicles topics at runtime in codex - ensure that TRACE logs are set for nodes running in multinodesuite when DebugCodexNodes is set - add TRACE loglevel to testcli --- build.nims | 4 ++-- codex/logutils.nim | 3 +++ tests/integration/1_minute/testcli.nim | 3 ++- tests/integration/multinodes.nim | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.nims b/build.nims index e2581ceb..14ffeb7d 100644 --- a/build.nims +++ b/build.nims @@ -50,7 +50,7 @@ task testContracts, "Build & run Codex Contract tests": task testIntegration, "Run integration tests": buildBinary "codex", params = - "-d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE -d:codex_enable_proof_failures=true" + "-d:chronicles_runtime_filtering -d:chronicles_log_level=TRACE -d:chronicles_disabled_topics=JSONRPC-HTTP-CLIENT,websock,libp2p,discv5 -d:codex_enable_proof_failures=true" var testParams = "" for i in 2 ..< paramCount(): if "DebugTestHarness" in paramStr(i) and truthy paramStr(i).split('=')[1]: @@ -59,7 +59,7 @@ task testIntegration, "Run integration tests": test "testIntegration", params = testParams # use params to enable logging from the integration test executable # test "testIntegration", params = "-d:chronicles_sinks=textlines[notimestamps,stdout],textlines[dynamic] " & - # "-d:chronicles_enabled_topics:integration:TRACE" + # "-d:chronicles_enabled_topics:integration:TRACE" task build, "build codex binary": codexTask() diff --git a/codex/logutils.nim b/codex/logutils.nim index e9604aba..0d10b0fb 100644 --- a/codex/logutils.nim +++ b/codex/logutils.nim @@ -92,6 +92,7 @@ import std/sugar import std/typetraits import pkg/chronicles except toJson, `%` +from pkg/chronos import TransportAddress from pkg/libp2p import Cid, MultiAddress, `$` import pkg/questionable import pkg/questionable/results @@ -255,3 +256,5 @@ formatIt(LogFormat.textLines, array[32, byte]): it.short0xHexLog formatIt(LogFormat.json, array[32, byte]): it.to0xHex +formatIt(TransportAddress): + $it diff --git a/tests/integration/1_minute/testcli.nim b/tests/integration/1_minute/testcli.nim index 0339cc66..9eee44b3 100644 --- a/tests/integration/1_minute/testcli.nim +++ b/tests/integration/1_minute/testcli.nim @@ -40,7 +40,8 @@ asyncchecksuite "Command line interface": currentTestName, "Client", some nodeCount mod testCount, - ) + ), + "--log-level=" & $LogLevel.TRACE, ] else: return args diff --git a/tests/integration/multinodes.nim b/tests/integration/multinodes.nim index d047617a..269eb6d1 100644 --- a/tests/integration/multinodes.nim +++ b/tests/integration/multinodes.nim @@ -187,6 +187,8 @@ template multinodesuite*(name: string, body: untyped) = if DebugCodexNodes: config.debugEnabled = true + config.addCliOption("--log-level", $LogLevel.TRACE) + var apiPort, discPort: int withLock(codexPortLock): apiPort = await nextFreePort(lastUsedCodexApiPort + nodeIdx)