[skywalking] branch master updated: fix issue #2979 (#2980)

[wusheng]

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/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c85693  fix issue #2979 (#2980)
6c85693 is described below

commit 6c85693ca17add6626ec77d6b72931f0d3e09ab4
Author: zhousiliang163 <zhousiliang...@163.com>
AuthorDate: Tue Jul 2 11:34:20 2019 +0800

    fix issue #2979 (#2980)
    
    * fix issue #2979
    
    * remove the unused import, which causes the CI failed
---
 .../provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java
 
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java
index 827d5f7..2be3a1f 100644
--- 
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java
+++ 
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v6/grpc/TraceSegmentReportServiceHandler.java
@@ -24,7 +24,6 @@ import 
org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
 import 
org.apache.skywalking.apm.network.language.agent.v2.TraceSegmentReportServiceGrpc;
 import org.apache.skywalking.oap.server.library.module.ModuleManager;
 import org.apache.skywalking.oap.server.library.server.grpc.GRPCHandler;
-import 
org.apache.skywalking.oap.server.receiver.trace.provider.handler.v5.grpc.TraceSegmentServiceHandler;
 import 
org.apache.skywalking.oap.server.receiver.trace.provider.parser.SegmentParseV2;
 import 
org.apache.skywalking.oap.server.receiver.trace.provider.parser.SegmentSource;
 import org.apache.skywalking.oap.server.telemetry.TelemetryModule;
@@ -34,7 +33,7 @@ import org.slf4j.LoggerFactory;
 
 public class TraceSegmentReportServiceHandler extends 
TraceSegmentReportServiceGrpc.TraceSegmentReportServiceImplBase implements 
GRPCHandler {
 
-    private static final Logger logger = 
LoggerFactory.getLogger(TraceSegmentServiceHandler.class);
+    private static final Logger logger = 
LoggerFactory.getLogger(TraceSegmentReportServiceHandler.class);
 
     private final SegmentParseV2.Producer segmentProducer;
     private HistogramMetrics histogram;