Skip to content

Commit 15ed8f6

Browse files
committed
TMP3: add legacy, make updates for new tracing in ci tests
1 parent b489562 commit 15ed8f6

12 files changed

+230
-200
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cli node:
3636
cabal --ghc-options="+RTS -qn8 -A32M -RTS" build cardano-$@
3737

3838
trace-documentation:
39-
cabal run -- exe:cardano-node trace-documentation --config 'configuration/cardano/mainnet-config-new-tracing.yaml' --output-file 'doc/new-tracing/tracers_doc_generated.md'
39+
cabal run -- exe:cardano-node trace-documentation --config 'configuration/cardano/mainnet-config.yaml' --output-file 'doc/new-tracing/tracers_doc_generated.md'
4040

4141
###
4242
### Workbench
@@ -83,7 +83,7 @@ $(eval $(call define_profile_targets, $(LOCAL_PROFILES)))
8383
$(eval $(call define_profile_targets_nomadcloud,$(CLOUD_PROFILES)))
8484

8585
# Dynamic local/supervisor profile targets.
86-
playground-%:
86+
playground-%:
8787
nix-shell -A 'workbench-shell' --max-jobs 8 --cores 0 --show-trace --argstr profileName $*-${ERA} --argstr backendName supervisor
8888

8989
###

cardano-node/test/Test/Cardano/Tracing/NewTracing/Consistency.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ tests = do
2525
[ ( []
2626
-- This file name should reference the current standard config with new tracing
2727
, configSubdir
28-
, "mainnet-config-new-tracing.json"
28+
, "mainnet-config.json"
2929
)
3030
,
3131
( []
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
{
2+
"AlonzoGenesisFile": "mainnet-alonzo-genesis.json",
3+
"AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874",
4+
"ByronGenesisFile": "mainnet-byron-genesis.json",
5+
"ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb",
6+
"ConwayGenesisFile": "mainnet-conway-genesis.json",
7+
"ConwayGenesisHash": "15a199f895e461ec0ffc6dd4e4028af28a492ab4e806d39cb674c88f7643ef62",
8+
"EnableP2P": true,
9+
"LastKnownBlockVersion-Alt": 0,
10+
"LastKnownBlockVersion-Major": 3,
11+
"LastKnownBlockVersion-Minor": 0,
12+
"MaxKnownMajorProtocolVersion": 2,
13+
"MinNodeVersion": "10.1.4",
14+
"PeerSharing": true,
15+
"Protocol": "Cardano",
16+
"RequiresNetworkMagic": "RequiresNoMagic",
17+
"ShelleyGenesisFile": "mainnet-shelley-genesis.json",
18+
"ShelleyGenesisHash": "1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81",
19+
"TargetNumberOfActivePeers": 20,
20+
"TargetNumberOfEstablishedPeers": 40,
21+
"TargetNumberOfKnownPeers": 150,
22+
"TargetNumberOfRootPeers": 60,
23+
"TraceAcceptPolicy": true,
24+
"TraceBlockFetchClient": false,
25+
"TraceBlockFetchDecisions": false,
26+
"TraceBlockFetchProtocol": false,
27+
"TraceBlockFetchProtocolSerialised": false,
28+
"TraceBlockFetchServer": false,
29+
"TraceChainDb": true,
30+
"TraceChainSyncBlockServer": false,
31+
"TraceChainSyncClient": false,
32+
"TraceChainSyncHeaderServer": false,
33+
"TraceChainSyncProtocol": false,
34+
"TraceConnectionManager": true,
35+
"TraceDNSResolver": true,
36+
"TraceDNSSubscription": true,
37+
"TraceDiffusionInitialization": true,
38+
"TraceErrorPolicy": true,
39+
"TraceForge": true,
40+
"TraceHandshake": true,
41+
"TraceInboundGovernor": true,
42+
"TraceIpSubscription": true,
43+
"TraceLedgerPeers": true,
44+
"TraceLocalChainSyncProtocol": false,
45+
"TraceLocalConnectionManager": true,
46+
"TraceLocalErrorPolicy": true,
47+
"TraceLocalHandshake": true,
48+
"TraceLocalRootPeers": true,
49+
"TraceLocalTxSubmissionProtocol": false,
50+
"TraceLocalTxSubmissionServer": false,
51+
"TraceMempool": false,
52+
"TraceMux": false,
53+
"TracePeerSelection": true,
54+
"TracePeerSelectionActions": true,
55+
"TracePublicRootPeers": true,
56+
"TraceServer": true,
57+
"TraceTxInbound": false,
58+
"TraceTxOutbound": false,
59+
"TraceTxSubmissionProtocol": false,
60+
"TracingVerbosity": "NormalVerbosity",
61+
"TurnOnLogMetrics": true,
62+
"TurnOnLogging": true,
63+
"UseTraceDispatcher": false,
64+
"defaultBackends": [
65+
"KatipBK"
66+
],
67+
"defaultScribes": [
68+
[
69+
"StdoutSK",
70+
"stdout"
71+
]
72+
],
73+
"hasEKG": 12788,
74+
"hasPrometheus": [
75+
"127.0.0.1",
76+
12798
77+
],
78+
"minSeverity": "Info",
79+
"options": {
80+
"mapBackends": {
81+
"cardano.node.metrics": [
82+
"EKGViewBK"
83+
],
84+
"cardano.node.resources": [
85+
"EKGViewBK"
86+
]
87+
},
88+
"mapSubtrace": {
89+
"cardano.node.metrics": {
90+
"subtrace": "Neutral"
91+
}
92+
}
93+
},
94+
"rotation": {
95+
"rpKeepFilesNum": 10,
96+
"rpLogLimitBytes": 5000000,
97+
"rpMaxAgeHours": 24
98+
},
99+
"setupBackends": [
100+
"KatipBK"
101+
],
102+
"setupScribes": [
103+
{
104+
"scFormat": "ScText",
105+
"scKind": "StdoutSK",
106+
"scName": "stdout",
107+
"scRotation": null
108+
}
109+
]
110+
}

configuration/cardano/mainnet-config-new-tracing.json

Lines changed: 0 additions & 111 deletions
This file was deleted.

configuration/cardano/mainnet-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@
110110
},
111111
"Startup.DiffusionInit": {
112112
"severity": "Info"
113-
}
113+
},
114+
"minSeverity": "Critical"
114115
},
115116
"TurnOnLogMetrics": true,
116117
"TurnOnLogging": true,

configuration/cardano/mainnet-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,10 @@ TraceOptions:
201201
Startup.DiffusionInit:
202202
severity: Info
203203

204+
# Required by the legacy tracing system, this key is still required for
205+
# cardano-node to start.
206+
minSeverity = "Critical";
207+
204208
# Set or unset the mempool capacity override in number of bytes.
205209
#
206210
# This is intended for testing, and for low-resource machines to run with a smaller mempool.

0 commit comments

Comments
 (0)