You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2026/03/03 12:56:02 UTC
(skywalking) 17/27: Move all v2 DSL classes to .v2. packages for MAL/LAL/Hierarchy
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch groovy-replace
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 5972cdb547c5c1c62955c566add91c5b2ea76e40
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Mar 2 07:52:41 2026 +0800
Move all v2 DSL classes to .v2. packages for MAL/LAL/Hierarchy
Give v2 (ANTLR4+Javassist) classes distinct FQCNs from v1 (Groovy)
so both can coexist on the classpath without source duplication in
v1-with-groovy test modules.
Package mapping:
- MAL: meter.analyzer.* → meter.analyzer.v2.*
- LAL: log.analyzer.* → log.analyzer.v2.*
- Hierarchy: config.compiler.* → config.v2.compiler.*
Also: remove v2-only files (MalExpression, MalFilter, LalExpression)
from v1-with-groovy modules, add mal-v1-with-groovy dependency to
lal-v1-with-groovy, fix cross-version enum comparison by name.
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
.../provider/meter/config/MeterConfig.java | 2 +-
.../meter/process/MeterProcessService.java | 2 +-
.../provider/meter/process/MeterProcessor.java | 6 +-
.../provider/meter/process/SampleBuilder.java | 2 +-
.../compiler/CompiledHierarchyRuleProvider.java | 2 +-
.../compiler/HierarchyRuleClassGenerator.java | 6 +-
.../{ => v2}/compiler/HierarchyRuleModel.java | 2 +-
.../compiler/HierarchyRuleScriptParser.java | 2 +-
.../rule/rt/HierarchyRulePackageHolder.java | 2 +-
...ierarchyDefinitionService$HierarchyRuleProvider | 2 +-
.../compiler/HierarchyRuleClassGeneratorTest.java | 2 +-
.../compiler/HierarchyRuleScriptParserTest.java | 2 +-
oap-server/analyzer/log-analyzer/CLAUDE.md | 14 +-
.../{ => v2}/compiler/LALClassGenerator.java | 36 +--
.../analyzer/{ => v2}/compiler/LALScriptModel.java | 2 +-
.../{ => v2}/compiler/LALScriptParser.java | 74 +++---
.../{ => v2}/compiler/rt/BindingAware.java | 4 +-
.../compiler/rt/LalExpressionPackageHolder.java | 2 +-
.../oap/log/analyzer/{ => v2}/dsl/Binding.java | 4 +-
.../oap/log/analyzer/{ => v2}/dsl/DSL.java | 8 +-
.../log/analyzer/{ => v2}/dsl/LalExpression.java | 4 +-
.../analyzer/{ => v2}/dsl/spec/AbstractSpec.java | 6 +-
.../{ => v2}/dsl/spec/extractor/ExtractorSpec.java | 22 +-
.../extractor/sampledtrace/SampledTraceSpec.java | 6 +-
.../dsl/spec/extractor/slowsql/SlowSqlSpec.java | 6 +-
.../{ => v2}/dsl/spec/filter/FilterSpec.java | 24 +-
.../dsl/spec/parser/AbstractParserSpec.java | 6 +-
.../{ => v2}/dsl/spec/parser/JsonParserSpec.java | 4 +-
.../{ => v2}/dsl/spec/parser/TextParserSpec.java | 4 +-
.../{ => v2}/dsl/spec/parser/YamlParserSpec.java | 4 +-
.../{ => v2}/dsl/spec/sink/SamplerSpec.java | 10 +-
.../analyzer/{ => v2}/dsl/spec/sink/SinkSpec.java | 6 +-
.../dsl/spec/sink/sampler/PossibilitySampler.java | 2 +-
.../dsl/spec/sink/sampler/RateLimitingSampler.java | 2 +-
.../{ => v2}/dsl/spec/sink/sampler/Sampler.java | 2 +-
.../{ => v2}/module/LogAnalyzerModule.java | 4 +-
.../log/analyzer/{ => v2}/provider/LALConfig.java | 2 +-
.../log/analyzer/{ => v2}/provider/LALConfigs.java | 2 +-
.../{ => v2}/provider/LogAnalyzerModuleConfig.java | 6 +-
.../provider/LogAnalyzerModuleProvider.java | 12 +-
.../provider/log/ILogAnalysisListenerManager.java | 6 +-
.../{ => v2}/provider/log/ILogAnalyzerService.java | 2 +-
.../{ => v2}/provider/log/LogAnalyzer.java | 6 +-
.../provider/log/LogAnalyzerServiceImpl.java | 8 +-
.../provider/log/analyzer/LogAnalyzerFactory.java | 2 +-
.../provider/log/listener/LogAnalysisListener.java | 2 +-
.../log/listener/LogAnalysisListenerFactory.java | 2 +-
.../provider/log/listener/LogFilterListener.java | 12 +-
.../provider/log/listener/LogSinkListener.java | 2 +-
.../log/listener/LogSinkListenerFactory.java | 2 +-
.../provider/log/listener/RecordSinkListener.java | 4 +-
.../provider/log/listener/TrafficSinkListener.java | 4 +-
...ywalking.oap.server.library.module.ModuleDefine | 2 +-
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../{ => v2}/compiler/LALClassGeneratorTest.java | 4 +-
.../compiler/LALExpressionExecutionTest.java | 14 +-
.../{ => v2}/compiler/LALScriptParserTest.java | 2 +-
.../oap/log/analyzer/{ => v2}/dsl/DSLV2Test.java | 4 +-
oap-server/analyzer/meter-analyzer/CLAUDE.md | 16 +-
.../oap/meter/analyzer/dsl/MalExpression.java | 34 ---
.../oap/meter/analyzer/{ => v2}/Analyzer.java | 18 +-
.../oap/meter/analyzer/{ => v2}/MetricConvert.java | 12 +-
.../meter/analyzer/{ => v2}/MetricRuleConfig.java | 2 +-
.../{ => v2}/compiler/MALClassGenerator.java | 42 ++--
.../{ => v2}/compiler/MALExpressionModel.java | 2 +-
.../{ => v2}/compiler/MALScriptParser.java | 80 +++---
.../compiler/rt/MalExpressionPackageHolder.java | 2 +-
.../{ => v2}/compiler/rt/MalRuntimeHelper.java | 8 +-
.../oap/meter/analyzer/{ => v2}/dsl/DSL.java | 4 +-
.../analyzer/{ => v2}/dsl/DownsamplingType.java | 2 +-
.../EndpointEntityDescription.java | 2 +-
.../dsl/EntityDescription/EntityDescription.java | 2 +-
.../InstanceEntityDescription.java | 2 +-
.../ProcessEntityDescription.java | 2 +-
.../ProcessRelationEntityDescription.java | 2 +-
.../ServiceEntityDescription.java | 2 +-
.../ServiceRelationEntityDescription.java | 2 +-
.../meter/analyzer/{ => v2}/dsl/Expression.java | 2 +-
.../analyzer/{ => v2}/dsl/ExpressionMetadata.java | 2 +-
.../{ => v2}/dsl/ExpressionParsingException.java | 2 +-
.../analyzer/{ => v2}/dsl/FilterExpression.java | 4 +-
.../oap/meter/analyzer/v2}/dsl/MalExpression.java | 2 +-
.../oap/meter/analyzer/{ => v2}/dsl/MalFilter.java | 2 +-
.../oap/meter/analyzer/{ => v2}/dsl/Result.java | 2 +-
.../oap/meter/analyzer/{ => v2}/dsl/Sample.java | 4 +-
.../meter/analyzer/{ => v2}/dsl/SampleFamily.java | 28 +--
.../analyzer/{ => v2}/dsl/SampleFamilyBuilder.java | 2 +-
.../{ => v2}/dsl/SampleFamilyFunctions.java | 2 +-
.../{ => v2}/dsl/counter/CounterWindow.java | 2 +-
.../meter/analyzer/{ => v2}/dsl/counter/ID.java | 2 +-
.../{ => v2}/dsl/registry/ProcessRegistry.java | 4 +-
.../analyzer/{ => v2}/dsl/tagOpt/K8sRetagType.java | 6 +-
.../meter/analyzer/{ => v2}/dsl/tagOpt/Retag.java | 4 +-
.../analyzer/{ => v2}/k8s/K8sInfoRegistry.java | 2 +-
.../prometheus/PrometheusMetricConverter.java | 10 +-
.../{ => v2}/prometheus/rule/MetricsRule.java | 4 +-
.../analyzer/{ => v2}/prometheus/rule/Rule.java | 4 +-
.../analyzer/{ => v2}/prometheus/rule/Rules.java | 2 +-
.../{ => v2}/compiler/MALClassGeneratorTest.java | 4 +-
.../{ => v2}/compiler/MALScriptParserTest.java | 24 +-
.../oap/meter/analyzer/{ => v2}/dsl/DSLV2Test.java | 2 +-
.../agent/kafka/provider/KafkaFetcherProvider.java | 2 +-
.../agent/kafka/provider/handler/LogHandler.java | 4 +-
.../kafka/provider/handler/LogHandlerTest.java | 4 +-
.../oap/query/graphql/resolver/LogTestQuery.java | 10 +-
.../query/graphql/resolver/LogTestQueryTest.java | 4 +-
.../receiver/envoy/EnvoyMetricReceiverConfig.java | 4 +-
.../receiver/envoy/MetricServiceGRPCHandler.java | 6 +-
.../envoy/persistence/LogsPersistence.java | 4 +-
.../envoy/persistence/TCPLogsPersistence.java | 4 +-
.../otel/otlp/OpenTelemetryLogHandler.java | 4 +-
.../otlp/OpenTelemetryMetricRequestProcessor.java | 10 +-
.../provider/handler/AccessLogServiceHandler.java | 2 +-
.../receiver/log/provider/LogModuleProvider.java | 2 +-
.../handler/grpc/LogReportServiceGrpcHandler.java | 4 +-
.../handler/rest/LogReportServiceHTTPHandler.java | 4 +-
.../provider/TelegrafReceiverProvider.java | 4 +-
.../provider/handler/TelegrafServiceHandler.java | 10 +-
.../receiver/telegraf/TelegrafMetricsTest.java | 8 +-
.../receiver/zabbix/provider/ZabbixMetrics.java | 8 +-
.../zabbix/provider/config/ZabbixConfig.java | 2 +-
.../core/config/HierarchyRuleComparisonTest.java | 2 +-
.../lal-v1-with-groovy/pom.xml | 5 +
.../oap/log/analyzer/dsl/LalExpression.java | 30 ---
.../oap/server/checker/lal/LalComparisonTest.java | 51 ++--
.../oap/server/checker/mal/MalComparisonTest.java | 268 +++++++++++++--------
.../checker/mal/MalFilterComparisonTest.java | 4 +-
.../oap/meter/analyzer/dsl/MalFilter.java | 30 ---
128 files changed, 612 insertions(+), 626 deletions(-)
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/config/MeterConfig.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/config/MeterConfig.java
index 4bc3bec8c7..9e5c8641ca 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/config/MeterConfig.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/config/MeterConfig.java
@@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.analyzer.provider.meter.config;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.skywalking.oap.meter.analyzer.MetricRuleConfig;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricRuleConfig;
import java.util.List;
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessService.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessService.java
index e3f30c9680..94d0909e5b 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessService.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessService.java
@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.server.analyzer.provider.meter.process;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
import org.apache.skywalking.oap.server.analyzer.provider.meter.config.MeterConfig;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessor.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessor.java
index ea0900863a..4635c5084e 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessor.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterProcessor.java
@@ -27,9 +27,9 @@ import org.apache.skywalking.apm.network.language.agent.v3.MeterData;
import org.apache.skywalking.apm.network.language.agent.v3.MeterHistogram;
import org.apache.skywalking.apm.network.language.agent.v3.MeterSingleValue;
import org.apache.skywalking.oap.server.library.util.StringUtil;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import java.util.ArrayList;
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/SampleBuilder.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/SampleBuilder.java
index ed656e24f3..e7afa79b0a 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/SampleBuilder.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/SampleBuilder.java
@@ -20,7 +20,7 @@ package org.apache.skywalking.oap.server.analyzer.provider.meter.process;
import com.google.common.collect.ImmutableMap;
import lombok.Builder;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
/**
* Help to build Sample with agent side meter.
diff --git a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/CompiledHierarchyRuleProvider.java b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/CompiledHierarchyRuleProvider.java
similarity index 97%
rename from oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/CompiledHierarchyRuleProvider.java
rename to oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/CompiledHierarchyRuleProvider.java
index 00c9b58975..d4d3d40cc8 100644
--- a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/CompiledHierarchyRuleProvider.java
+++ b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/CompiledHierarchyRuleProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.server.core.config.compiler;
+package org.apache.skywalking.oap.server.core.config.v2.compiler;
import java.util.HashMap;
import java.util.Map;
diff --git a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleClassGenerator.java b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleClassGenerator.java
similarity index 98%
rename from oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleClassGenerator.java
rename to oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleClassGenerator.java
index e6a460feb4..faefe698b5 100644
--- a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleClassGenerator.java
+++ b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleClassGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.server.core.config.compiler;
+package org.apache.skywalking.oap.server.core.config.v2.compiler;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -25,7 +25,7 @@ import javassist.CtClass;
import javassist.CtNewConstructor;
import javassist.CtNewMethod;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.server.core.config.compiler.hierarchy.rule.rt.HierarchyRulePackageHolder;
+import org.apache.skywalking.oap.server.core.config.v2.compiler.hierarchy.rule.rt.HierarchyRulePackageHolder;
import org.apache.skywalking.oap.server.core.query.type.Service;
/**
@@ -38,7 +38,7 @@ public final class HierarchyRuleClassGenerator {
private static final AtomicInteger CLASS_COUNTER = new AtomicInteger(0);
private static final String PACKAGE_PREFIX =
- "org.apache.skywalking.oap.server.core.config.compiler.hierarchy.rule.rt.";
+ "org.apache.skywalking.oap.server.core.config.v2.compiler.hierarchy.rule.rt.";
private final ClassPool classPool;
diff --git a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleModel.java b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleModel.java
similarity index 99%
rename from oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleModel.java
rename to oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleModel.java
index d9ecc4d707..fa3cc2dec6 100644
--- a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleModel.java
+++ b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.server.core.config.compiler;
+package org.apache.skywalking.oap.server.core.config.v2.compiler;
import java.util.Collections;
import java.util.List;
diff --git a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleScriptParser.java b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleScriptParser.java
similarity index 99%
rename from oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleScriptParser.java
rename to oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleScriptParser.java
index 84dd3db2e2..e6e897fe8d 100644
--- a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleScriptParser.java
+++ b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleScriptParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.server.core.config.compiler;
+package org.apache.skywalking.oap.server.core.config.v2.compiler;
import java.util.ArrayList;
import java.util.List;
diff --git a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/hierarchy/rule/rt/HierarchyRulePackageHolder.java b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/hierarchy/rule/rt/HierarchyRulePackageHolder.java
similarity index 92%
rename from oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/hierarchy/rule/rt/HierarchyRulePackageHolder.java
rename to oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/hierarchy/rule/rt/HierarchyRulePackageHolder.java
index 367c1c541e..6ad8dd96b8 100644
--- a/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/compiler/hierarchy/rule/rt/HierarchyRulePackageHolder.java
+++ b/oap-server/analyzer/hierarchy/src/main/java/org/apache/skywalking/oap/server/core/config/v2/compiler/hierarchy/rule/rt/HierarchyRulePackageHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.server.core.config.compiler.hierarchy.rule.rt;
+package org.apache.skywalking.oap.server.core.config.v2.compiler.hierarchy.rule.rt;
/**
* Empty marker class used as the class loading anchor for Javassist
diff --git a/oap-server/analyzer/hierarchy/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.core.config.HierarchyDefinitionService$HierarchyRuleProvider b/oap-server/analyzer/hierarchy/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.core.config.HierarchyDefinitionService$HierarchyRuleProvider
index 734565b725..31aeb0dada 100644
--- a/oap-server/analyzer/hierarchy/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.core.config.HierarchyDefinitionService$HierarchyRuleProvider
+++ b/oap-server/analyzer/hierarchy/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.core.config.HierarchyDefinitionService$HierarchyRuleProvider
@@ -1 +1 @@
-org.apache.skywalking.oap.server.core.config.compiler.CompiledHierarchyRuleProvider
+org.apache.skywalking.oap.server.core.config.v2.compiler.CompiledHierarchyRuleProvider
diff --git a/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleClassGeneratorTest.java b/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleClassGeneratorTest.java
similarity index 98%
rename from oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleClassGeneratorTest.java
rename to oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleClassGeneratorTest.java
index 816d12be41..72488ef61c 100644
--- a/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleClassGeneratorTest.java
+++ b/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleClassGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.server.core.config.compiler;
+package org.apache.skywalking.oap.server.core.config.v2.compiler;
import java.util.function.BiFunction;
import javassist.ClassPool;
diff --git a/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleScriptParserTest.java b/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleScriptParserTest.java
similarity index 99%
rename from oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleScriptParserTest.java
rename to oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleScriptParserTest.java
index 1cce3c3271..9fa60481bf 100644
--- a/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/compiler/HierarchyRuleScriptParserTest.java
+++ b/oap-server/analyzer/hierarchy/src/test/java/org/apache/skywalking/oap/server/core/config/v2/compiler/HierarchyRuleScriptParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.server.core.config.compiler;
+package org.apache.skywalking.oap.server.core.config.v2.compiler;
import org.junit.jupiter.api.Test;
diff --git a/oap-server/analyzer/log-analyzer/CLAUDE.md b/oap-server/analyzer/log-analyzer/CLAUDE.md
index 38078c0657..4e1dd62d44 100644
--- a/oap-server/analyzer/log-analyzer/CLAUDE.md
+++ b/oap-server/analyzer/log-analyzer/CLAUDE.md
@@ -45,14 +45,16 @@ oap-server/analyzer/log-analyzer/
## Package & Class Naming
+All v2 classes live under `org.apache.skywalking.oap.log.analyzer.v2.*` to avoid FQCN conflicts with the v1 (Groovy) classes.
+
| Component | Package / Name |
|-----------|---------------|
-| Parser/Model/Generator | `org.apache.skywalking.oap.log.analyzer.compiler` |
-| Generated classes | `org.apache.skywalking.oap.log.analyzer.compiler.rt.LalExpr_<N>` |
-| Consumer classes | `org.apache.skywalking.oap.log.analyzer.compiler.rt.LalExpr_<N>_C<M>` |
-| Package holder | `org.apache.skywalking.oap.log.analyzer.compiler.rt.LalExpressionPackageHolder` |
-| Binding aware | `org.apache.skywalking.oap.log.analyzer.compiler.rt.BindingAware` |
-| Functional interface | `org.apache.skywalking.oap.log.analyzer.dsl.LalExpression` (in log-analyzer) |
+| Parser/Model/Generator | `org.apache.skywalking.oap.log.analyzer.v2.compiler` |
+| Generated classes | `org.apache.skywalking.oap.log.analyzer.v2.compiler.rt.LalExpr_<N>` |
+| Consumer classes | `org.apache.skywalking.oap.log.analyzer.v2.compiler.rt.LalExpr_<N>_C<M>` |
+| Package holder | `org.apache.skywalking.oap.log.analyzer.v2.compiler.rt.LalExpressionPackageHolder` |
+| Binding aware | `org.apache.skywalking.oap.log.analyzer.v2.compiler.rt.BindingAware` |
+| Functional interface | `org.apache.skywalking.oap.log.analyzer.v2.dsl.LalExpression` |
`<N>` is a global `AtomicInteger` counter. `<M>` is the consumer index within the script.
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALClassGenerator.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALClassGenerator.java
similarity index 97%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALClassGenerator.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALClassGenerator.java
index 94895706f6..6accaae619 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALClassGenerator.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALClassGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler;
import java.util.ArrayList;
import java.util.List;
@@ -27,8 +27,8 @@ import javassist.CtField;
import javassist.CtNewConstructor;
import javassist.CtNewMethod;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.log.analyzer.compiler.rt.LalExpressionPackageHolder;
-import org.apache.skywalking.oap.log.analyzer.dsl.LalExpression;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.rt.LalExpressionPackageHolder;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.LalExpression;
/**
* Generates {@link LalExpression} implementation classes from
@@ -44,30 +44,30 @@ public final class LALClassGenerator {
private static final AtomicInteger CLASS_COUNTER = new AtomicInteger(0);
private static final String PACKAGE_PREFIX =
- "org.apache.skywalking.oap.log.analyzer.compiler.rt.";
+ "org.apache.skywalking.oap.log.analyzer.v2.compiler.rt.";
private static final String FILTER_SPEC =
- "org.apache.skywalking.oap.log.analyzer.dsl.spec.filter.FilterSpec";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter.FilterSpec";
private static final String BINDING =
- "org.apache.skywalking.oap.log.analyzer.dsl.Binding";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding";
private static final String BINDING_PARSED =
- "org.apache.skywalking.oap.log.analyzer.dsl.Binding.Parsed";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding.Parsed";
private static final String EXTRACTOR_SPEC =
- "org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.ExtractorSpec";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.ExtractorSpec";
private static final String SLOW_SQL_SPEC =
- "org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.slowsql.SlowSqlSpec";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.slowsql.SlowSqlSpec";
private static final String SAMPLED_TRACE_SPEC =
- "org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.sampledtrace.SampledTraceSpec";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.sampledtrace.SampledTraceSpec";
private static final String SINK_SPEC =
- "org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.SinkSpec";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.SinkSpec";
private static final String SAMPLER_SPEC =
- "org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.SamplerSpec";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.SamplerSpec";
private static final String RATE_LIMITING_SAMPLER =
- "org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.sampler.RateLimitingSampler";
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.sampler.RateLimitingSampler";
private static final String SAMPLE_BUILDER =
EXTRACTOR_SPEC + "$SampleBuilder";
private static final String PROCESS_REGISTRY =
- "org.apache.skywalking.oap.meter.analyzer.dsl.registry.ProcessRegistry";
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.registry.ProcessRegistry";
private final ClassPool classPool;
@@ -110,7 +110,7 @@ public final class LALClassGenerator {
// Phase 3: Build main class with consumer fields
final CtClass ctClass = classPool.makeClass(className);
ctClass.addInterface(classPool.get(
- "org.apache.skywalking.oap.log.analyzer.dsl.LalExpression"));
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl.LalExpression"));
for (int i = 0; i < consumers.size(); i++) {
ctClass.addField(CtField.make(
@@ -187,21 +187,21 @@ public final class LALClassGenerator {
.append(escapeJava(tp.getRegexpPattern()))
.append("\");\n");
consumers.add(new ConsumerInfo(sb.toString(),
- "org.apache.skywalking.oap.log.analyzer.dsl"
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl"
+ ".spec.parser.TextParserSpec"));
}
} else if (stmt instanceof LALScriptModel.JsonParser) {
if (((LALScriptModel.JsonParser) stmt).isAbortOnFailure()) {
consumers.add(new ConsumerInfo(
" _t.abortOnFailure();\n",
- "org.apache.skywalking.oap.log.analyzer.dsl"
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl"
+ ".spec.parser.JsonParserSpec"));
}
} else if (stmt instanceof LALScriptModel.YamlParser) {
if (((LALScriptModel.YamlParser) stmt).isAbortOnFailure()) {
consumers.add(new ConsumerInfo(
" _t.abortOnFailure();\n",
- "org.apache.skywalking.oap.log.analyzer.dsl"
+ "org.apache.skywalking.oap.log.analyzer.v2.dsl"
+ ".spec.parser.YamlParserSpec"));
}
} else if (stmt instanceof LALScriptModel.ExtractorBlock) {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptModel.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptModel.java
similarity index 99%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptModel.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptModel.java
index f20a66abdd..dd5e5fe9e6 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptModel.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler;
import java.util.Collections;
import java.util.List;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptParser.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptParser.java
similarity index 92%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptParser.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptParser.java
index e9128221b3..8d227c34fe 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptParser.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -28,42 +28,42 @@ import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import org.apache.skywalking.lal.rt.grammar.LALLexer;
import org.apache.skywalking.lal.rt.grammar.LALParser;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.AbortStatement;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.InterpolationPart;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.CompareOp;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.ComparisonCondition;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.Condition;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.DropperStatement;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.EnforcerStatement;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.ExprCondition;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.ExtractorBlock;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.ExtractorStatement;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.FieldAssignment;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.FieldSegment;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.FieldType;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.FilterStatement;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.IfBlock;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.JsonParser;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.LogicalCondition;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.LogicalOp;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.MetricsBlock;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.NotCondition;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.NullConditionValue;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.NumberConditionValue;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.RateLimitBlock;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.SamplerBlock;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.SamplerContent;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.SinkBlock;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.SinkStatement;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.SlowSqlBlock;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.StringConditionValue;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.TagAssignment;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.TagValue;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.TextParser;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.ValueAccess;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.ValueAccessConditionValue;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.ValueAccessSegment;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALScriptModel.YamlParser;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.AbortStatement;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.InterpolationPart;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.CompareOp;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.ComparisonCondition;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.Condition;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.DropperStatement;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.EnforcerStatement;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.ExprCondition;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.ExtractorBlock;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.ExtractorStatement;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.FieldAssignment;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.FieldSegment;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.FieldType;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.FilterStatement;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.IfBlock;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.JsonParser;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.LogicalCondition;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.LogicalOp;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.MetricsBlock;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.NotCondition;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.NullConditionValue;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.NumberConditionValue;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.RateLimitBlock;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.SamplerBlock;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.SamplerContent;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.SinkBlock;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.SinkStatement;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.SlowSqlBlock;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.StringConditionValue;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.TagAssignment;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.TagValue;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.TextParser;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.ValueAccess;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.ValueAccessConditionValue;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.ValueAccessSegment;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALScriptModel.YamlParser;
/**
* Facade: parses LAL DSL script strings into {@link LALScriptModel}.
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/rt/BindingAware.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/rt/BindingAware.java
similarity index 89%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/rt/BindingAware.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/rt/BindingAware.java
index 628e7f4874..4020be2000 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/rt/BindingAware.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/rt/BindingAware.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler.rt;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler.rt;
-import org.apache.skywalking.oap.log.analyzer.dsl.Binding;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding;
/**
* Interface for generated consumer classes that need access to the
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/rt/LalExpressionPackageHolder.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/rt/LalExpressionPackageHolder.java
similarity index 94%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/rt/LalExpressionPackageHolder.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/rt/LalExpressionPackageHolder.java
index 815284cf2b..ef74d9cab1 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/compiler/rt/LalExpressionPackageHolder.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/rt/LalExpressionPackageHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler.rt;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler.rt;
/**
* Empty marker class used as the class loading anchor for Javassist
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/Binding.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/Binding.java
similarity index 98%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/Binding.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/Binding.java
index 3c60d3df3a..442ccaac08 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/Binding.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/Binding.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.dsl;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Message;
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Matcher;
import lombok.Getter;
import org.apache.skywalking.apm.network.logging.v3.LogData;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.DatabaseSlowStatementBuilder;
import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.SampledTraceBuilder;
import org.apache.skywalking.oap.server.core.source.Log;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/DSL.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
similarity index 91%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/DSL.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
index a7d37b7b20..cd9bbd726b 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/DSL.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSL.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.dsl;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALClassGenerator;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.filter.FilterSpec;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALClassGenerator;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter.FilterSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/LalExpression.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/LalExpression.java
similarity index 90%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/LalExpression.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/LalExpression.java
index f40c7e95c0..bcb8811c34 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/LalExpression.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/LalExpression.java
@@ -16,9 +16,9 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.filter.FilterSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter.FilterSpec;
/**
* Functional interface implemented by each compiled LAL class.
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/AbstractSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/AbstractSpec.java
similarity index 90%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/AbstractSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/AbstractSpec.java
index 6b8e947cb8..537f33406c 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/AbstractSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/AbstractSpec.java
@@ -16,15 +16,15 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec;
import java.util.function.Consumer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.experimental.Accessors;
import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
-import org.apache.skywalking.oap.log.analyzer.dsl.Binding;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
@Getter
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/ExtractorSpec.java
similarity index 93%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/ExtractorSpec.java
index 02c0186701..88452ea03f 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/ExtractorSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/ExtractorSpec.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
@@ -34,16 +34,16 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.skywalking.apm.network.common.v3.KeyStringValuePair;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.TraceContext;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.AbstractSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.sampledtrace.SampledTraceSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.slowsql.SlowSqlSpec;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleProvider;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.AbstractSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.sampledtrace.SampledTraceSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.slowsql.SlowSqlSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleProvider;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder;
import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.DatabaseSlowStatementBuilder;
import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.SampledTraceBuilder;
import org.apache.skywalking.oap.server.core.CoreModule;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/sampledtrace/SampledTraceSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/sampledtrace/SampledTraceSpec.java
similarity index 93%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/sampledtrace/SampledTraceSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/sampledtrace/SampledTraceSpec.java
index 2034548bf6..78727754ae 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/sampledtrace/SampledTraceSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/sampledtrace/SampledTraceSpec.java
@@ -16,10 +16,10 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.sampledtrace;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.sampledtrace;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.AbstractSpec;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.AbstractSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.SampledTraceBuilder;
import org.apache.skywalking.oap.server.core.source.DetectPoint;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/slowsql/SlowSqlSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/slowsql/SlowSqlSpec.java
similarity index 90%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/slowsql/SlowSqlSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/slowsql/SlowSqlSpec.java
index 5230352528..8414729c62 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/extractor/slowsql/SlowSqlSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/extractor/slowsql/SlowSqlSpec.java
@@ -16,11 +16,11 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.slowsql;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.slowsql;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.AbstractSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.AbstractSpec;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.DatabaseSlowStatementBuilder;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/filter/FilterSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/filter/FilterSpec.java
similarity index 90%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/filter/FilterSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/filter/FilterSpec.java
index 34ac9a7db1..a8cd6365fd 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/filter/FilterSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/filter/FilterSpec.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.filter;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.protobuf.Message;
@@ -29,17 +29,17 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import org.apache.skywalking.apm.network.logging.v3.LogData;
-import org.apache.skywalking.oap.log.analyzer.dsl.Binding;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.AbstractSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.extractor.ExtractorSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.parser.JsonParserSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.parser.TextParserSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.parser.YamlParserSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.SinkSpec;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.LogSinkListenerFactory;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.RecordSinkListener;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.TrafficSinkListener;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.AbstractSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.extractor.ExtractorSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.parser.JsonParserSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.parser.TextParserSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.parser.YamlParserSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.SinkSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.LogSinkListenerFactory;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.RecordSinkListener;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.TrafficSinkListener;
import org.apache.skywalking.oap.server.core.source.Log;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/AbstractParserSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/AbstractParserSpec.java
similarity index 88%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/AbstractParserSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/AbstractParserSpec.java
index a7db119027..d27e4d42dc 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/AbstractParserSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/AbstractParserSpec.java
@@ -16,11 +16,11 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.parser;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.parser;
import lombok.experimental.Accessors;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.AbstractSpec;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.AbstractSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
@Accessors
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/JsonParserSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/JsonParserSpec.java
similarity index 90%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/JsonParserSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/JsonParserSpec.java
index 1fabdbcf1c..47795f992d 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/JsonParserSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/JsonParserSpec.java
@@ -16,10 +16,10 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.parser;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.parser;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
public class JsonParserSpec extends AbstractParserSpec {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/TextParserSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/TextParserSpec.java
similarity index 92%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/TextParserSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/TextParserSpec.java
index f20a1e9d81..4f6866d674 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/TextParserSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/TextParserSpec.java
@@ -16,12 +16,12 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.parser;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.parser;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.skywalking.apm.network.logging.v3.LogData;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
public class TextParserSpec extends AbstractParserSpec {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/YamlParserSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/YamlParserSpec.java
similarity index 91%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/YamlParserSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/YamlParserSpec.java
index 2b99b30bed..5f4b26ae0d 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/parser/YamlParserSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/parser/YamlParserSpec.java
@@ -16,9 +16,9 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.parser;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.parser;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.LoaderOptions;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SamplerSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/SamplerSpec.java
similarity index 85%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SamplerSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/SamplerSpec.java
index 7e1ff921ad..0c6c8e41d4 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SamplerSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/SamplerSpec.java
@@ -16,15 +16,15 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.sink;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.AbstractSpec;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.sampler.RateLimitingSampler;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.sampler.Sampler;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.AbstractSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.sampler.RateLimitingSampler;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.sampler.Sampler;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
public class SamplerSpec extends AbstractSpec {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SinkSpec.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/SinkSpec.java
similarity index 88%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SinkSpec.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/SinkSpec.java
index 631cccfca9..a8dd6dfee8 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/SinkSpec.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/SinkSpec.java
@@ -16,11 +16,11 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.sink;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink;
import java.util.function.Consumer;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.AbstractSpec;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.AbstractSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
public class SinkSpec extends AbstractSpec {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/PossibilitySampler.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/PossibilitySampler.java
similarity index 95%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/PossibilitySampler.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/PossibilitySampler.java
index aeb1426a31..cde61c510a 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/PossibilitySampler.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/PossibilitySampler.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.sampler;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.sampler;
import io.netty.util.internal.ThreadLocalRandom;
import lombok.EqualsAndHashCode;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/RateLimitingSampler.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/RateLimitingSampler.java
similarity index 97%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/RateLimitingSampler.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/RateLimitingSampler.java
index 3f1c548e3d..888ef1cfd1 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/RateLimitingSampler.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/RateLimitingSampler.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.sampler;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.sampler;
import java.util.ArrayList;
import java.util.List;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/Sampler.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/Sampler.java
similarity index 94%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/Sampler.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/Sampler.java
index 61e315c29a..3ef82fce65 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/spec/sink/sampler/Sampler.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/spec/sink/sampler/Sampler.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.dsl.spec.sink.sampler;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.sink.sampler;
public interface Sampler extends AutoCloseable {
Sampler NOOP = new Sampler() {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/module/LogAnalyzerModule.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/module/LogAnalyzerModule.java
similarity index 89%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/module/LogAnalyzerModule.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/module/LogAnalyzerModule.java
index 6b9ecefc0f..39faa0826e 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/module/LogAnalyzerModule.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/module/LogAnalyzerModule.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.module;
+package org.apache.skywalking.oap.log.analyzer.v2.module;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.library.module.ModuleDefine;
public class LogAnalyzerModule extends ModuleDefine {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfig.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LALConfig.java
similarity index 93%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfig.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LALConfig.java
index 82323384c8..fbd14a0828 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfig.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LALConfig.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.provider;
+package org.apache.skywalking.oap.log.analyzer.v2.provider;
import lombok.Data;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfigs.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LALConfigs.java
similarity index 98%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfigs.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LALConfigs.java
index 4bf81310bf..bc2d5559c0 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LALConfigs.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LALConfigs.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.provider;
+package org.apache.skywalking.oap.log.analyzer.v2.provider;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleConfig.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LogAnalyzerModuleConfig.java
similarity index 91%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleConfig.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LogAnalyzerModuleConfig.java
index de995c51b8..da62297804 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleConfig.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LogAnalyzerModuleConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider;
+package org.apache.skywalking.oap.log.analyzer.v2.provider;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -25,8 +25,8 @@ import java.util.List;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rule;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rules;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rule;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rules;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleProvider.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LogAnalyzerModuleProvider.java
similarity index 88%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleProvider.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LogAnalyzerModuleProvider.java
index 39a0021682..f2612cfff8 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/LogAnalyzerModuleProvider.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/LogAnalyzerModuleProvider.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider;
+package org.apache.skywalking.oap.log.analyzer.v2.provider;
import java.util.List;
import java.util.stream.Collectors;
import lombok.Getter;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
-import org.apache.skywalking.oap.log.analyzer.provider.log.LogAnalyzerServiceImpl;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.LogFilterListener;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.LogAnalyzerServiceImpl;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.LogFilterListener;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
import org.apache.skywalking.oap.server.configuration.api.ConfigurationModule;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalysisListenerManager.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/ILogAnalysisListenerManager.java
similarity index 81%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalysisListenerManager.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/ILogAnalysisListenerManager.java
index 2b8b03ec69..421ed6edbf 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalysisListenerManager.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/ILogAnalysisListenerManager.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log;
import java.util.List;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.LogAnalysisListenerFactory;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.LogSinkListenerFactory;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.LogAnalysisListenerFactory;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.LogSinkListenerFactory;
public interface ILogAnalysisListenerManager {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalyzerService.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/ILogAnalyzerService.java
similarity index 95%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalyzerService.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/ILogAnalyzerService.java
index 653cf6dbb1..8498f73aa6 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/ILogAnalyzerService.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/ILogAnalyzerService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log;
import com.google.protobuf.Message;
import org.apache.skywalking.apm.network.logging.v3.LogData;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzer.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/LogAnalyzer.java
similarity index 94%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzer.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/LogAnalyzer.java
index b9e5b57d70..8acdb58de2 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzer.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/LogAnalyzer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log;
import com.google.protobuf.Message;
import java.util.ArrayList;
@@ -28,8 +28,8 @@ import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.library.util.StringUtil;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.LogAnalysisListener;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.LogAnalysisListener;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
/**
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzerServiceImpl.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/LogAnalyzerServiceImpl.java
similarity index 86%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzerServiceImpl.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/LogAnalyzerServiceImpl.java
index d5dbcd150c..8ab5dc0db7 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/LogAnalyzerServiceImpl.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/LogAnalyzerServiceImpl.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log;
import com.google.protobuf.Message;
import java.util.ArrayList;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.apache.skywalking.apm.network.logging.v3.LogData;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.LogAnalysisListenerFactory;
-import org.apache.skywalking.oap.log.analyzer.provider.log.listener.LogSinkListenerFactory;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.LogAnalysisListenerFactory;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener.LogSinkListenerFactory;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
@RequiredArgsConstructor
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/analyzer/LogAnalyzerFactory.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/analyzer/LogAnalyzerFactory.java
similarity index 92%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/analyzer/LogAnalyzerFactory.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/analyzer/LogAnalyzerFactory.java
index 13b610469e..55dfd8ba2b 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/analyzer/LogAnalyzerFactory.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/analyzer/LogAnalyzerFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.analyzer;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.analyzer;
public class LogAnalyzerFactory {
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListener.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogAnalysisListener.java
similarity index 94%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListener.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogAnalysisListener.java
index f43c3a6e4c..9e7fd833b5 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListener.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogAnalysisListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.listener;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener;
import com.google.protobuf.Message;
import org.apache.skywalking.apm.network.logging.v3.LogData;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListenerFactory.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogAnalysisListenerFactory.java
similarity index 93%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListenerFactory.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogAnalysisListenerFactory.java
index 8955adf2c1..d2d9f03964 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogAnalysisListenerFactory.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogAnalysisListenerFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.listener;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener;
import org.apache.skywalking.oap.server.core.analysis.Layer;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogFilterListener.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogFilterListener.java
similarity index 92%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogFilterListener.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogFilterListener.java
index 75af6b1012..6e02c3a13c 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogFilterListener.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogFilterListener.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.listener;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener;
import com.google.protobuf.Message;
import java.util.Collection;
@@ -28,11 +28,11 @@ import lombok.extern.slf4j.Slf4j;
import java.util.HashMap;
import org.apache.skywalking.apm.network.logging.v3.LogData;
-import org.apache.skywalking.oap.log.analyzer.dsl.Binding;
-import org.apache.skywalking.oap.log.analyzer.dsl.DSL;
-import org.apache.skywalking.oap.log.analyzer.provider.LALConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.LALConfigs;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.DSL;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LALConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LALConfigs;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogSinkListener.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogSinkListener.java
similarity index 94%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogSinkListener.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogSinkListener.java
index 0a763c0403..69830edd10 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogSinkListener.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogSinkListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.listener;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener;
import com.google.protobuf.Message;
import org.apache.skywalking.apm.network.logging.v3.LogData;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogSinkListenerFactory.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogSinkListenerFactory.java
similarity index 93%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogSinkListenerFactory.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogSinkListenerFactory.java
index 571bb843c2..a19f51845d 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/LogSinkListenerFactory.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/LogSinkListenerFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.listener;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener;
/**
* LogSinkListenerFactory implementation creates the listener instance when required.
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordSinkListener.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/RecordSinkListener.java
similarity index 98%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordSinkListener.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/RecordSinkListener.java
index 0de9759760..cce46468fd 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/RecordSinkListener.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/RecordSinkListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.listener;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener;
import com.google.protobuf.Message;
import java.util.Arrays;
@@ -33,7 +33,7 @@ import org.apache.skywalking.apm.network.logging.v3.TraceContext;
import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.TagType;
import org.apache.skywalking.oap.server.core.source.TagAutocomplete;
import org.apache.skywalking.oap.server.library.util.StringUtil;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
diff --git a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/TrafficSinkListener.java b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/TrafficSinkListener.java
similarity index 96%
rename from oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/TrafficSinkListener.java
rename to oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/TrafficSinkListener.java
index 1e7c9e3738..49d426d601 100644
--- a/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/provider/log/listener/TrafficSinkListener.java
+++ b/oap-server/analyzer/log-analyzer/src/main/java/org/apache/skywalking/oap/log/analyzer/v2/provider/log/listener/TrafficSinkListener.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.provider.log.listener;
+package org.apache.skywalking.oap.log.analyzer.v2.provider.log.listener;
import com.google.protobuf.Message;
import lombok.RequiredArgsConstructor;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.library.util.StringUtil;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.DownSampling;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
diff --git a/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine b/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
index 54d5a91d08..ac8e56dc7f 100644
--- a/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
+++ b/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
@@ -16,4 +16,4 @@
#
#
-org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule
\ No newline at end of file
+org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule
\ No newline at end of file
diff --git a/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider b/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
index 8f00b261f6..752d6b44bb 100644
--- a/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
+++ b/oap-server/analyzer/log-analyzer/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleProvider
\ No newline at end of file
+org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleProvider
\ No newline at end of file
diff --git a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALClassGeneratorTest.java b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALClassGeneratorTest.java
similarity index 99%
rename from oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALClassGeneratorTest.java
rename to oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALClassGeneratorTest.java
index a1a10209e5..297940e746 100644
--- a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALClassGeneratorTest.java
+++ b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALClassGeneratorTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler;
import javassist.ClassPool;
-import org.apache.skywalking.oap.log.analyzer.dsl.LalExpression;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.LalExpression;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALExpressionExecutionTest.java b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALExpressionExecutionTest.java
similarity index 97%
rename from oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALExpressionExecutionTest.java
rename to oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALExpressionExecutionTest.java
index 30ed016d2c..5358a2697a 100644
--- a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALExpressionExecutionTest.java
+++ b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALExpressionExecutionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler;
import java.io.File;
import java.lang.reflect.Field;
@@ -36,13 +36,13 @@ import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogDataBody;
import org.apache.skywalking.apm.network.logging.v3.LogTags;
import org.apache.skywalking.apm.network.logging.v3.TextLog;
-import org.apache.skywalking.oap.log.analyzer.dsl.Binding;
-import org.apache.skywalking.oap.log.analyzer.dsl.LalExpression;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.filter.FilterSpec;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.LalExpression;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter.FilterSpec;
import org.apache.skywalking.oap.server.analyzer.provider.trace.parser.listener.SampledTraceBuilder;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleProvider;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleProvider;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.config.NamingControl;
import org.apache.skywalking.oap.server.core.config.group.EndpointNameGrouping;
diff --git a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptParserTest.java b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptParserTest.java
similarity index 99%
rename from oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptParserTest.java
rename to oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptParserTest.java
index 8760ca4f6c..24d59d63d3 100644
--- a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/compiler/LALScriptParserTest.java
+++ b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/compiler/LALScriptParserTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.compiler;
+package org.apache.skywalking.oap.log.analyzer.v2.compiler;
import org.junit.jupiter.api.Test;
diff --git a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/dsl/DSLV2Test.java b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSLV2Test.java
similarity index 93%
rename from oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/dsl/DSLV2Test.java
rename to oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSLV2Test.java
index 8a8178f6c6..461bbaf8a6 100644
--- a/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/dsl/DSLV2Test.java
+++ b/oap-server/analyzer/log-analyzer/src/test/java/org/apache/skywalking/oap/log/analyzer/v2/dsl/DSLV2Test.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.log.analyzer.dsl;
+package org.apache.skywalking.oap.log.analyzer.v2.dsl;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALClassGenerator;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALClassGenerator;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/oap-server/analyzer/meter-analyzer/CLAUDE.md b/oap-server/analyzer/meter-analyzer/CLAUDE.md
index 1d6ed11c9d..1660b07ac7 100644
--- a/oap-server/analyzer/meter-analyzer/CLAUDE.md
+++ b/oap-server/analyzer/meter-analyzer/CLAUDE.md
@@ -46,14 +46,16 @@ oap-server/analyzer/meter-analyzer/
## Package & Class Naming
+All v2 classes live under `org.apache.skywalking.oap.meter.analyzer.v2.*` to avoid FQCN conflicts with the v1 (Groovy) classes.
+
| Component | Package / Name |
|-----------|---------------|
-| Parser/Model/Generator | `org.apache.skywalking.oap.meter.analyzer.compiler` |
-| Generated classes | `org.apache.skywalking.oap.meter.analyzer.compiler.rt.MalExpr_<N>` |
-| Closure classes | `org.apache.skywalking.oap.meter.analyzer.compiler.rt.MalExpr_<N>_Closure<M>` |
-| Package holder | `org.apache.skywalking.oap.meter.analyzer.compiler.rt.MalExpressionPackageHolder` |
-| Runtime helper | `org.apache.skywalking.oap.meter.analyzer.compiler.rt.MalRuntimeHelper` |
-| Functional interface | `org.apache.skywalking.oap.meter.analyzer.dsl.MalExpression` (in meter-analyzer) |
+| Parser/Model/Generator | `org.apache.skywalking.oap.meter.analyzer.v2.compiler` |
+| Generated classes | `org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt.MalExpr_<N>` |
+| Closure classes | `org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt.MalExpr_<N>_Closure<M>` |
+| Package holder | `org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt.MalExpressionPackageHolder` |
+| Runtime helper | `org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt.MalRuntimeHelper` |
+| Functional interface | `org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalExpression` |
`<N>` is a global `AtomicInteger` counter. `<M>` is the closure index within the expression.
@@ -67,7 +69,7 @@ oap-server/analyzer/meter-analyzer/
- `tag({ ... })` → `SampleFamilyFunctions$TagFunction`
- `forEach(closure)` / `serviceRelation(closure)` etc. → `SampleFamilyFunctions$ForEachFunction`
- `instance(closure)` → `SampleFamilyFunctions$PropertiesExtractor`
-- **No new v2 code in shared DSL classes**: New runtime behavior used by generated code goes in `MalRuntimeHelper` (in the `compiler.rt` package) to avoid FQCN conflicts with the v1 Groovy module which shares the same `dsl` package.
+- **v2 package isolation**: All v2 classes are under `*.v2.*` packages, so there are no FQCN conflicts with the v1 Groovy module.
## Example
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalExpression.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalExpression.java
deleted file mode 100644
index 66737dfea7..0000000000
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalExpression.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.meter.analyzer.dsl;
-
-import java.util.Map;
-
-/**
- * Each compiled MAL expression implements this interface.
- */
-public interface MalExpression {
- SampleFamily run(Map<String, SampleFamily> samples);
-
- /**
- * Returns compile-time metadata extracted from the expression AST:
- * sample names, scope type, aggregation labels, downsampling, etc.
- */
- ExpressionMetadata metadata();
-}
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/Analyzer.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/Analyzer.java
index 9b87b7d92a..4d028cfb90 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/Analyzer.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/Analyzer.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer;
+package org.apache.skywalking.oap.meter.analyzer.v2;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
@@ -34,14 +34,14 @@ import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.CaseUtils;
-import org.apache.skywalking.oap.meter.analyzer.dsl.DSL;
-import org.apache.skywalking.oap.meter.analyzer.dsl.DownsamplingType;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Expression;
-import org.apache.skywalking.oap.meter.analyzer.dsl.ExpressionMetadata;
-import org.apache.skywalking.oap.meter.analyzer.dsl.FilterExpression;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Result;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.DSL;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.DownsamplingType;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Expression;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.ExpressionMetadata;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.FilterExpression;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Result;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
import org.apache.skywalking.oap.server.core.analysis.manual.endpoint.EndpointTraffic;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/MetricConvert.java
similarity index 93%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/MetricConvert.java
index ffcfa159b6..67cb242fb1 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricConvert.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/MetricConvert.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer;
+package org.apache.skywalking.oap.meter.analyzer.v2;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -27,11 +27,11 @@ import java.util.StringJoiner;
import java.util.stream.Stream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.skywalking.oap.meter.analyzer.dsl.DSL;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Expression;
-import org.apache.skywalking.oap.meter.analyzer.dsl.ExpressionParsingException;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Result;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.DSL;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Expression;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.ExpressionParsingException;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Result;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import static java.util.stream.Collectors.toList;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricRuleConfig.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/MetricRuleConfig.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricRuleConfig.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/MetricRuleConfig.java
index 2e75b1d89c..a67f7ed250 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/MetricRuleConfig.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/MetricRuleConfig.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer;
+package org.apache.skywalking.oap.meter.analyzer.v2;
import java.util.List;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALClassGenerator.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALClassGenerator.java
similarity index 97%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALClassGenerator.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALClassGenerator.java
index 81aea84996..9f2940a149 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALClassGenerator.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALClassGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.compiler;
+package org.apache.skywalking.oap.meter.analyzer.v2.compiler;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -27,11 +27,11 @@ import javassist.CtClass;
import javassist.CtNewConstructor;
import javassist.CtNewMethod;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.meter.analyzer.compiler.rt.MalExpressionPackageHolder;
-import org.apache.skywalking.oap.meter.analyzer.dsl.DownsamplingType;
-import org.apache.skywalking.oap.meter.analyzer.dsl.ExpressionMetadata;
-import org.apache.skywalking.oap.meter.analyzer.dsl.MalExpression;
-import org.apache.skywalking.oap.meter.analyzer.dsl.MalFilter;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt.MalExpressionPackageHolder;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.DownsamplingType;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.ExpressionMetadata;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalExpression;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalFilter;
import org.apache.skywalking.oap.server.core.analysis.meter.ScopeType;
/**
@@ -49,9 +49,9 @@ public final class MALClassGenerator {
private static final AtomicInteger CLASS_COUNTER = new AtomicInteger(0);
private static final String PACKAGE_PREFIX =
- "org.apache.skywalking.oap.meter.analyzer.compiler.rt.";
+ "org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt.";
- private static final String SF = "org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily";
+ private static final String SF = "org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily";
private static final String ENUM_PACKAGE_PREFIX =
"org.apache.skywalking.oap.";
@@ -71,13 +71,13 @@ public final class MALClassGenerator {
ENUM_FQCN.put("Layer", "org.apache.skywalking.oap.server.core.analysis.Layer");
ENUM_FQCN.put("DetectPoint", "org.apache.skywalking.oap.server.core.source.DetectPoint");
ENUM_FQCN.put("K8sRetagType",
- "org.apache.skywalking.oap.meter.analyzer.dsl.tagOpt.K8sRetagType");
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.tagOpt.K8sRetagType");
ENUM_FQCN.put("DownsamplingType",
- "org.apache.skywalking.oap.meter.analyzer.dsl.DownsamplingType");
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.DownsamplingType");
CLOSURE_CLASS_FQCN = new java.util.HashMap<>();
CLOSURE_CLASS_FQCN.put("ProcessRegistry",
- "org.apache.skywalking.oap.meter.analyzer.dsl.registry.ProcessRegistry");
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.registry.ProcessRegistry");
}
private final ClassPool classPool;
@@ -128,7 +128,7 @@ public final class MALClassGenerator {
final CtClass ctClass = classPool.makeClass(className);
ctClass.addInterface(classPool.get(
- "org.apache.skywalking.oap.meter.analyzer.dsl.MalFilter"));
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalFilter"));
ctClass.addConstructor(CtNewConstructor.defaultConstructor(ctClass));
@@ -202,7 +202,7 @@ public final class MALClassGenerator {
final CtClass ctClass = classPool.makeClass(className);
ctClass.addInterface(classPool.get(
- "org.apache.skywalking.oap.meter.analyzer.dsl.MalExpression"));
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalExpression"));
// Add closure fields
for (int i = 0; i < closures.size(); i++) {
@@ -293,13 +293,13 @@ public final class MALClassGenerator {
if (arg instanceof MALExpressionModel.ClosureArgument) {
final String interfaceType;
if ("forEach".equals(methodName)) {
- interfaceType = "org.apache.skywalking.oap.meter.analyzer.dsl"
+ interfaceType = "org.apache.skywalking.oap.meter.analyzer.v2.dsl"
+ ".SampleFamilyFunctions$ForEachFunction";
} else if ("instance".equals(methodName)) {
- interfaceType = "org.apache.skywalking.oap.meter.analyzer.dsl"
+ interfaceType = "org.apache.skywalking.oap.meter.analyzer.v2.dsl"
+ ".SampleFamilyFunctions$PropertiesExtractor";
} else {
- interfaceType = "org.apache.skywalking.oap.meter.analyzer.dsl"
+ interfaceType = "org.apache.skywalking.oap.meter.analyzer.v2.dsl"
+ ".SampleFamilyFunctions$TagFunction";
}
final ClosureInfo info = new ClosureInfo(
@@ -315,10 +315,10 @@ public final class MALClassGenerator {
}
private static final String FOR_EACH_FUNCTION_TYPE =
- "org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyFunctions$ForEachFunction";
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyFunctions$ForEachFunction";
private static final String PROPERTIES_EXTRACTOR_TYPE =
- "org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyFunctions$PropertiesExtractor";
+ "org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyFunctions$PropertiesExtractor";
private Object compileClosureClass(final String className,
final ClosureInfo info) throws Exception {
@@ -527,7 +527,7 @@ public final class MALClassGenerator {
sb.append(").multiply(Double.valueOf(").append(num).append("))");
break;
case DIV:
- sb.append("org.apache.skywalking.oap.meter.analyzer.compiler.rt")
+ sb.append("org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt")
.append(".MalRuntimeHelper.divReverse(").append(num).append(", ");
generateExpr(sb, right);
sb.append(")");
@@ -1212,9 +1212,9 @@ public final class MALClassGenerator {
private String generateMetadataMethod(final ExpressionMetadata metadata) {
final StringBuilder sb = new StringBuilder();
- final String mdClass = "org.apache.skywalking.oap.meter.analyzer.dsl.ExpressionMetadata";
+ final String mdClass = "org.apache.skywalking.oap.meter.analyzer.v2.dsl.ExpressionMetadata";
final String scopeTypeClass = "org.apache.skywalking.oap.server.core.analysis.meter.ScopeType";
- final String dsTypeClass = "org.apache.skywalking.oap.meter.analyzer.dsl.DownsamplingType";
+ final String dsTypeClass = "org.apache.skywalking.oap.meter.analyzer.v2.dsl.DownsamplingType";
sb.append("public ").append(mdClass).append(" metadata() {\n");
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALExpressionModel.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALExpressionModel.java
similarity index 99%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALExpressionModel.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALExpressionModel.java
index d6fda7331c..86466a29ef 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALExpressionModel.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALExpressionModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.compiler;
+package org.apache.skywalking.oap.meter.analyzer.v2.compiler;
import java.util.Collections;
import java.util.List;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALScriptParser.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALScriptParser.java
similarity index 87%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALScriptParser.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALScriptParser.java
index 79a7c83139..e7f8e2d336 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALScriptParser.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALScriptParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.compiler;
+package org.apache.skywalking.oap.meter.analyzer.v2.compiler;
import java.util.ArrayList;
import java.util.Collections;
@@ -28,45 +28,45 @@ import org.antlr.v4.runtime.Recognizer;
import org.apache.skywalking.mal.rt.grammar.MALLexer;
import org.apache.skywalking.mal.rt.grammar.MALParser;
import org.apache.skywalking.mal.rt.grammar.MALParserBaseVisitor;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.Argument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ArithmeticOp;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.BinaryExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.BoolArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureAssignment;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureBinaryExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureBoolLiteral;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureChainSegment;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureCondition;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureExprCondition;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureExprStatement;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureFieldAccess;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureIfStatement;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureIndexAccess;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureMethodCallSeg;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureMethodChain;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureNullLiteral;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureNumberLiteral;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureReturnStatement;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureStatement;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureStringLiteral;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureVarAssign;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureVarDecl;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.CompareOp;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.EnumRefArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.Expr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ExprArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.FunctionCallExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.LogicalOp;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.MetricExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.MethodCall;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.NumberExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.NumberListArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ParenChainExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.StringArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.StringListArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.UnaryNegExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.Argument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ArithmeticOp;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.BinaryExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.BoolArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureAssignment;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureBinaryExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureBoolLiteral;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureChainSegment;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureCondition;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureExprCondition;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureExprStatement;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureFieldAccess;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureIfStatement;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureIndexAccess;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureMethodCallSeg;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureMethodChain;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureNullLiteral;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureNumberLiteral;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureReturnStatement;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureStatement;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureStringLiteral;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureVarAssign;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureVarDecl;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.CompareOp;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.EnumRefArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.Expr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ExprArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.FunctionCallExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.LogicalOp;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.MetricExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.MethodCall;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.NumberExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.NumberListArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ParenChainExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.StringArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.StringListArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.UnaryNegExpr;
/**
* Facade: parses MAL expression strings into {@link MALExpressionModel.Expr} AST.
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/rt/MalExpressionPackageHolder.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/rt/MalExpressionPackageHolder.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/rt/MalExpressionPackageHolder.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/rt/MalExpressionPackageHolder.java
index 0d468068f7..b3455543fd 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/rt/MalExpressionPackageHolder.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/rt/MalExpressionPackageHolder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.compiler.rt;
+package org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt;
/**
* Empty marker class used as the class loading anchor for Javassist
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/rt/MalRuntimeHelper.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/rt/MalRuntimeHelper.java
similarity index 87%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/rt/MalRuntimeHelper.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/rt/MalRuntimeHelper.java
index 759e6d926c..7d757329da 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/compiler/rt/MalRuntimeHelper.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/rt/MalRuntimeHelper.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.compiler.rt;
+package org.apache.skywalking.oap.meter.analyzer.v2.compiler.rt;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder;
/**
* Static helper methods called by v2-generated {@code MalExpression} classes.
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DSL.java
similarity index 93%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DSL.java
index 36dcb3426a..32aa5bf5b6 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSL.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DSL.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALClassGenerator;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALClassGenerator;
/**
* DSL compiles MAL expression strings into {@link Expression} objects
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DownsamplingType.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DownsamplingType.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DownsamplingType.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DownsamplingType.java
index c8f0006fbb..6a6f64ede7 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/DownsamplingType.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DownsamplingType.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
/**
* DownsamplingType indicates the downsampling type of meter function
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EndpointEntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/EndpointEntityDescription.java
similarity index 95%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EndpointEntityDescription.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/EndpointEntityDescription.java
index 1eac8973ca..02a47fc78c 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EndpointEntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/EndpointEntityDescription.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/EntityDescription.java
similarity index 93%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EntityDescription.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/EntityDescription.java
index 24e09090fb..94b1cfe010 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/EntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/EntityDescription.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription;
import java.util.List;
import org.apache.skywalking.oap.server.core.analysis.meter.ScopeType;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/InstanceEntityDescription.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/InstanceEntityDescription.java
index 83f1e5f87f..f8447d57e5 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/InstanceEntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/InstanceEntityDescription.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription;
import java.util.List;
import java.util.Map;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ProcessEntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ProcessEntityDescription.java
similarity index 95%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ProcessEntityDescription.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ProcessEntityDescription.java
index 9759061eab..9205301ead 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ProcessEntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ProcessEntityDescription.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription;
import com.google.common.collect.ImmutableList;
import lombok.Getter;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ProcessRelationEntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ProcessRelationEntityDescription.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ProcessRelationEntityDescription.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ProcessRelationEntityDescription.java
index 1e3533e306..a4de41bdd6 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ProcessRelationEntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ProcessRelationEntityDescription.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription;
import com.google.common.collect.ImmutableList;
import lombok.Getter;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ServiceEntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ServiceEntityDescription.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ServiceEntityDescription.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ServiceEntityDescription.java
index b1fc80c308..0df741abd1 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ServiceEntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ServiceEntityDescription.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription;
import java.util.List;
import lombok.Getter;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ServiceRelationEntityDescription.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ServiceRelationEntityDescription.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ServiceRelationEntityDescription.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ServiceRelationEntityDescription.java
index 1adf7fd9aa..13bba3453b 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/EntityDescription/ServiceRelationEntityDescription.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/EntityDescription/ServiceRelationEntityDescription.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription;
import java.util.List;
import com.google.common.collect.ImmutableList;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Expression.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Expression.java
similarity index 98%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Expression.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Expression.java
index 2081935639..d3c0ab3f52 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Expression.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Expression.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import java.util.Map;
import lombok.ToString;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionMetadata.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/ExpressionMetadata.java
similarity index 97%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionMetadata.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/ExpressionMetadata.java
index 11ebbcc7af..ceaa58370b 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionMetadata.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/ExpressionMetadata.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionParsingException.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/ExpressionParsingException.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionParsingException.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/ExpressionParsingException.java
index a3ab8a37d9..8853625e2d 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/ExpressionParsingException.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/ExpressionParsingException.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
/**
* ExpressionParsingException is throw in expression parsing phase.
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/FilterExpression.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/FilterExpression.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/FilterExpression.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/FilterExpression.java
index 320cc1e656..f5fd74696a 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/FilterExpression.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/FilterExpression.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALClassGenerator;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALClassGenerator;
/**
* Compiles a MAL filter closure expression into a {@link MalFilter}
diff --git a/test/script-cases/script-runtime-with-groovy/mal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalExpression.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/MalExpression.java
similarity index 95%
rename from test/script-cases/script-runtime-with-groovy/mal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalExpression.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/MalExpression.java
index 66737dfea7..32a24dd766 100644
--- a/test/script-cases/script-runtime-with-groovy/mal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalExpression.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/MalExpression.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import java.util.Map;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalFilter.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/MalFilter.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalFilter.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/MalFilter.java
index c221fcba40..585bfb2c24 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalFilter.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/MalFilter.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import java.util.Map;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Result.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Result.java
similarity index 97%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Result.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Result.java
index 195219653b..005f2d4815 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Result.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Result.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Sample.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Sample.java
similarity index 93%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Sample.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Sample.java
index 9a6760fde6..f22d837f77 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/Sample.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/Sample.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import com.google.common.collect.ImmutableMap;
import io.vavr.Function2;
@@ -27,7 +27,7 @@ import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
-import org.apache.skywalking.oap.meter.analyzer.dsl.counter.CounterWindow;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.counter.CounterWindow;
/**
* Sample represents the metric data point in a range of time.
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamily.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamily.java
index 12fc44847e..206a89852c 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamily.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import static java.util.function.UnaryOperator.identity;
import static java.util.stream.Collectors.groupingBy;
@@ -25,14 +25,14 @@ import static java.util.stream.Collectors.toList;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import org.apache.commons.lang3.StringUtils;
-import org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription.EndpointEntityDescription;
-import org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription.EntityDescription;
-import org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription.InstanceEntityDescription;
-import org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription.ProcessEntityDescription;
-import org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription.ProcessRelationEntityDescription;
-import org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription.ServiceEntityDescription;
-import org.apache.skywalking.oap.meter.analyzer.dsl.EntityDescription.ServiceRelationEntityDescription;
-import org.apache.skywalking.oap.meter.analyzer.dsl.tagOpt.K8sRetagType;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription.EndpointEntityDescription;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription.EntityDescription;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription.InstanceEntityDescription;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription.ProcessEntityDescription;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription.ProcessRelationEntityDescription;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription.ServiceEntityDescription;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.EntityDescription.ServiceRelationEntityDescription;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.tagOpt.K8sRetagType;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.UnexpectedException;
import org.apache.skywalking.oap.server.core.analysis.Layer;
@@ -59,11 +59,11 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import io.vavr.Function2;
import io.vavr.Function3;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyFunctions.DecorateFunction;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyFunctions.ForEachFunction;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyFunctions.PropertiesExtractor;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyFunctions.SampleFilter;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyFunctions.TagFunction;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyFunctions.DecorateFunction;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyFunctions.ForEachFunction;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyFunctions.PropertiesExtractor;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyFunctions.SampleFilter;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyFunctions.TagFunction;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.EqualsAndHashCode;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamilyBuilder.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamilyBuilder.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamilyBuilder.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamilyBuilder.java
index 2893ad6a51..bf5853bca0 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamilyBuilder.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamilyBuilder.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import java.util.concurrent.TimeUnit;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamilyFunctions.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamilyFunctions.java
similarity index 97%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamilyFunctions.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamilyFunctions.java
index 752eb0f898..6c6d240270 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamilyFunctions.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/SampleFamilyFunctions.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import java.util.Map;
import java.util.function.Consumer;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/CounterWindow.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/CounterWindow.java
similarity index 97%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/CounterWindow.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/CounterWindow.java
index 5e7e6039ee..bf64b7d68b 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/CounterWindow.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/CounterWindow.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.counter;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.counter;
import com.google.common.collect.ImmutableMap;
import io.vavr.Tuple;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/ID.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/ID.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/ID.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/ID.java
index 45ce13c0f5..b9bb234085 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/counter/ID.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/counter/ID.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.counter;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.counter;
import com.google.common.collect.ImmutableMap;
import lombok.EqualsAndHashCode;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/registry/ProcessRegistry.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/registry/ProcessRegistry.java
similarity index 96%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/registry/ProcessRegistry.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/registry/ProcessRegistry.java
index 47759ec20c..9a0cd6f959 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/registry/ProcessRegistry.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/registry/ProcessRegistry.java
@@ -16,11 +16,11 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.registry;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.registry;
import org.apache.commons.lang3.StringUtils;
import org.apache.skywalking.library.kubernetes.ObjectID;
-import org.apache.skywalking.oap.meter.analyzer.k8s.K8sInfoRegistry;
+import org.apache.skywalking.oap.meter.analyzer.v2.k8s.K8sInfoRegistry;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.analysis.DownSampling;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/K8sRetagType.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/tagOpt/K8sRetagType.java
similarity index 91%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/K8sRetagType.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/tagOpt/K8sRetagType.java
index 53d9ff5fe5..95218ba189 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/K8sRetagType.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/tagOpt/K8sRetagType.java
@@ -16,15 +16,15 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.tagOpt;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.tagOpt;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import java.util.Arrays;
import java.util.Map;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.k8s.K8sInfoRegistry;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.k8s.K8sInfoRegistry;
public enum K8sRetagType implements Retag {
Pod2Service {
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/Retag.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/tagOpt/Retag.java
similarity index 88%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/Retag.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/tagOpt/Retag.java
index d95930f1a8..3a84faf822 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/tagOpt/Retag.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/tagOpt/Retag.java
@@ -16,9 +16,9 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl.tagOpt;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl.tagOpt;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
public interface Retag {
String BLANK = "";
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/k8s/K8sInfoRegistry.java
similarity index 99%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/k8s/K8sInfoRegistry.java
index c08e10b62e..6fce51feb5 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/k8s/K8sInfoRegistry.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/k8s/K8sInfoRegistry.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.k8s;
+package org.apache.skywalking.oap.meter.analyzer.v2.k8s;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/PrometheusMetricConverter.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/PrometheusMetricConverter.java
similarity index 95%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/PrometheusMetricConverter.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/PrometheusMetricConverter.java
index 4dc5ab4c9c..d63b4efb9a 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/PrometheusMetricConverter.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/PrometheusMetricConverter.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.prometheus;
+package org.apache.skywalking.oap.meter.analyzer.v2.prometheus;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
@@ -30,9 +30,9 @@ import java.util.concurrent.ExecutionException;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder;
import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Counter;
import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Gauge;
import org.apache.skywalking.oap.server.library.util.prometheus.metrics.Histogram;
@@ -45,7 +45,7 @@ import static io.vavr.API.Case;
import static io.vavr.API.Match;
import static io.vavr.Predicates.instanceOf;
import static java.util.stream.Collectors.toList;
-import static org.apache.skywalking.oap.meter.analyzer.Analyzer.NIL;
+import static org.apache.skywalking.oap.meter.analyzer.v2.Analyzer.NIL;
/**
* PrometheusMetricConverter converts prometheus metrics to meter-system metrics, then store them to backend storage.
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/MetricsRule.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/MetricsRule.java
similarity index 89%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/MetricsRule.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/MetricsRule.java
index e2f2ff44ab..0a10499f9c 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/MetricsRule.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/MetricsRule.java
@@ -16,13 +16,13 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.prometheus.rule;
+package org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.skywalking.oap.meter.analyzer.MetricRuleConfig;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricRuleConfig;
/**
* MetricsRule holds the parsing expression.
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rule.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/Rule.java
similarity index 90%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rule.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/Rule.java
index 47cca3896a..977aa6d011 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rule.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/Rule.java
@@ -16,11 +16,11 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.prometheus.rule;
+package org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.skywalking.oap.meter.analyzer.MetricRuleConfig;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricRuleConfig;
import java.util.List;
diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rules.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/Rules.java
similarity index 98%
rename from oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rules.java
rename to oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/Rules.java
index d9d8f3401b..c179e774a7 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/prometheus/rule/Rules.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/v2/prometheus/rule/Rules.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.meter.analyzer.prometheus.rule;
+package org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule;
import java.io.File;
diff --git a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALClassGeneratorTest.java b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALClassGeneratorTest.java
similarity index 99%
rename from oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALClassGeneratorTest.java
rename to oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALClassGeneratorTest.java
index 60496f04f4..c2d2b403bf 100644
--- a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALClassGeneratorTest.java
+++ b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALClassGeneratorTest.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.compiler;
+package org.apache.skywalking.oap.meter.analyzer.v2.compiler;
import javassist.ClassPool;
-import org.apache.skywalking.oap.meter.analyzer.dsl.MalExpression;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalExpression;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALScriptParserTest.java b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALScriptParserTest.java
similarity index 94%
rename from oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALScriptParserTest.java
rename to oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALScriptParserTest.java
index eeb71518c7..01d3209628 100644
--- a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/compiler/MALScriptParserTest.java
+++ b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/compiler/MALScriptParserTest.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.compiler;
-
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.BinaryExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ClosureArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.EnumRefArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ExprArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.MetricExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.NumberExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.NumberListArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.ParenChainExpr;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.StringArgument;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALExpressionModel.StringListArgument;
+package org.apache.skywalking.oap.meter.analyzer.v2.compiler;
+
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.BinaryExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ClosureArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.EnumRefArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ExprArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.MetricExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.NumberExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.NumberListArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.ParenChainExpr;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.StringArgument;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALExpressionModel.StringListArgument;
import org.junit.jupiter.api.Test;
import java.util.List;
diff --git a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSLV2Test.java b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DSLV2Test.java
similarity index 98%
rename from oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSLV2Test.java
rename to oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DSLV2Test.java
index 0e6dc713b8..b1a66e894f 100644
--- a/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/dsl/DSLV2Test.java
+++ b/oap-server/analyzer/meter-analyzer/src/test/java/org/apache/skywalking/oap/meter/analyzer/v2/dsl/DSLV2Test.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.skywalking.oap.meter.analyzer.dsl;
+package org.apache.skywalking.oap.meter.analyzer.v2.dsl;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
diff --git a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java
index e45953c62c..14187e0178 100644
--- a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java
+++ b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/KafkaFetcherProvider.java
@@ -19,7 +19,7 @@
package org.apache.skywalking.oap.server.analyzer.agent.kafka.provider;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
import org.apache.skywalking.oap.server.analyzer.agent.kafka.KafkaFetcherHandlerRegister;
import org.apache.skywalking.oap.server.analyzer.agent.kafka.module.KafkaFetcherConfig;
import org.apache.skywalking.oap.server.analyzer.agent.kafka.module.KafkaFetcherModule;
diff --git a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandler.java b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandler.java
index c563d7a5cc..9a1f671131 100644
--- a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandler.java
+++ b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/main/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandler.java
@@ -21,8 +21,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.utils.Bytes;
import org.apache.skywalking.apm.network.logging.v3.LogData;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.analyzer.agent.kafka.module.KafkaFetcherConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
diff --git a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandlerTest.java b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandlerTest.java
index 43ae1c729a..9f9f474e9f 100644
--- a/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandlerTest.java
+++ b/oap-server/server-fetcher-plugin/kafka-fetcher-plugin/src/test/java/org/apache/skywalking/oap/server/analyzer/agent/kafka/provider/handler/LogHandlerTest.java
@@ -18,8 +18,8 @@
package org.apache.skywalking.oap.server.analyzer.agent.kafka.provider.handler;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.analyzer.agent.kafka.module.KafkaFetcherConfig;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java
index bc57bb0a46..73e8c00a1c 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java
@@ -28,11 +28,11 @@ import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogTags;
-import org.apache.skywalking.oap.log.analyzer.dsl.Binding;
-import org.apache.skywalking.oap.log.analyzer.dsl.DSL;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleProvider;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding;
+import org.apache.skywalking.oap.log.analyzer.v2.dsl.DSL;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleProvider;
import org.apache.skywalking.oap.query.graphql.GraphQLQueryConfig;
import org.apache.skywalking.oap.query.graphql.type.LogTestRequest;
import org.apache.skywalking.oap.query.graphql.type.LogTestResponse;
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java b/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
index 035e6568e4..bc335bf2c6 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/test/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQueryTest.java
@@ -18,8 +18,8 @@
package org.apache.skywalking.oap.query.graphql.resolver;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleProvider;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleProvider;
import org.apache.skywalking.oap.query.graphql.GraphQLQueryConfig;
import org.apache.skywalking.oap.query.graphql.type.LogTestRequest;
import org.apache.skywalking.oap.query.graphql.type.LogTestResponse;
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
index f325a85d21..e8fa61b883 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.Getter;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rule;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rules;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rule;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rules;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
import org.apache.skywalking.oap.server.receiver.envoy.metrics.adapters.ClusterManagerMetricsAdapter;
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
index 921edfee10..f07092dc5e 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
@@ -32,10 +32,10 @@ import java.util.Map;
import java.util.stream.Collectors;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
import org.apache.skywalking.oap.server.library.util.StringUtil;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.PrometheusMetricConverter;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.PrometheusMetricConverter;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/LogsPersistence.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/LogsPersistence.java
index 00bb3c1cca..e796f889e7 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/LogsPersistence.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/LogsPersistence.java
@@ -23,8 +23,8 @@ import io.envoyproxy.envoy.service.accesslog.v3.StreamAccessLogsMessage;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.servicemesh.v3.HTTPServiceMeshMetric;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
diff --git a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/TCPLogsPersistence.java b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/TCPLogsPersistence.java
index ab792eeb0d..85d91831e5 100644
--- a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/TCPLogsPersistence.java
+++ b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/persistence/TCPLogsPersistence.java
@@ -20,8 +20,8 @@ package org.apache.skywalking.oap.server.receiver.envoy.persistence;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.servicemesh.v3.TCPServiceMeshMetric;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.core.analysis.Layer;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
diff --git a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
index cc1d75e025..28afc17b1b 100644
--- a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
+++ b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
@@ -33,8 +33,8 @@ import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogDataBody;
import org.apache.skywalking.apm.network.logging.v3.LogTags;
import org.apache.skywalking.apm.network.logging.v3.TextLog;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
diff --git a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
index ae60bdbade..6b26a86656 100644
--- a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
+++ b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricRequestProcessor.java
@@ -29,11 +29,11 @@ import io.vavr.Function1;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.PrometheusMetricConverter;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rule;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rules;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.PrometheusMetricConverter;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rule;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rules;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
diff --git a/oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/AccessLogServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/AccessLogServiceHandler.java
index 785a234359..4b2a3023bc 100644
--- a/oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/AccessLogServiceHandler.java
+++ b/oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/AccessLogServiceHandler.java
@@ -56,7 +56,7 @@ import org.apache.skywalking.apm.network.servicemesh.v3.ServiceMeshMetrics;
import org.apache.skywalking.apm.network.servicemesh.v3.TCPServiceMeshMetric;
import org.apache.skywalking.apm.network.servicemesh.v3.TCPServiceMeshMetrics;
import org.apache.skywalking.library.kubernetes.ObjectID;
-import org.apache.skywalking.oap.meter.analyzer.k8s.K8sInfoRegistry;
+import org.apache.skywalking.oap.meter.analyzer.v2.k8s.K8sInfoRegistry;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.Layer;
diff --git a/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/LogModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/LogModuleProvider.java
index 4014daa3e2..67090dc396 100644
--- a/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/LogModuleProvider.java
+++ b/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/LogModuleProvider.java
@@ -19,7 +19,7 @@ package org.apache.skywalking.oap.server.receiver.log.provider;
import com.linecorp.armeria.common.HttpMethod;
import java.util.Collections;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister;
import org.apache.skywalking.oap.server.core.server.HTTPHandlerRegister;
diff --git a/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/grpc/LogReportServiceGrpcHandler.java b/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/grpc/LogReportServiceGrpcHandler.java
index 2e0b853461..ad019c968b 100644
--- a/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/grpc/LogReportServiceGrpcHandler.java
+++ b/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/grpc/LogReportServiceGrpcHandler.java
@@ -23,8 +23,8 @@ import org.apache.skywalking.apm.network.common.v3.Commands;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogReportServiceGrpc;
import org.apache.skywalking.oap.server.library.util.StringUtil;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.server.grpc.GRPCHandler;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
diff --git a/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/rest/LogReportServiceHTTPHandler.java b/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/rest/LogReportServiceHTTPHandler.java
index 0ed2e44dd6..007b3d36b3 100644
--- a/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/rest/LogReportServiceHTTPHandler.java
+++ b/oap-server/server-receiver-plugin/skywalking-log-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/log/provider/handler/rest/LogReportServiceHTTPHandler.java
@@ -22,8 +22,8 @@ import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.network.common.v3.Commands;
import org.apache.skywalking.apm.network.logging.v3.LogData;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.log.ILogAnalyzerService;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.log.ILogAnalyzerService;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
import org.apache.skywalking.oap.server.telemetry.api.CounterMetrics;
diff --git a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/TelegrafReceiverProvider.java b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/TelegrafReceiverProvider.java
index 871294afa9..c40edef1ba 100644
--- a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/TelegrafReceiverProvider.java
+++ b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/TelegrafReceiverProvider.java
@@ -20,8 +20,8 @@ package org.apache.skywalking.oap.server.receiver.telegraf.provider;
import com.google.common.base.Splitter;
import com.linecorp.armeria.common.HttpMethod;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rule;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rules;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rule;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rules;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.core.server.HTTPHandlerRegister;
diff --git a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/handler/TelegrafServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/handler/TelegrafServiceHandler.java
index cd4dde4170..0006b0be26 100644
--- a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/handler/TelegrafServiceHandler.java
+++ b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/telegraf/provider/handler/TelegrafServiceHandler.java
@@ -23,11 +23,11 @@ import com.linecorp.armeria.server.annotation.Post;
import com.linecorp.armeria.server.annotation.RequestConverter;
import lombok.extern.slf4j.Slf4j;
import org.apache.skywalking.apm.network.common.v3.Commands;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rule;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rule;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.receiver.telegraf.provider.handler.pojo.TelegrafData;
diff --git a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/TelegrafMetricsTest.java b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/TelegrafMetricsTest.java
index 4a5e151348..23b2cf768a 100644
--- a/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/TelegrafMetricsTest.java
+++ b/oap-server/server-receiver-plugin/skywalking-telegraf-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/telegraf/TelegrafMetricsTest.java
@@ -19,10 +19,10 @@
package org.apache.skywalking.oap.server.receiver.telegraf;
import com.google.common.collect.ImmutableMap;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rule;
-import org.apache.skywalking.oap.meter.analyzer.prometheus.rule.Rules;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rule;
+import org.apache.skywalking.oap.meter.analyzer.v2.prometheus.rule.Rules;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.CoreModuleProvider;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterEntity;
diff --git a/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetrics.java b/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetrics.java
index 8d43b9ada6..c05772029f 100644
--- a/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetrics.java
+++ b/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/ZabbixMetrics.java
@@ -30,10 +30,10 @@ import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.lang3.time.StopWatch;
import org.apache.commons.text.StringTokenizer;
import org.apache.skywalking.oap.server.library.util.StringUtil;
-import org.apache.skywalking.oap.meter.analyzer.MetricConvert;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricConvert;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder;
import org.apache.skywalking.oap.server.core.analysis.meter.MeterSystem;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.receiver.zabbix.provider.config.ZabbixConfig;
diff --git a/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/config/ZabbixConfig.java b/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/config/ZabbixConfig.java
index c419d38d15..382c965596 100644
--- a/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/config/ZabbixConfig.java
+++ b/oap-server/server-receiver-plugin/skywalking-zabbix-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zabbix/provider/config/ZabbixConfig.java
@@ -19,7 +19,7 @@
package org.apache.skywalking.oap.server.receiver.zabbix.provider.config;
import lombok.Data;
-import org.apache.skywalking.oap.meter.analyzer.MetricRuleConfig;
+import org.apache.skywalking.oap.meter.analyzer.v2.MetricRuleConfig;
import java.util.List;
diff --git a/test/script-cases/script-runtime-with-groovy/hierarchy-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/core/config/HierarchyRuleComparisonTest.java b/test/script-cases/script-runtime-with-groovy/hierarchy-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/core/config/HierarchyRuleComparisonTest.java
index 2a661de0c1..b410b66b28 100644
--- a/test/script-cases/script-runtime-with-groovy/hierarchy-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/core/config/HierarchyRuleComparisonTest.java
+++ b/test/script-cases/script-runtime-with-groovy/hierarchy-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/core/config/HierarchyRuleComparisonTest.java
@@ -29,7 +29,7 @@ import java.util.function.BiFunction;
import org.apache.skywalking.oap.server.core.query.type.Service;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
-import org.apache.skywalking.oap.server.core.config.compiler.CompiledHierarchyRuleProvider;
+import org.apache.skywalking.oap.server.core.config.v2.compiler.CompiledHierarchyRuleProvider;
import org.yaml.snakeyaml.Yaml;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/test/script-cases/script-runtime-with-groovy/lal-v1-with-groovy/pom.xml b/test/script-cases/script-runtime-with-groovy/lal-v1-with-groovy/pom.xml
index fe98943a8c..c6aecfe45b 100644
--- a/test/script-cases/script-runtime-with-groovy/lal-v1-with-groovy/pom.xml
+++ b/test/script-cases/script-runtime-with-groovy/lal-v1-with-groovy/pom.xml
@@ -33,6 +33,11 @@
<artifactId>log-analyzer</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>mal-v1-with-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
diff --git a/test/script-cases/script-runtime-with-groovy/lal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/LalExpression.java b/test/script-cases/script-runtime-with-groovy/lal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/LalExpression.java
deleted file mode 100644
index f96b02f485..0000000000
--- a/test/script-cases/script-runtime-with-groovy/lal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/log/analyzer/dsl/LalExpression.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.log.analyzer.dsl;
-
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.filter.FilterSpec;
-
-/**
- * Pure Java replacement for Groovy-based LAL DelegatingScript.
- * Each transpiled LAL expression implements this interface.
- */
-@FunctionalInterface
-public interface LalExpression {
- void execute(FilterSpec filterSpec, Binding binding);
-}
diff --git a/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/lal/LalComparisonTest.java b/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/lal/LalComparisonTest.java
index 7b70844715..3d87ea2807 100644
--- a/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/lal/LalComparisonTest.java
+++ b/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/lal/LalComparisonTest.java
@@ -32,13 +32,10 @@ import org.apache.skywalking.apm.network.logging.v3.JSONLog;
import org.apache.skywalking.apm.network.logging.v3.LogData;
import org.apache.skywalking.apm.network.logging.v3.LogDataBody;
import org.apache.skywalking.apm.network.logging.v3.LogTags;
-import org.apache.skywalking.oap.log.analyzer.compiler.LALClassGenerator;
-import org.apache.skywalking.oap.log.analyzer.dsl.Binding;
-import org.apache.skywalking.oap.log.analyzer.dsl.DSL;
-import org.apache.skywalking.oap.log.analyzer.dsl.spec.filter.FilterSpec;
-import org.apache.skywalking.oap.log.analyzer.module.LogAnalyzerModule;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig;
-import org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleProvider;
+import org.apache.skywalking.oap.log.analyzer.v2.compiler.LALClassGenerator;
+import org.apache.skywalking.oap.log.analyzer.v2.module.LogAnalyzerModule;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleConfig;
+import org.apache.skywalking.oap.log.analyzer.v2.provider.LogAnalyzerModuleProvider;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.config.ConfigService;
import org.apache.skywalking.oap.server.core.source.SourceReceiver;
@@ -57,14 +54,14 @@ import static org.mockito.Mockito.when;
/**
* Dual-path comparison test for LAL (Log Analysis Language) scripts.
- * For each LAL rule across all LAL YAML files:
* <ul>
- * <li>Path A (v1): Groovy compilation + runtime execution via {@link DSL}</li>
- * <li>Path B (v2): ANTLR4 + Javassist compilation via {@link LALClassGenerator}
- * + runtime execution via {@code LalExpression.execute(FilterSpec, Binding)}</li>
+ * <li>Path A (v1): Groovy via {@code org.apache.skywalking.oap.log.analyzer.dsl.DSL}</li>
+ * <li>Path B (v2): ANTLR4 + Javassist via {@link LALClassGenerator}</li>
* </ul>
- * Both paths are fed the same mock LogData and the resulting Binding state
- * (service, layer, tags, abort/save flags) is compared.
+ * Both paths are fed the same mock LogData and the resulting Binding state is compared.
+ *
+ * <p>v1 classes use original package {@code org.apache.skywalking.oap.log.analyzer.dsl.*},
+ * v2 classes use {@code org.apache.skywalking.oap.log.analyzer.v2.dsl.*}.
*/
class LalComparisonTest {
@@ -91,31 +88,39 @@ class LalComparisonTest {
final ModuleManager manager = buildMockModuleManager();
final LogData testLog = buildTestLogData(dsl);
- // ---- V1: Groovy path (via DSL.of which uses GroovyShell internally) ----
- Binding v1Binding = null;
+ // ---- V1: Groovy path ----
+ // v1 uses original packages: org.apache.skywalking.oap.log.analyzer.dsl.*
+ org.apache.skywalking.oap.log.analyzer.dsl.Binding v1Binding = null;
try {
- final DSL v1Dsl = DSL.of(manager, new LogAnalyzerModuleConfig(), dsl);
+ final org.apache.skywalking.oap.log.analyzer.dsl.DSL v1Dsl =
+ org.apache.skywalking.oap.log.analyzer.dsl.DSL.of(
+ manager,
+ new org.apache.skywalking.oap.log.analyzer.provider.LogAnalyzerModuleConfig(),
+ dsl);
disableSinkListeners(v1Dsl);
- v1Binding = new Binding().log(testLog);
+ v1Binding = new org.apache.skywalking.oap.log.analyzer.dsl.Binding().log(testLog);
v1Dsl.bind(v1Binding);
v1Dsl.evaluate();
} catch (Exception e) {
// V1 failed — skip comparison
}
- // ---- V2: ANTLR4 + Javassist compilation + execution ----
- Binding v2Binding = null;
+ // ---- V2: ANTLR4 + Javassist path ----
+ // v2 uses .v2. packages: org.apache.skywalking.oap.log.analyzer.v2.dsl.*
+ org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding v2Binding = null;
String v2Error = null;
try {
final LALClassGenerator generator = new LALClassGenerator();
- final org.apache.skywalking.oap.log.analyzer.dsl.LalExpression v2Expr =
+ final org.apache.skywalking.oap.log.analyzer.v2.dsl.LalExpression v2Expr =
generator.compile(dsl);
- final FilterSpec v2FilterSpec = new FilterSpec(manager, new LogAnalyzerModuleConfig());
+ final org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter.FilterSpec v2FilterSpec =
+ new org.apache.skywalking.oap.log.analyzer.v2.dsl.spec.filter.FilterSpec(
+ manager, new LogAnalyzerModuleConfig());
disableSinkListenersOnSpec(v2FilterSpec);
- v2Binding = new Binding().log(testLog);
+ v2Binding = new org.apache.skywalking.oap.log.analyzer.v2.dsl.Binding().log(testLog);
v2FilterSpec.bind(v2Binding);
v2Expr.execute(v2FilterSpec, v2Binding);
@@ -218,7 +223,7 @@ class LalComparisonTest {
}
}
- private void disableSinkListenersOnSpec(final FilterSpec filterSpec) {
+ private void disableSinkListenersOnSpec(final Object filterSpec) {
try {
setInternalField(filterSpec, "sinkListenerFactories", Collections.emptyList());
} catch (Exception e) {
diff --git a/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalComparisonTest.java b/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalComparisonTest.java
index 991dd0e317..b1885c008c 100644
--- a/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalComparisonTest.java
+++ b/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalComparisonTest.java
@@ -30,16 +30,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.google.common.collect.ImmutableMap;
import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALClassGenerator;
-import org.apache.skywalking.oap.meter.analyzer.dsl.DSL;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Expression;
-import org.apache.skywalking.oap.meter.analyzer.dsl.ExpressionMetadata;
-import org.apache.skywalking.oap.meter.analyzer.dsl.ExpressionParsingContext;
-import org.apache.skywalking.oap.meter.analyzer.dsl.MalExpression;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Result;
-import org.apache.skywalking.oap.meter.analyzer.dsl.Sample;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily;
-import org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALClassGenerator;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.ExpressionMetadata;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.yaml.snakeyaml.Yaml;
@@ -49,14 +41,14 @@ import static org.junit.jupiter.api.Assertions.fail;
/**
* Dual-path comparison test for MAL (Meter Analysis Language) expressions.
- * For each metric rule across all MAL YAML files:
* <ul>
- * <li>Path A (v1): Groovy compilation via upstream {@code DSL.parse()}</li>
- * <li>Path B (v2): ANTLR4 + Javassist compilation via {@link MALClassGenerator}</li>
+ * <li>Path A (v1): Groovy via {@code org.apache.skywalking.oap.meter.analyzer.dsl.DSL}</li>
+ * <li>Path B (v2): ANTLR4 + Javassist via {@link MALClassGenerator}</li>
* </ul>
- * Both paths run metadata extraction and runtime execution comparison.
- * Metadata: compare samples, scope, downsampling, aggregation labels.
- * Runtime: execute with mock SampleFamily data and compare output.
+ *
+ * <p>v1 classes use original package {@code org.apache.skywalking.oap.meter.analyzer.dsl.*},
+ * v2 classes use {@code org.apache.skywalking.oap.meter.analyzer.v2.dsl.*}.
+ * Both are called via hard-coded typed references (no reflection).
*/
@Slf4j
class MalComparisonTest {
@@ -89,18 +81,19 @@ class MalComparisonTest {
private void compareExpression(final String metricName,
final String expression) throws Exception {
- // ---- V1: Groovy path ----
- Expression v1Expr = null;
- ExpressionParsingContext v1Ctx = null;
+ // ---- V1: Groovy path (original packages) ----
+ org.apache.skywalking.oap.meter.analyzer.dsl.Expression v1Expr = null;
+ org.apache.skywalking.oap.meter.analyzer.dsl.ExpressionParsingContext v1Ctx = null;
try {
- v1Expr = DSL.parse(metricName, expression);
+ v1Expr = org.apache.skywalking.oap.meter.analyzer.dsl.DSL.parse(
+ metricName, expression);
v1Ctx = v1Expr.parse();
} catch (Exception e) {
// V1 failed - skip comparison
}
- // ---- V2: ANTLR4 + Javassist compilation ----
- MalExpression v2MalExpr = null;
+ // ---- V2: ANTLR4 + Javassist (.v2. packages) ----
+ org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalExpression v2MalExpr = null;
ExpressionMetadata v2Meta = null;
String v2Error = null;
try {
@@ -113,11 +106,9 @@ class MalComparisonTest {
// ---- Compare metadata ----
if (v1Ctx == null && v2Meta == null) {
- // Both failed — consistent behavior
return;
}
if (v1Ctx == null) {
- // V1 failed but v2 succeeded — v2 is more capable, OK
return;
}
if (v2Meta == null) {
@@ -125,12 +116,13 @@ class MalComparisonTest {
return;
}
- // Both succeeded - compare metadata
assertEquals(v1Ctx.getSamples(), v2Meta.getSamples(),
metricName + ": samples mismatch");
assertEquals(v1Ctx.getScopeType(), v2Meta.getScopeType(),
metricName + ": scopeType mismatch");
- assertEquals(v1Ctx.getDownsampling(), v2Meta.getDownsampling(),
+ assertEquals(
+ v1Ctx.getDownsampling() == null ? null : v1Ctx.getDownsampling().name(),
+ v2Meta.getDownsampling() == null ? null : v2Meta.getDownsampling().name(),
metricName + ": downsampling mismatch");
assertEquals(v1Ctx.isHistogram(), v2Meta.isHistogram(),
metricName + ": isHistogram mismatch");
@@ -143,25 +135,26 @@ class MalComparisonTest {
compareExecution(metricName, expression, v1Expr, v2MalExpr, v2Meta);
}
- private void compareExecution(final String metricName,
- final String expression,
- final Expression v1Expr,
- final MalExpression v2MalExpr,
- final ExpressionMetadata v2Meta) {
+ private void compareExecution(
+ final String metricName,
+ final String expression,
+ final org.apache.skywalking.oap.meter.analyzer.dsl.Expression v1Expr,
+ final org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalExpression v2MalExpr,
+ final ExpressionMetadata v2Meta) {
final boolean hasIncrease = expression.contains(".increase(")
|| expression.contains(".rate(");
// For increase()/rate(), prime the CounterWindow with initial data
if (hasIncrease) {
try {
- v1Expr.run(buildMockData(metricName, expression, v2Meta));
+ v1Expr.run(buildV1MockData(metricName, expression, v2Meta));
} catch (Exception ignored) {
}
try {
- final Map<String, SampleFamily> primeData =
- buildMockData(metricName, expression, v2Meta);
- for (final SampleFamily s : primeData.values()) {
- if (s != SampleFamily.EMPTY) {
+ final Map<String, org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily> primeData =
+ buildV2MockData(metricName, expression, v2Meta);
+ for (final org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily s : primeData.values()) {
+ if (s != org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily.EMPTY) {
s.context.setMetricName(metricName);
}
}
@@ -170,26 +163,25 @@ class MalComparisonTest {
}
}
- // Build fresh test data for actual comparison
- final Map<String, SampleFamily> v1Data =
- buildMockData(metricName, expression, v2Meta);
- final Map<String, SampleFamily> v2Data =
- buildMockData(metricName, expression, v2Meta);
+ // Build fresh test data
+ final Map<String, org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily> v1Data =
+ buildV1MockData(metricName, expression, v2Meta);
+ final Map<String, org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily> v2Data =
+ buildV2MockData(metricName, expression, v2Meta);
// V1 run
- Result v1Result;
+ org.apache.skywalking.oap.meter.analyzer.dsl.Result v1Result;
try {
v1Result = v1Expr.run(v1Data);
} catch (Exception e) {
- // V1 runtime failed — skip comparison
return;
}
// V2 run
- SampleFamily v2Sf;
+ org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily v2Sf;
try {
- for (final SampleFamily s : v2Data.values()) {
- if (s != SampleFamily.EMPTY) {
+ for (final org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily s : v2Data.values()) {
+ if (s != org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily.EMPTY) {
s.context.setMetricName(metricName);
}
}
@@ -203,7 +195,8 @@ class MalComparisonTest {
}
// Compare results
- final boolean v2Success = v2Sf != null && v2Sf != SampleFamily.EMPTY;
+ final boolean v2Success = v2Sf != null
+ && v2Sf != org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily.EMPTY;
assertEquals(v1Result.isSuccess(), v2Success,
metricName + ": success mismatch (v1=" + v1Result.isSuccess()
+ ", v2=" + v2Success + ")");
@@ -213,61 +206,164 @@ class MalComparisonTest {
}
}
- private Map<String, SampleFamily> buildMockData(final String metricName,
- final String expression,
- final ExpressionMetadata meta) {
- final Map<String, SampleFamily> data = new HashMap<>();
- final long now = timestampCounter++;
+ // ==================== V1 mock data (original packages) ====================
- // Extract tagEqual constraints from the expression
+ private Map<String, org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily> buildV1MockData(
+ final String metricName, final String expression,
+ final ExpressionMetadata meta) {
+ final Map<String, org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily> data =
+ new HashMap<>();
+ final long now = timestampCounter++;
final Map<String, String> tagEqualLabels = extractTagEqualLabels(expression);
for (final String sampleName : meta.getSamples()) {
- // Build labels from aggregation labels
final Map<String, String> labels = new HashMap<>();
for (final String label : meta.getAggregationLabels()) {
labels.put(label, inferLabelValue(label, tagEqualLabels));
}
- // Also add tagEqual labels not in aggregation labels
labels.putAll(tagEqualLabels);
if (meta.isHistogram()) {
+ data.put(sampleName, buildV1HistogramSamples(sampleName, labels, now));
+ } else {
+ final org.apache.skywalking.oap.meter.analyzer.dsl.Sample sample =
+ org.apache.skywalking.oap.meter.analyzer.dsl.Sample.builder()
+ .name(sampleName)
+ .labels(ImmutableMap.copyOf(labels))
+ .value(100.0)
+ .timestamp(now)
+ .build();
data.put(sampleName,
- buildHistogramSamples(sampleName, labels, now));
+ org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder
+ .newBuilder(sample).build());
+ }
+ }
+ return data;
+ }
+
+ private org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily buildV1HistogramSamples(
+ final String sampleName, final Map<String, String> baseLabels,
+ final long timestamp) {
+ final List<org.apache.skywalking.oap.meter.analyzer.dsl.Sample> samples =
+ new ArrayList<>();
+ double cumulativeValue = 0;
+ for (final String le : HISTOGRAM_LE_VALUES) {
+ cumulativeValue += 10.0;
+ final Map<String, String> labels = new HashMap<>(baseLabels);
+ labels.put("le", le);
+ samples.add(org.apache.skywalking.oap.meter.analyzer.dsl.Sample.builder()
+ .name(sampleName)
+ .labels(ImmutableMap.copyOf(labels))
+ .value(cumulativeValue)
+ .timestamp(timestamp)
+ .build());
+ }
+ return org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamilyBuilder.newBuilder(
+ samples.toArray(new org.apache.skywalking.oap.meter.analyzer.dsl.Sample[0])).build();
+ }
+
+ // ==================== V2 mock data (.v2. packages) ====================
+
+ private Map<String, org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily> buildV2MockData(
+ final String metricName, final String expression,
+ final ExpressionMetadata meta) {
+ final Map<String, org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily> data =
+ new HashMap<>();
+ final long now = timestampCounter++;
+ final Map<String, String> tagEqualLabels = extractTagEqualLabels(expression);
+
+ for (final String sampleName : meta.getSamples()) {
+ final Map<String, String> labels = new HashMap<>();
+ for (final String label : meta.getAggregationLabels()) {
+ labels.put(label, inferLabelValue(label, tagEqualLabels));
+ }
+ labels.putAll(tagEqualLabels);
+
+ if (meta.isHistogram()) {
+ data.put(sampleName, buildV2HistogramSamples(sampleName, labels, now));
} else {
- final Sample sample = Sample.builder()
- .name(sampleName)
- .labels(ImmutableMap.copyOf(labels))
- .value(100.0)
- .timestamp(now)
- .build();
+ final org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample sample =
+ org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample.builder()
+ .name(sampleName)
+ .labels(ImmutableMap.copyOf(labels))
+ .value(100.0)
+ .timestamp(now)
+ .build();
data.put(sampleName,
- SampleFamilyBuilder.newBuilder(sample).build());
+ org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder
+ .newBuilder(sample).build());
}
}
return data;
}
- private SampleFamily buildHistogramSamples(final String sampleName,
- final Map<String, String> baseLabels,
- final long timestamp) {
- final List<Sample> samples = new ArrayList<>();
+ private org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily buildV2HistogramSamples(
+ final String sampleName, final Map<String, String> baseLabels,
+ final long timestamp) {
+ final List<org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample> samples =
+ new ArrayList<>();
double cumulativeValue = 0;
for (final String le : HISTOGRAM_LE_VALUES) {
cumulativeValue += 10.0;
final Map<String, String> labels = new HashMap<>(baseLabels);
labels.put("le", le);
- samples.add(Sample.builder()
+ samples.add(org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample.builder()
.name(sampleName)
.labels(ImmutableMap.copyOf(labels))
.value(cumulativeValue)
.timestamp(timestamp)
.build());
}
- return SampleFamilyBuilder.newBuilder(
- samples.toArray(new Sample[0])).build();
+ return org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamilyBuilder.newBuilder(
+ samples.toArray(
+ new org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample[0])).build();
+ }
+
+ // ==================== Cross-version comparison ====================
+
+ private static void compareSampleFamilies(
+ final String metricName,
+ final org.apache.skywalking.oap.meter.analyzer.dsl.SampleFamily v1Sf,
+ final org.apache.skywalking.oap.meter.analyzer.v2.dsl.SampleFamily v2Sf) {
+ final org.apache.skywalking.oap.meter.analyzer.dsl.Sample[] v1Sorted =
+ sortV1Samples(v1Sf.samples);
+ final org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample[] v2Sorted =
+ sortV2Samples(v2Sf.samples);
+
+ assertEquals(v1Sorted.length, v2Sorted.length,
+ metricName + ": output sample count mismatch (v1="
+ + v1Sorted.length + ", v2=" + v2Sorted.length + ")");
+
+ for (int i = 0; i < v1Sorted.length; i++) {
+ assertEquals(v1Sorted[i].getLabels(), v2Sorted[i].getLabels(),
+ metricName + ": output sample[" + i + "] labels mismatch");
+ assertEquals(v1Sorted[i].getValue(), v2Sorted[i].getValue(), 0.001,
+ metricName + ": output sample[" + i + "] value mismatch"
+ + " (v1=" + v1Sorted[i].getValue()
+ + ", v2=" + v2Sorted[i].getValue() + ")");
+ }
+ }
+
+ private static org.apache.skywalking.oap.meter.analyzer.dsl.Sample[] sortV1Samples(
+ final org.apache.skywalking.oap.meter.analyzer.dsl.Sample[] samples) {
+ final org.apache.skywalking.oap.meter.analyzer.dsl.Sample[] sorted =
+ Arrays.copyOf(samples, samples.length);
+ Arrays.sort(sorted, (a, b) -> a.getLabels().toString().compareTo(
+ b.getLabels().toString()));
+ return sorted;
+ }
+
+ private static org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample[] sortV2Samples(
+ final org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample[] samples) {
+ final org.apache.skywalking.oap.meter.analyzer.v2.dsl.Sample[] sorted =
+ Arrays.copyOf(samples, samples.length);
+ Arrays.sort(sorted, (a, b) -> a.getLabels().toString().compareTo(
+ b.getLabels().toString()));
+ return sorted;
}
+ // ==================== Helpers ====================
+
private static Map<String, String> extractTagEqualLabels(final String expression) {
final Map<String, String> labels = new HashMap<>();
final Matcher matcher = TAG_EQUAL_PATTERN.matcher(expression);
@@ -279,7 +375,6 @@ class MalComparisonTest {
private static String inferLabelValue(final String label,
final Map<String, String> tagEqualLabels) {
- // If tagEqual specifies this label, use that value
if (tagEqualLabels.containsKey(label)) {
return tagEqualLabels.get(label);
}
@@ -313,36 +408,7 @@ class MalComparisonTest {
}
}
- private static void compareSampleFamilies(final String metricName,
- final SampleFamily v1Sf,
- final SampleFamily v2Sf) {
- // Sort both sample arrays by labels for stable comparison
- final Sample[] v1Sorted = sortSamples(v1Sf.samples);
- final Sample[] v2Sorted = sortSamples(v2Sf.samples);
-
- assertEquals(v1Sorted.length, v2Sorted.length,
- metricName + ": output sample count mismatch (v1="
- + v1Sorted.length + ", v2=" + v2Sorted.length + ")");
-
- for (int i = 0; i < v1Sorted.length; i++) {
- assertEquals(v1Sorted[i].getLabels(), v2Sorted[i].getLabels(),
- metricName + ": output sample[" + i + "] labels mismatch");
- assertEquals(v1Sorted[i].getValue(), v2Sorted[i].getValue(), 0.001,
- metricName + ": output sample[" + i + "] value mismatch"
- + " (v1=" + v1Sorted[i].getValue()
- + ", v2=" + v2Sorted[i].getValue() + ")");
- }
- }
-
- private static Sample[] sortSamples(final Sample[] samples) {
- final Sample[] sorted = Arrays.copyOf(samples, samples.length);
- Arrays.sort(sorted, (a, b) -> {
- final String aKey = a.getLabels().toString();
- final String bKey = b.getLabels().toString();
- return aKey.compareTo(bKey);
- });
- return sorted;
- }
+ // ==================== YAML loading ====================
@SuppressWarnings("unchecked")
private Map<String, List<MalRule>> loadAllMalYamlFiles() throws Exception {
diff --git a/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalFilterComparisonTest.java b/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalFilterComparisonTest.java
index 4c7d121f60..7db7b94733 100644
--- a/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalFilterComparisonTest.java
+++ b/test/script-cases/script-runtime-with-groovy/mal-lal-v1-v2-checker/src/test/java/org/apache/skywalking/oap/server/checker/mal/MalFilterComparisonTest.java
@@ -29,8 +29,8 @@ import java.util.Map;
import java.util.Set;
import groovy.lang.Closure;
import groovy.lang.GroovyShell;
-import org.apache.skywalking.oap.meter.analyzer.compiler.MALClassGenerator;
-import org.apache.skywalking.oap.meter.analyzer.dsl.MalFilter;
+import org.apache.skywalking.oap.meter.analyzer.v2.compiler.MALClassGenerator;
+import org.apache.skywalking.oap.meter.analyzer.v2.dsl.MalFilter;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.TestFactory;
import org.yaml.snakeyaml.Yaml;
diff --git a/test/script-cases/script-runtime-with-groovy/mal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalFilter.java b/test/script-cases/script-runtime-with-groovy/mal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalFilter.java
deleted file mode 100644
index 9d8eaa259e..0000000000
--- a/test/script-cases/script-runtime-with-groovy/mal-v1-with-groovy/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/MalFilter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.skywalking.oap.meter.analyzer.dsl;
-
-import java.util.Map;
-
-/**
- * Pure Java replacement for Groovy Closure-based MAL filter expressions.
- * Each transpiled filter expression implements this interface.
- */
-@FunctionalInterface
-public interface MalFilter {
- boolean test(Map<String, String> tags);
-}