You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/06/25 14:32:15 UTC
[incubator-skywalking] branch master updated: [Collector] Tolerate
and ignore unsupport segments (#1385)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new b35eaac [Collector] Tolerate and ignore unsupport segments (#1385)
b35eaac is described below
commit b35eaace792146ea0379da47273177e66a8b897a
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Mon Jun 25 22:32:12 2018 +0800
[Collector] Tolerate and ignore unsupport segments (#1385)
* #1207
Return true when segment parse throw exception to avoid parse the segment over and over again which read from buffer file.
* no message
---
.../metric/provider/AnalysisMetricModuleProvider.java | 16 ++++++++--------
.../segment/parser/provider/parser/SegmentParse.java | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java
index 4258a28..35db2d9 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java
@@ -100,14 +100,14 @@ public class AnalysisMetricModuleProvider extends ModuleProvider {
private void segmentParserListenerRegister() {
ISegmentParserListenerRegister segmentParserListenerRegister = getManager().find(AnalysisSegmentParserModule.NAME).getService(ISegmentParserListenerRegister.class);
- segmentParserListenerRegister.register(new ServiceReferenceMetricSpanListener.Factory()); //11000TPS
- segmentParserListenerRegister.register(new ApplicationComponentSpanListener.Factory()); //17000TPS
- segmentParserListenerRegister.register(new ApplicationMappingSpanListener.Factory()); //22000TPS
- segmentParserListenerRegister.register(new InstanceMappingSpanListener.Factory()); //22000TPS
- segmentParserListenerRegister.register(new GlobalTraceSpanListener.Factory()); //15000TPS
- segmentParserListenerRegister.register(new SegmentDurationSpanListener.Factory()); //13000TPS
- segmentParserListenerRegister.register(new ResponseTimeDistributionSpanListener.Factory()); //25000TPS
- segmentParserListenerRegister.register(new ServiceNameSpanListener.Factory()); //20000TPS
+ segmentParserListenerRegister.register(new ServiceReferenceMetricSpanListener.Factory());
+ segmentParserListenerRegister.register(new ApplicationComponentSpanListener.Factory());
+ segmentParserListenerRegister.register(new ApplicationMappingSpanListener.Factory());
+ segmentParserListenerRegister.register(new InstanceMappingSpanListener.Factory());
+ segmentParserListenerRegister.register(new GlobalTraceSpanListener.Factory());
+ segmentParserListenerRegister.register(new SegmentDurationSpanListener.Factory());
+ segmentParserListenerRegister.register(new ResponseTimeDistributionSpanListener.Factory());
+ segmentParserListenerRegister.register(new ServiceNameSpanListener.Factory());
}
private void graphCreate(WorkerCreateListener workerCreateListener) {
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
index 335cbab..2c6ef58 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
@@ -82,10 +82,10 @@ public class SegmentParse {
buildSegment(segmentCoreInfo.getSegmentId(), segmentDecorator.toByteArray());
return true;
}
- } catch (InvalidProtocolBufferException e) {
+ } catch (Throwable e) {
logger.error(e.getMessage(), e);
+ return true;
}
- return false;
}
@GraphComputingMetric(name = "/segment/parse/parseBinarySegment")