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 2019/06/09 14:00:39 UTC

[skywalking] 01/01: Move zipkin and jaeger span source to disable from metrics.

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch wrong_oal_parser
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 2a34c7942c77fab30a2550ed8980a23c32dd2364
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Jun 9 22:00:31 2019 +0800

    Move zipkin and jaeger span source to disable from metrics.
---
 .../main/antlr4/org/apache/skywalking/oal/tool/grammar/OALParser.g4  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/oap-server/generate-tool-grammar/src/main/antlr4/org/apache/skywalking/oal/tool/grammar/OALParser.g4 b/oap-server/generate-tool-grammar/src/main/antlr4/org/apache/skywalking/oal/tool/grammar/OALParser.g4
index f407c02..79127e4 100644
--- a/oap-server/generate-tool-grammar/src/main/antlr4/org/apache/skywalking/oal/tool/grammar/OALParser.g4
+++ b/oap-server/generate-tool-grammar/src/main/antlr4/org/apache/skywalking/oal/tool/grammar/OALParser.g4
@@ -54,13 +54,12 @@ source
       SRC_SERVICE_RELATION | SRC_SERVICE_INSTANCE_RELATION | SRC_ENDPOINT_RELATION |
       SRC_SERVICE_INSTANCE_JVM_CPU | SRC_SERVICE_INSTANCE_JVM_MEMORY | SRC_SERVICE_INSTANCE_JVM_MEMORY_POOL | SRC_SERVICE_INSTANCE_JVM_GC |// JVM source of service instance
       SRC_SERVICE_INSTANCE_CLR_CPU | SRC_SERVICE_INSTANCE_CLR_GC | SRC_SERVICE_INSTANCE_CLR_THREAD |
-      SRC_ENVOY_INSTANCE_METRIC |
-      SRC_ZIPKIN_SPAN | SRC_JAEGER_SPAN
+      SRC_ENVOY_INSTANCE_METRIC
     ;
 
 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_SERVICE_RELATION_CLIENT_SIDE | SRC_ALARM_RECORD | SRC_HTTP_ACCESS_LOG | SRC_ZIPKIN_SPAN | SRC_JAEGER_SPAN
     ;
 
 sourceAttribute