Commit 0e46059
authored
MAL: add extension function SPI, proper numeric types in codegen (#13761)
**1. Extension Function SPI (`namespace::method()` syntax)**
Adds a pluggable extension mechanism for MAL using `::` separator syntax, enabling external modules
to contribute MAL functions that compile into direct static method calls.
- `MalFunctionExtension` SPI interface with `name()` returning namespace
- `@MALContextFunction` annotation on **static** methods — auto-detected via reflection at startup
- First parameter must be `SampleFamily` (auto-bound), return type must be `SampleFamily`
- Non-static annotated methods throw `IllegalArgumentException` at startup
- Duplicate namespace or method names throw `IllegalArgumentException` at startup
- `m.getDeclaringClass()` used for accurate FQCN in codegen (not `ext.getClass()`)
- `List` parameters validated as `List<String>` via generic type inspection
- Supports `String`, `double`, `float`, `long`, `int`, `List<String>` parameter types
- Direct static method call codegen — no reflection or registry dispatch at runtime
Example MAL script:
```
metric.sum(['svc']).test::scale(3.0)
```
Generated code:
```java
sf = TestMalExtension.scale(sf, 3.0);
```
**2. Proper numeric types in MAL codegen**
Integer-valued literals now emit `Long.valueOf(NL)` instead of `Double.valueOf(N.0)` in:
- Binary arithmetic: `metric * 100` → `sf.multiply(Long.valueOf(100L))`
- Built-in method args: `.multiply(100)` → `Long.valueOf(100L)`
- Standalone number expressions: `SampleFamily.EMPTY.plus(Long.valueOf(100L))`
Fractional values still use `Double.valueOf()`. All 1268 v1-v2 comparison tests pass.
**3. GenAI model matcher singleton**
`GenAIModelMatcher.getInstance()` — lazy singleton initialized from `gen-ai-config.yml`.
`GenAIProviderPrefixMatcher.build()` simplified to delegate to singleton (removed unused config param).1 parent f7f2e97 commit 0e46059
18 files changed
Lines changed: 790 additions & 73 deletions
File tree
- docs/en/concepts-and-designs
- oap-server
- analyzer
- gen-ai-analyzer/src
- main/java/org/apache/skywalking/oap/analyzer/genai
- matcher
- test/java/org/apache/skywalking/oap/genai/analyzer
- meter-analyzer
- src
- main
- antlr4/org/apache/skywalking/mal/rt/grammar
- java/org/apache/skywalking/oap/meter/analyzer/v2
- compiler
- rt
- spi
- test
- java/org/apache/skywalking/oap/meter/analyzer/v2/compiler
- resources/META-INF/services
- server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/genai
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
239 | 278 | | |
240 | 279 | | |
241 | 280 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
| 69 | + | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| |||
Lines changed: 8 additions & 35 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
27 | 25 | | |
28 | | - | |
29 | | - | |
| 26 | + | |
| 27 | + | |
30 | 28 | | |
31 | 29 | | |
32 | 30 | | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
| 31 | + | |
37 | 32 | | |
38 | 33 | | |
39 | | - | |
40 | | - | |
41 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
42 | 38 | | |
43 | 39 | | |
44 | 40 | | |
45 | | - | |
| 41 | + | |
46 | 42 | | |
47 | 43 | | |
48 | 44 | | |
49 | 45 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | 46 | | |
74 | 47 | | |
75 | 48 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
233 | 233 | | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
| 236 | + | |
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
44 | 49 | | |
45 | 50 | | |
46 | | - | |
47 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
48 | 54 | | |
49 | 55 | | |
50 | 56 | | |
| |||
59 | 65 | | |
60 | 66 | | |
61 | 67 | | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
62 | 71 | | |
63 | 72 | | |
64 | 73 | | |
65 | 74 | | |
66 | 75 | | |
67 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
68 | 155 | | |
69 | 156 | | |
70 | 157 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
| 80 | + | |
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
| |||
0 commit comments