Skip to content

Commit b130f0d

Browse files
jandro996jandro996
committed
fix: update WafMetricPeriodicActionSpecification for 8-arg wafRequest
Add missing requestExcluded (false) 8th argument to all wafRequest calls and add request_excluded:none to all expected tag lists. Found by Codex review of PR #11744.
1 parent 8aadb97 commit b130f0d

1 file changed

Lines changed: 34 additions & 18 deletions

File tree

‎telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
4343
void 'push waf request metrics and push into the telemetry'() {
4444
when:
4545
WafMetricCollector.get().wafInit('0.0.0', 'rules_ver_1', true)
46-
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false)
47-
WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false)
48-
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false)
49-
WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false)
50-
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false)
51-
WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false)
52-
WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false)
53-
WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false)
54-
WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false)
55-
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true)
46+
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false)
47+
WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false)
48+
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false)
49+
WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false)
50+
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false)
51+
WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false)
52+
WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false)
53+
WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false)
54+
WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false)
55+
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false)
5656
WafMetricCollector.get().prepareMetrics()
5757
periodicAction.doIteration(telemetryService)
5858

@@ -75,6 +75,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
7575
'block_failure:false',
7676
'rate_limited:false',
7777
'input_truncated:false',
78+
'request_excluded:none',
7879
]
7980
} )
8081
1 * telemetryService.addMetric( { Metric metric ->
@@ -91,6 +92,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
9192
'block_failure:false',
9293
'rate_limited:false',
9394
'input_truncated:false',
95+
'request_excluded:none',
9496
]
9597
} )
9698
1 * telemetryService.addMetric( { Metric metric ->
@@ -107,6 +109,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
107109
'block_failure:false',
108110
'rate_limited:false',
109111
'input_truncated:false',
112+
'request_excluded:none',
110113
]
111114
} )
112115
1 * telemetryService.addMetric( { Metric metric ->
@@ -123,6 +126,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
123126
'block_failure:false',
124127
'rate_limited:false',
125128
'input_truncated:false',
129+
'request_excluded:none',
126130
]
127131
} )
128132
1 * telemetryService.addMetric( { Metric metric ->
@@ -139,6 +143,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
139143
'block_failure:false',
140144
'rate_limited:false',
141145
'input_truncated:false',
146+
'request_excluded:none',
142147
]
143148
} )
144149
1 * telemetryService.addMetric( { Metric metric ->
@@ -155,6 +160,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
155160
'block_failure:true',
156161
'rate_limited:false',
157162
'input_truncated:false',
163+
'request_excluded:none',
158164
]
159165
} )
160166
1 * telemetryService.addMetric( { Metric metric ->
@@ -171,6 +177,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
171177
'block_failure:false',
172178
'rate_limited:true',
173179
'input_truncated:false',
180+
'request_excluded:none',
174181
]
175182
} )
176183
1 * telemetryService.addMetric( { Metric metric ->
@@ -187,20 +194,21 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
187194
'block_failure:false',
188195
'rate_limited:false',
189196
'input_truncated:true',
197+
'request_excluded:none',
190198
]
191199
} )
192200
0 * _._
193201

194202
when: 'waf.updates happens'
195203
WafMetricCollector.get().wafUpdates('rules_ver_2', true)
196-
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false)
197-
WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false)
198-
WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false)
199-
WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false)
200-
WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false)
201-
WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false)
202-
WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false)
203-
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true)
204+
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, false, false)
205+
WafMetricCollector.get().wafRequest(true, false, false, false, false, false, false, false)
206+
WafMetricCollector.get().wafRequest(false, true, false, false, false, false, false, false)
207+
WafMetricCollector.get().wafRequest(false, false, false, true, false, false, false, false)
208+
WafMetricCollector.get().wafRequest(false, false, true, false, false, false, false, false)
209+
WafMetricCollector.get().wafRequest(false, false, false, false, false, true, false, false)
210+
WafMetricCollector.get().wafRequest(false, false, false, false, true, false, false, false)
211+
WafMetricCollector.get().wafRequest(false, false, false, false, false, false, true, false)
204212
WafMetricCollector.get().prepareMetrics()
205213
periodicAction.doIteration(telemetryService)
206214

@@ -223,6 +231,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
223231
'block_failure:false',
224232
'rate_limited:false',
225233
'input_truncated:false',
234+
'request_excluded:none',
226235
]
227236
} )
228237
1 * telemetryService.addMetric( { Metric metric ->
@@ -239,6 +248,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
239248
'block_failure:false',
240249
'rate_limited:false',
241250
'input_truncated:false',
251+
'request_excluded:none',
242252
]
243253
} )
244254
1 * telemetryService.addMetric( { Metric metric ->
@@ -255,6 +265,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
255265
'block_failure:false',
256266
'rate_limited:false',
257267
'input_truncated:false',
268+
'request_excluded:none',
258269
]
259270
} )
260271
1 * telemetryService.addMetric( { Metric metric ->
@@ -271,6 +282,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
271282
'block_failure:false',
272283
'rate_limited:false',
273284
'input_truncated:false',
285+
'request_excluded:none',
274286
]
275287
} )
276288
1 * telemetryService.addMetric( { Metric metric ->
@@ -287,6 +299,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
287299
'block_failure:false',
288300
'rate_limited:false',
289301
'input_truncated:false',
302+
'request_excluded:none',
290303
]
291304
} )
292305
1 * telemetryService.addMetric( { Metric metric ->
@@ -303,6 +316,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
303316
'block_failure:true',
304317
'rate_limited:false',
305318
'input_truncated:false',
319+
'request_excluded:none',
306320
]
307321
} )
308322
1 * telemetryService.addMetric( { Metric metric ->
@@ -319,6 +333,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
319333
'block_failure:false',
320334
'rate_limited:true',
321335
'input_truncated:false',
336+
'request_excluded:none',
322337
]
323338
} )
324339
1 * telemetryService.addMetric( { Metric metric ->
@@ -335,6 +350,7 @@ class WafMetricPeriodicActionSpecification extends DDSpecification {
335350
'block_failure:false',
336351
'rate_limited:false',
337352
'input_truncated:true',
353+
'request_excluded:none',
338354
]
339355
} )
340356
0 * _._

0 commit comments

Comments
 (0)