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/07/15 06:00:02 UTC

[skywalking] 01/01: Fix wrong file parser

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

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

commit e15689280a946bda3bf18eff2a280dd6e01a3e53
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jul 15 13:59:49 2019 +0800

    Fix wrong file parser
---
 .../oap/server/receiver/trace/provider/TraceModuleProvider.java      | 2 +-
 .../parser/standardization/SegmentStandardizationWorker.java         | 5 +++--
 2 files changed, 4 insertions(+), 3 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 c548408..7074970 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
@@ -103,7 +103,7 @@ public class TraceModuleProvider extends ModuleProvider {
                 false);
             segmentProducer.setStandardizationWorker(standardizationWorker);
 
-            SegmentStandardizationWorker standardizationWorker2 = new SegmentStandardizationWorker(getManager(), segmentProducer,
+            SegmentStandardizationWorker standardizationWorker2 = new SegmentStandardizationWorker(getManager(), segmentProducerV2,
                 moduleConfig.getBufferPath(), moduleConfig.getBufferOffsetMaxFileSize(), moduleConfig.getBufferDataMaxFileSize(), moduleConfig.isBufferFileCleanWhenRestart(),
                 true);
             segmentProducerV2.setStandardizationWorker(standardizationWorker2);
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
index 5e363b0..3d3ee19 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
@@ -25,6 +25,7 @@ import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
 import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
 import org.apache.skywalking.oap.server.core.worker.AbstractWorker;
 import org.apache.skywalking.oap.server.library.buffer.BufferStream;
+import org.apache.skywalking.oap.server.library.buffer.DataStreamReader;
 import org.apache.skywalking.oap.server.library.module.ModuleDefineHolder;
 import org.apache.skywalking.oap.server.receiver.trace.provider.parser.SegmentParse;
 import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
@@ -42,7 +43,7 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
     private CounterMetrics traceBufferFileIn;
 
     public SegmentStandardizationWorker(ModuleDefineHolder moduleDefineHolder,
-        SegmentParse.Producer segmentParseCreator, String path, int offsetFileMaxSize,
+        DataStreamReader.CallBack callBack, String path, int offsetFileMaxSize,
         int dataFileMaxSize, boolean cleanWhenRestart, boolean isV6) throws IOException {
         super(moduleDefineHolder);
 
@@ -51,7 +52,7 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
         builder.dataFileMaxSize(dataFileMaxSize);
         builder.offsetFileMaxSize(offsetFileMaxSize);
         builder.parser(UpstreamSegment.parser());
-        builder.callBack(segmentParseCreator);
+        builder.callBack(callBack);
 
         BufferStream<UpstreamSegment> stream = builder.build();
         stream.initialize();