[GitHub] wu-sheng closed pull request #1385: [Collector] Tolerate and ignore unsupport segments

[GitBox <gi...@apache.org>]

wu-sheng closed pull request #1385: [Collector] Tolerate and ignore unsupport segments
URL: https://github.com/apache/incubator-skywalking/pull/1385
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 4258a2873..35db2d9e3 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 AnalysisMetricModuleProvider() {
 
     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 335cbab8f..2c6ef5812 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 boolean parse(UpstreamSegment segment, ISegmentParseService.Source source
                 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")


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services