kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow calling `lang.groovy.GString` in DSL (#13073)

This commit is contained in:
kezhenxu94 2025-02-28 18:33:57 +08:00 committed by GitHub
parent 2e9c9b45dd
commit dd10e524e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en/changes/changes.md
View File

@ -75,6 +75,7 @@
* Add a fail-safe mechanism to prevent traffic metrics inconsistent between in-memory and database server.
* Add more clear logs when oap-cluster-internal data(metrics/traffic) format is inconsistent.
* Optimize metrics cache loading when trace latency greater than cache timeout.
* Allow calling `lang.groovy.GString` in DSL.
#### UI

3
oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/DSL.java
View File

@ -19,6 +19,8 @@
package org.apache.skywalking.oap.log.analyzer.dsl;
import com.google.common.collect.ImmutableList;
import groovy.lang.GString;
import groovy.lang.GroovyShell;
import groovy.transform.CompileStatic;
import groovy.util.DelegatingScript;
@ -78,6 +80,7 @@ public class DSL {
.add(Map.class)
.add(List.class)
.add(Array.class)
.add(GString.class)
.add(String.class)
.add(ProcessRegistry.class)
.build());

3
oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java
View File

@ -20,6 +20,7 @@ package org.apache.skywalking.oap.meter.analyzer.dsl;
import com.google.common.collect.ImmutableList;
import groovy.lang.Binding;
import groovy.lang.GString;
import groovy.lang.GroovyShell;
import groovy.util.DelegatingScript;
import java.lang.reflect.Array;
@ -78,6 +79,8 @@ public final class DSL {
.add(DetectPoint.class)
.add(Layer.class)
.add(ProcessRegistry.class)
.add(GString.class)
.add(String.class)
.build());
cc.addCompilationCustomizers(secureASTCustomizer);

2
oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionParsingTest.java
View File

@ -37,7 +37,7 @@ public class ExpressionParsingTest {
return Arrays.asList(new Object[][] {
{
"all",
"(foo - 1).tagEqual('bar', '1').sum(['tt']).irate().histogram().histogram_percentile([50,99]).service(['rr'], Layer.GENERAL).downsampling(LATEST)",
"(foo - 1).tag({ tags -> tags.new_name = \"${tags['tag1']}|${tags['tag2']}\".toString() }).tagEqual('bar', '1').sum(['tt']).irate().histogram().histogram_percentile([50,99]).service(['rr'], Layer.GENERAL).downsampling(LATEST)",
ExpressionParsingContext.builder()
.samples(Collections.singletonList("foo"))
.scopeType(ScopeType.SERVICE)