Skip to content

Commit 031ab71

Browse files
julientinguely-dajulientinguely-da
committed
add apiRequestLogLevel flag
[static] Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
1 parent c3d4efa commit 031ab71

File tree

10 files changed

+70
-19
lines changed

10 files changed

+70
-19
lines changed

‎build-tools/cncluster‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2288,7 +2288,7 @@ function subcmd_psql() {
22882288

22892289
# shellcheck disable=SC2086
22902290
set -- $DB_CREATE_STATEMENT
2291-
if [ "${1,,}" == "create" ] && [ "${2,,}" == "database" ] && [ -n "$3" ]; then
2291+
if [ "${1,,}" == "create" ] && [ "${2,,}" == "dbname" ] && [ -n "$3" ]; then
22922292
DB_NAME="$3"
22932293
else
22942294
_error "Failed to retrieve DB name from pod description."

‎cluster/deployment/scratchnetb/config.resolved.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ svs:
125125
requests:
126126
memory: '2Gi'
127127
logging:
128+
apiRequestLogLevel: 'DEBUG'
128129
appsAsync: false
129130
appsLogLevel: 'DEBUG'
130131
cantonAsync: false

‎cluster/deployment/scratchnetb/config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ validator1:
1616
deduplicationDuration: 30m
1717
svs:
1818
default:
19+
logging:
20+
apiRequestLogLevel: DEBUG
1921
pruning:
2022
cometbft:
2123
retainBlocks: 2000 # corresponds to a retention period of ~2 hours

‎cluster/helm/splice-global-domain/tests/sequencer_test.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ tests:
110110
# Set log levels for testing
111111
logLevel: DEBUG
112112
logLevelStdout: ERROR
113+
logLevelApiRequest: DEBUG
113114
documentSelector:
114115
path: kind
115116
value: Deployment
@@ -124,6 +125,11 @@ tests:
124125
content:
125126
name: LOG_LEVEL_STDOUT
126127
value: ERROR
128+
- contains:
129+
path: spec.template.spec.containers[0].env
130+
content:
131+
name: LOG_LEVEL_API_REQUEST
132+
value: DEBUG
127133
- it: "sets anti affinity by default"
128134
documentSelector:
129135
path: kind

‎cluster/helm/splice-util-lib/templates/_helpers.tpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ spec:
203203
value: {{ .logLevel | default "INFO" }}
204204
- name: LOG_LEVEL_STDOUT
205205
value: {{ .logLevelStdout | default "DEBUG" }}
206+
- name: LOG_LEVEL_API_REQUEST
207+
value: {{ .logLevelApiRequest| default "INFO" }}
206208
- name: LOG_IMMEDIATE_FLUSH
207209
value: {{ .logAsyncFlush | default false | not | quote }}
208210
{{- end }}

‎cluster/pulumi/common-sv/src/singleSvConfig.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ const SingleSvConfigSchema = z
149149
appsAsync: z.boolean().default(false),
150150
cantonLogLevel: LogLevelSchema,
151151
cantonStdoutLogLevel: LogLevelSchema.optional(),
152+
apiRequestLogLevel: LogLevelSchema.optional(),
152153
cantonAsync: z.boolean().default(false),
153154
cometbftLogLevel: CometbftLogLevelSchema.optional(),
154155
cometbftExtraLogLevelFlags: z.string().optional(),

‎cluster/pulumi/sv-canton/src/decentralizedSynchronizerNode.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ abstract class InStackDecentralizedSynchronizerNode
7070
version: CnChartVersion,
7171
logLevel?: LogLevel,
7272
logLevelStdout?: LogLevel,
73+
logLevelApiRequest?: LogLevel,
7374
logAsyncFlush?: boolean,
7475
imagePullServiceAccountName?: string,
7576
opts?: SpliceCustomResourceOptions
@@ -95,6 +96,7 @@ abstract class InStackDecentralizedSynchronizerNode
9596
...{
9697
logLevel: logLevel,
9798
logLevelStdout: logLevelStdout,
99+
logLevelApiRequest: logLevelApiRequest,
98100
logAsyncFlush: logAsyncFlush,
99101
sequencer: {
100102
...decentralizedSynchronizerValues.sequencer,
@@ -231,6 +233,7 @@ export class InStackCometBftDecentralizedSynchronizerNode
231233
version,
232234
svConfig.logging?.cantonLogLevel,
233235
svConfig.logging?.cantonStdoutLogLevel,
236+
svConfig.logging?.apiRequestLogLevel,
234237
svConfig.logging?.cantonAsync,
235238
imagePullServiceAccountName,
236239
opts
@@ -265,6 +268,7 @@ export class InStackCantonBftDecentralizedSynchronizerNode extends InStackDecent
265268
version,
266269
svConfig.logging?.cantonLogLevel,
267270
svConfig.logging?.cantonStdoutLogLevel,
271+
svConfig.logging?.apiRequestLogLevel,
268272
svConfig.logging?.cantonAsync,
269273
imagePullServiceAccountName,
270274
opts

‎cluster/pulumi/sv-canton/src/participant.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export function installSvParticipant(
7575
),
7676
logLevel: svConfig.logging?.cantonLogLevel,
7777
logLevelStdout: svConfig.logging?.cantonStdoutLogLevel,
78+
logLevelApiRequest: svConfig.logging?.apiRequestLogLevel,
7879
logAsyncFlush: svConfig.logging?.cantonAsync,
7980
participantAdminUserNameFrom,
8081
metrics: {

‎party-allocator/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/canton-logback.xml‎

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@
3131
<Name>hacoordinator_message</Name>
3232
<regex>(Check successful|Scheduled checking|Acquiring lock)</regex>
3333
</matcher>
34-
<matcher>
35-
<Name>requestlogger_logger</Name>
36-
<regex>ApiRequestLogger</regex>
37-
</matcher>
38-
<matcher>
39-
<Name>requestlogger_message</Name>
40-
<regex>StateService/GetConnectedDomains</regex>
41-
</matcher>
4234
<expression>
4335
level &lt;= INFO &amp;&amp;
4436
( hacoordinator_logger.matches(logger) &amp;&amp; hacoordinator_message.matches(message) ||
@@ -49,6 +41,28 @@
4941
<OnMismatch>NEUTRAL</OnMismatch>
5042
<OnMatch>DENY</OnMatch>
5143
</filter>
44+
<if condition='!isDefined("LOG_LEVEL_API_REQUEST")'>
45+
<then>
46+
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
47+
<evaluator>
48+
<matcher>
49+
<Name>requestlogger_logger</Name>
50+
<regex>ApiRequestLogger</regex>
51+
</matcher>
52+
<matcher>
53+
<Name>requestlogger_message</Name>
54+
<regex>StateService/GetConnectedDomains</regex>
55+
</matcher>
56+
<expression>
57+
level &lt;= INFO &amp;&amp;
58+
requestlogger_logger.matches(logger) &amp;&amp; requestlogger_message.matches(message)
59+
</expression>
60+
</evaluator>
61+
<OnMismatch>NEUTRAL</OnMismatch>
62+
<OnMatch>DENY</OnMatch>
63+
</filter>
64+
</then>
65+
</if>
5266
</appender>
5367
</then>
5468
<else>
@@ -133,14 +147,6 @@
133147
<Name>hacoordinator_message</Name>
134148
<regex>(Check successful|Scheduled checking|Acquiring lock)</regex>
135149
</matcher>
136-
<matcher>
137-
<Name>requestlogger_logger</Name>
138-
<regex>ApiRequestLogger</regex>
139-
</matcher>
140-
<matcher>
141-
<Name>requestlogger_message</Name>
142-
<regex>StateService/GetConnectedDomains</regex>
143-
</matcher>
144150
<expression>
145151
level &lt;= INFO &amp;&amp;
146152
( hacoordinator_logger.matches(logger) &amp;&amp; hacoordinator_message.matches(message) ||
@@ -151,6 +157,28 @@
151157
<OnMismatch>NEUTRAL</OnMismatch>
152158
<OnMatch>DENY</OnMatch>
153159
</filter>
160+
<if condition='!isDefined("LOG_LEVEL_API_REQUEST")'>
161+
<then>
162+
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
163+
<evaluator>
164+
<matcher>
165+
<Name>requestlogger_logger</Name>
166+
<regex>ApiRequestLogger</regex>
167+
</matcher>
168+
<matcher>
169+
<Name>requestlogger_message</Name>
170+
<regex>StateService/GetConnectedDomains</regex>
171+
</matcher>
172+
<expression>
173+
level &lt;= INFO &amp;&amp;
174+
requestlogger_logger.matches(logger) &amp;&amp; requestlogger_message.matches(message)
175+
</expression>
176+
</evaluator>
177+
<OnMismatch>NEUTRAL</OnMismatch>
178+
<OnMatch>DENY</OnMatch>
179+
</filter>
180+
</then>
181+
</if>
154182
<!-- Allow for disabling flush on each log-line (faster, but may miss logs when crashing) -->
155183
<immediateFlush>${LOG_IMMEDIATE_FLUSH:-true}</immediateFlush>
156184
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -247,6 +275,12 @@
247275
</then>
248276
</if>
249277

278+
<if condition='isDefined("LOG_LEVEL_API_REQUEST")'>
279+
<then>
280+
<logger name="ApiRequestLogger" level="${LOG_LEVEL_API_REQUEST:-DEBUG}"/>
281+
</then>
282+
</if>
283+
250284
<root level="${LOG_LEVEL_ROOT:-INFO}"></root>
251285
<if condition='isDefined("LOG_LAST_ERRORS")'>
252286
<then>

0 commit comments

Comments
 (0)