From 5355fc462a2dbeca78c44d15abea0b067e534116 Mon Sep 17 00:00:00 2001
From: pengys5 <8082209@qq.com>
Date: Fri, 11 Aug 2017 22:47:39 +0800
Subject: [PATCH] Span web Ui test success.

#351
---
 .../skywalking/apm/collector/ui/service/SpanService.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java
index b0e68267b..bbc9f02fa 100644
--- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java
+++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java
@@ -4,6 +4,7 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import java.util.List;
 import org.skywalking.apm.collector.storage.dao.DAOContainer;
+import org.skywalking.apm.collector.ui.cache.ServiceNameCache;
 import org.skywalking.apm.collector.ui.dao.ISegmentDAO;
 import org.skywalking.apm.network.proto.KeyWithStringValue;
 import org.skywalking.apm.network.proto.LogMessage;
@@ -23,7 +24,11 @@ public class SpanService {
         List<SpanObject> spans = segmentObject.getSpansList();
         for (SpanObject spanObject : spans) {
             if (spanId == spanObject.getSpanId()) {
-                spanJson.addProperty("operationName", spanObject.getOperationName());
+                String operationName = spanObject.getOperationName();
+                if (spanObject.getOperationNameId() != 0) {
+                    operationName = ServiceNameCache.get(spanObject.getOperationNameId());
+                }
+                spanJson.addProperty("operationName", operationName);
                 spanJson.addProperty("startTime", spanObject.getStartTime());
                 spanJson.addProperty("endTime", spanObject.getEndTime());