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 2021/01/27 07:38:50 UTC
[skywalking] branch flexible-disable created (now 2018f95)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch flexible-disable
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 2018f95 Remove the strict rule of OAL disable statement parameter.
This branch includes the following new commits:
new 2018f95 Remove the strict rule of OAL disable statement parameter.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Remove the strict rule of OAL disable statement
parameter.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch flexible-disable
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 2018f95967e5e1c7ce36eb4c00c49735c2097790
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Jan 27 15:38:35 2021 +0800
Remove the strict rule of OAL disable statement parameter.
---
CHANGES.md | 11 ++++++-----
.../org/apache/skywalking/oal/rt/grammar/OALLexer.g4 | 18 ------------------
.../org/apache/skywalking/oal/rt/grammar/OALParser.g4 | 4 +---
3 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index d3f256d..ae746e9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -67,16 +67,17 @@ Release Notes.
* Fix `SharingServerConfig`'s propertie is not correct in the `application.yml`, contextPath -> restConnextPath.
* Istio control plane: remove redundant metrics and polish panel layout.
* Fix bug endpoint name grouping not work due to setting service name and endpoint name out of order.
-* Fix receiver analysis error count metrics
-* Log collecting and query implementation
-* Support Alarm to feishu
+* Fix receiver analysis error count metrics.
+* Log collecting and query implementation.
+* Support Alarm to feishu.
* Add the implementation of ConfigurationDiscovery on the OAP side.
* Fix bug in `parseInternalErrorCode` where some error codes are never reached.
-* OAL supports multiple values when as numeric
+* OAL supports multiple values when as numeric.
* Add node information from the Openensus proto to the labels of the samples, to support the identification of the source of the Metric data.
* Fix bug that the same sample name in one MAL expression caused `IllegalArgumentException` in `Analyzer.analyse`.
* Add the text analyzer for querying log in the es storage.
-* Chore: Remove duplicate codes in Envoy ALS handler
+* Chore: Remove duplicate codes in Envoy ALS handler.
+* Remove the strict rule of OAL disable statement parameter.
#### UI
* Fix un-removed tags in trace query.
diff --git a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4 b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
index 339d9c7..8c3acdd 100644
--- a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
+++ b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALLexer.g4
@@ -53,24 +53,6 @@ SRC_BROWSER_APP_TRAFFIC: 'BrowserAppTraffic';
SRC_BROWSER_APP_PAGE_TRAFFIC: 'BrowserAppPageTraffic';
SRC_BROWSER_APP_SINGLE_VERSION_TRAFFIC: 'BrowserAppSingleVersionTraffic';
-//hard code entities, only used when need to be deactived.
-//Disable is targeting @Stream#name
-SRC_SEGMENT: 'segment';
-SRC_TOP_N_DB_STATEMENT: 'top_n_database_statement';
-SRC_ENDPOINT_RELATION_SERVER_SIDE: 'endpoint_relation_server_side';
-SRC_SERVICE_RELATION_SERVER_SIDE: 'service_relation_server_side';
-SRC_SERVICE_RELATION_CLIENT_SIDE: 'service_relation_client_side';
-SRC_ALARM_RECORD: 'alarm_record';
-SRC_HTTP_ACCESS_LOG: 'http_access_log';
-
-SRC_ZIPKIN_SPAN: 'zipkin_span';
-SRC_JAEGER_SPAN: 'jaeger_span';
-SRC_PROFILE_TASK: 'profile_task';
-SRC_PROFILE_TASK_LOG: 'profile_task_log';
-SRC_PROFILE_THREAD_SHANPSHOT: 'profile_task_segment_snapshot';
-
-SRC_BROWSER_ERROR_LOG: 'browser_error_log';
-
// Constructors symbols
DOT: '.';
diff --git a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4 b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
index 4fb74ac..71b030a 100644
--- a/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
+++ b/oap-server/oal-grammar/src/main/antlr4/org/apache/skywalking/oal/rt/grammar/OALParser.g4
@@ -60,9 +60,7 @@ source
;
disableSource
- : SRC_SEGMENT | SRC_TOP_N_DB_STATEMENT | SRC_ENDPOINT_RELATION_SERVER_SIDE | SRC_SERVICE_RELATION_SERVER_SIDE |
- SRC_SERVICE_RELATION_CLIENT_SIDE | SRC_ALARM_RECORD | SRC_HTTP_ACCESS_LOG | SRC_ZIPKIN_SPAN | SRC_JAEGER_SPAN |
- SRC_PROFILE_TASK | SRC_PROFILE_TASK_LOG | SRC_PROFILE_THREAD_SHANPSHOT
+ : IDENTIFIER
;
sourceAttributeStmt