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

Merge branch 'master' into ilucky-postgresql

This commit is contained in:
吴晟 Wu Sheng 2019-04-09 22:57:51 +08:00 committed by GitHub
parent 187ebe056a 9ab568faf2
commit 973abe539f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/powered-by.md
View File

@ -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/

12
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceModuleProvider.java
View File

@ -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);

8
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java
View File

@ -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;
}