Commit 63843a2
committed
SWIP-12 fix: split multi-doc log-mal-rule into per-platform files
CI caught: MALFilterExecutionTest failed with 'expected a single document
in the stream' on log-mal-rules/miniprogram.yaml at the '---' separator.
Rules.loadRules() uses Yaml.loadAs(r, Rule.class) — single-document only.
Multi-doc YAML would also fail at OAP startup, not just in tests.
Split into two single-doc files:
- log-mal-rules/miniprogram-wechat.yaml
- log-mal-rules/miniprogram-alipay.yaml
Update application.yml malFiles default, storage e2e config-dump
expected, and both miniprogram e2e docker-compose SW_LOG_MAL_FILES
env values.
MALFilterExecutionTest + MALExpressionExecutionTest + LALScriptExecutionTest
all green locally (1302 MAL, 134 LAL).1 parent 8ad2b51 commit 63843a2
6 files changed
Lines changed: 32 additions & 15 deletions
File tree
- oap-server/server-starter/src/main/resources
- log-mal-rules
- test/e2e-v2/cases
- miniprogram
- alipay
- wechat
- storage/expected
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
238 | 238 | | |
239 | 239 | | |
240 | 240 | | |
241 | | - | |
| 241 | + | |
242 | 242 | | |
243 | 243 | | |
244 | 244 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
| 18 | + | |
| 19 | + | |
22 | 20 | | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | 21 | | |
30 | 22 | | |
31 | 23 | | |
| |||
Lines changed: 25 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
146 | | - | |
| 146 | + | |
147 | 147 | | |
148 | 148 | | |
149 | 149 | | |
| |||
0 commit comments