From 0a6bbe89345443eb42ff83ca0c0f467c463a3b73 Mon Sep 17 00:00:00 2001 From: Wooo0 <31612998+Wooo0@users.noreply.github.com> Date: Tue, 9 Apr 2019 17:37:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ADD=20Cdlhyj.com/=E5=85=AD=E5=90=88?= =?UTF-8?q?=E8=BF=9C=E6=95=99=20to=20powered-by=20page=20(#2461)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update powered-by.md * Update powered-by.md * Update powered-by.md Change order. --- docs/powered-by.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/powered-by.md b/docs/powered-by.md index 8861f0328..9ca955faa 100644 --- a/docs/powered-by.md +++ b/docs/powered-by.md @@ -15,6 +15,7 @@ or providing commercial products including Apache SkyWalking. 1. hellobanma 斑马网络 https://www.hellobanma.com/ 1. bestsign. 上上签. https://www.bestsign.cn/page/ 1. Bizsaas.cn 北京商云科技发展有限公司. http://www.bizsaas.cn/ +1. Cdlhyj.com 六合远教（成都）科技有限公司 http://www.cdlhyj.com 1. China Eastern Airlines 中国东方航空. http://www.ceair.com/ 1. Chehejia Automotive. 北京车和家信息技术有限责任公司. https://www.chehejia.com/ 1. Chinadaas. 北京中数智汇科技股份有限公司. https://www.chinadaas.com/ From 9ab568faf240713e8c8ce07787ddbad922d08d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 9 Apr 2019 18:18:13 +0800 Subject: [PATCH 2/2] Support shutdown the trace analysis. (#2463) --- .../receiver/trace/provider/TraceModuleProvider.java | 12 ++++++++---- .../trace/provider/TraceServiceModuleConfig.java | 8 ++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java index e346503a9..a47ec32ea 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java @@ -63,15 +63,19 @@ public class TraceModuleProvider extends ModuleProvider { moduleConfig.setDbLatencyThresholds(new DBLatencyThresholds(moduleConfig.getSlowDBAccessThreshold())); SegmentParserListenerManager listenerManager = new SegmentParserListenerManager(); - listenerManager.add(new MultiScopesSpanListener.Factory()); - listenerManager.add(new ServiceMappingSpanListener.Factory()); + if (moduleConfig.isTraceAnalysis()) { + listenerManager.add(new MultiScopesSpanListener.Factory()); + listenerManager.add(new ServiceMappingSpanListener.Factory()); + } listenerManager.add(new SegmentSpanListener.Factory(moduleConfig.getSampleRate())); segmentProducer = new SegmentParse.Producer(getManager(), listenerManager, moduleConfig); listenerManager = new SegmentParserListenerManager(); - listenerManager.add(new MultiScopesSpanListener.Factory()); - listenerManager.add(new ServiceMappingSpanListener.Factory()); + if (moduleConfig.isTraceAnalysis()) { + listenerManager.add(new MultiScopesSpanListener.Factory()); + listenerManager.add(new ServiceMappingSpanListener.Factory()); + } listenerManager.add(new SegmentSpanListener.Factory(moduleConfig.getSampleRate())); segmentProducerV2 = new SegmentParseV2.Producer(getManager(), listenerManager, moduleConfig); diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java index 8ebeec613..fce1ca7ea 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java @@ -39,4 +39,12 @@ public class TraceServiceModuleConfig extends ModuleConfig { */ @Setter @Getter private String slowDBAccessThreshold = "default:200"; @Setter @Getter private DBLatencyThresholds dbLatencyThresholds; + /** + * Analysis trace status. + * + * 1. Default(YES) means analysis all metric from trace. + * + * 2. NO means, only save trace, but metrics come other places, such as service mesh. + */ + @Setter @Getter private boolean traceAnalysis = true; }