Merge pull request pinpoint-apm#1371 from jaehong-kim/jsp-to-json

Jsp to json

Author: jaehong-kim

web/src/main/java/com/navercorp/pinpoint/web/controller/BusinessTransactionController.java

@@ -25,6 +25,7 @@
 import com.navercorp.pinpoint.common.util.DefaultSqlParser;
 import com.navercorp.pinpoint.common.util.OutputParameterParser;
 import com.navercorp.pinpoint.common.util.SqlParser;
+import com.navercorp.pinpoint.web.view.TransactionInfoViewModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,61 +90,6 @@ public class BusinessTransactionController {
     private SqlParser sqlParser = new DefaultSqlParser();
     private OutputParameterParser parameterParser = new OutputParameterParser();
 
-    /**
-     * executed URLs in applicationname query within from ~ to timeframe
-     *
-     * @param model
-     * @param applicationName
-     * @param from
-     * @param to
-     * @return
-     */
-    @Deprecated
-    @RequestMapping(value = "/transactionList", method = RequestMethod.GET)
-    @ResponseBody
-    public Model getBusinessTransactionsData(Model model,
-                                             @RequestParam("application") String applicationName,
-                                             @RequestParam("from") long from,
-                                             @RequestParam("to") long to,
-                                             @RequestParam(value = "filter", required = false) String filterText,
-                                             @RequestParam(value = "limit", required = false, defaultValue = "10000") int limit) {
-        limit = LimitUtils.checkRange(limit);
-        Range range = new Range(from, to);
-        // TODO more refactoring needed: partially separated out server map lookup logic.
-        LimitedScanResult<List<TransactionId>> traceIdList = filteredMapService.selectTraceIdsFromApplicationTraceIndex(applicationName, range, limit);
-
-        Filter filter = filterBuilder.build(filterText);
-        BusinessTransactions selectBusinessTransactions = transactionInfoService.selectBusinessTransactions(traceIdList.getScanData(), applicationName, range, filter);
-
-        model.addAttribute("lastFetchedTimestamp", traceIdList.getLimitedTime());
-        model.addAttribute("rpcList", selectBusinessTransactions.getBusinessTransaction());
-        model.addAttribute("requestList", selectBusinessTransactions.getBusinessTransaction());
-        model.addAttribute("scatterList", selectBusinessTransactions.getBusinessTransaction());
-        model.addAttribute("applicationName", applicationName);
-        model.addAttribute("from", new Date(from));
-        model.addAttribute("to", new Date(to));
-        model.addAttribute("urlCount", selectBusinessTransactions.getURLCount());
-        model.addAttribute("totalCount", selectBusinessTransactions.getTotalCallCount());
-        model.addAttribute("filterText", filterText);
-        model.addAttribute("filter", filter);
-        // Deprecated jsp -> need json dump
-        return model;
-    }
-
-    @Deprecated
-    @RequestMapping(value = "/lastTransactionList", method = RequestMethod.GET)
-    @ResponseBody
-    public Model getLastBusinessTransactionsData(Model model, HttpServletResponse response,
-                                                 @RequestParam("application") String applicationName,
-                                                 @RequestParam("period") long period,
-                                                 @RequestParam(value = "filter", required = false) String filterText,
-                                                 @RequestParam(value = "limit", required = false, defaultValue = "10000") int limit) {
-        limit = LimitUtils.checkRange(limit);
-        long to = TimeUtils.getDelayLastTime();
-        long from = to - period;
-        return getBusinessTransactionsData(model, applicationName, from, to, filterText, limit);
-    }
-
     /**
      * info lookup for a selected transaction
      *
@@ -152,63 +98,24 @@ public Model getLastBusinessTransactionsData(Model model, HttpServletResponse re
      * @return
      */
     @RequestMapping(value = "/transactionInfo", method = RequestMethod.GET)
-    public ModelAndView transactionInfo(@RequestParam("traceId") String traceIdParam,
+    @ResponseBody
+    public TransactionInfoViewModel transactionInfo(@RequestParam("traceId") String traceIdParam,
                                         @RequestParam(value = "focusTimestamp", required = false, defaultValue = "0") long focusTimestamp,
                                         @RequestParam(value = "v", required = false, defaultValue = "0") int viewVersion,
                                         HttpServletResponse response) {
         logger.debug("traceId:{}", traceIdParam);
-
         final TransactionId traceId = new TransactionId(traceIdParam);
 
         // select spans
         final SpanResult spanResult = this.spanService.selectSpan(traceId, focusTimestamp);
         final CallTreeIterator callTreeIterator = spanResult.getCallTree();
 
-        if (callTreeIterator.isEmpty()) {
-            // TODO fix error page.
-            final ModelAndView error = new ModelAndView();
-            // redefine errorCode.???
-            error.addObject("errorCode", 9);
-            error.addObject("message", "Trace not found. traceId:" + traceId);
-            error.setViewName("error");
-            return error;
-        }
-
-        final ModelAndView mv = new ModelAndView();
-        // debug
-        mv.addObject("spanList", callTreeIterator.values());
-
-        mv.addObject("traceId", traceId);
-
         // application map
         ApplicationMap map = filteredMapService.selectApplicationMap(traceId);
-        mv.addObject("nodes", map.getNodes());
-        mv.addObject("links", map.getLinks());
-
-        // call stacks
         RecordSet recordSet = this.transactionInfoService.createRecordSet(callTreeIterator, focusTimestamp);
-        mv.addObject("recordSet", recordSet);
-
-        mv.addObject("applicationName", recordSet.getApplicationName());
-        mv.addObject("callstack", recordSet.getRecordList());
-        mv.addObject("timeline", recordSet.getRecordList());
-        mv.addObject("callstackStart", recordSet.getStartTime());
-        mv.addObject("callstackEnd", recordSet.getEndTime());
-        mv.addObject("completeState", spanResult.getCompleteTypeString());
-
-        mv.addObject("logLinkEnable", logLinkEnable);
-        mv.addObject("loggingTransactionInfo", recordSet.isLoggingTransactionInfo());
-        mv.addObject("logButtonName", logButtonName);
-        mv.addObject("logPageUrl", logPageUrl);
-        mv.addObject("disableButtonMessage", disableButtonMessage);
-
-        if (viewVersion == 2) {
-            // TODO remove hashformat
-            mv.setViewName("transactionInfoJsonHash");
-        } else {
-            mv.setViewName("transactionInfoJson");
-        }
-        return mv;
+
+        TransactionInfoViewModel result = new TransactionInfoViewModel(traceId, map.getNodes(), map.getLinks(), recordSet, spanResult.getCompleteTypeString(), logLinkEnable, logButtonName, logPageUrl, disableButtonMessage);
+        return result;
     }
 
     @RequestMapping(value = "/sqlBind", method = RequestMethod.POST)

web/src/main/java/com/navercorp/pinpoint/web/controller/MapController.java

@@ -48,6 +48,7 @@
 /**
  * @author emeroad
  * @author netspider
+ * @author jaehong.kim
  */
 @Controller
 public class MapController {
@@ -224,90 +225,4 @@ public MapWrap getLastServerMapData(
         Application application = applicationFactory.createApplicationByTypeName(applicationName, serviceTypeName);
         return selectApplicationMap(application, range, searchOption);
     }
-
-    /**
-     * Possible deprecation expected when UI change push forward to pick a map first from UI
-     * Unfiltered server map request data query
-     *
-     * @param from
-     * @param to
-     * @param sourceApplicationName
-     * @param sourceServiceType
-     * @param targetApplicationName
-     * @param targetServiceType
-     * @return
-     */
-    @Deprecated
-    @RequestMapping(value = "/linkStatistics", method = RequestMethod.GET, params={"sourceServiceType", "targetServiceType"})
-    public ModelAndView getLinkStatistics(@RequestParam("from") long from,
-                                    @RequestParam("to") long to,
-                                    @RequestParam("sourceApplicationName") String sourceApplicationName,
-                                    @RequestParam("sourceServiceType") short sourceServiceType,
-                                    @RequestParam("targetApplicationName") String targetApplicationName,
-                                    @RequestParam("targetServiceType") short targetServiceType) {
-        final Application sourceApplication = this.applicationFactory.createApplication(sourceApplicationName, sourceServiceType);
-        final Application destinationApplication = this.applicationFactory.createApplication(targetApplicationName, targetServiceType);
-        final Range range = new Range(from, to);
-        return getLinkStatistics(sourceApplication, destinationApplication, range);
-    }
-
-    /**
-     * Possible deprecation expected when UI change push forward to pick a map first from UI
-     * Unfiltered server map request data query
-     *
-     * @param from
-     * @param to
-     * @param sourceApplicationName
-     * @param sourceServiceTypeName
-     * @param targetApplicationName
-     * @param sourceServiceTypeName
-     * @return
-     */
-    @Deprecated
-    @RequestMapping(value = "/linkStatistics", method = RequestMethod.GET, params={"sourceServiceTypeName", "targetServiceTypeName"})
-    public ModelAndView getLinkStatistics(@RequestParam("from") long from,
-                                    @RequestParam("to") long to,
-                                    @RequestParam("sourceApplicationName") String sourceApplicationName,
-                                    @RequestParam("sourceServiceTypeName") String sourceServiceTypeName,
-                                    @RequestParam("targetApplicationName") String targetApplicationName,
-                                    @RequestParam("targetServiceTypeName") String targetServiceTypeName) {
-
-        final Application sourceApplication = this.applicationFactory.createApplicationByTypeName(sourceApplicationName, sourceServiceTypeName);
-        final Application destinationApplication = this.applicationFactory.createApplicationByTypeName(targetApplicationName, targetServiceTypeName);
-        final Range range = new Range(from, to);
-        return getLinkStatistics(sourceApplication, destinationApplication, range);
-    }
-
-    private ModelAndView getLinkStatistics(Application sourceApplication, Application destinationApplication, Range range) {
-
-        NodeHistogram nodeHistogram = mapService.linkStatistics(sourceApplication, destinationApplication, range);
-
-        final ModelAndView mav = new ModelAndView("linkStatistics");
-        mav.addObject("range", range);
-
-        mav.addObject("sourceApplication", sourceApplication);
-
-        mav.addObject("targetApplication", destinationApplication);
-
-        Histogram applicationHistogram = nodeHistogram.getApplicationHistogram();
-        mav.addObject("linkStatistics", applicationHistogram);
-
-
-        List<ResponseTimeViewModel> applicationTimeSeriesHistogram = nodeHistogram.getApplicationTimeHistogram();
-        String applicationTimeSeriesHistogramJson = null;
-        try {
-            applicationTimeSeriesHistogramJson = MAPPER.writeValueAsString(applicationTimeSeriesHistogram);
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-        mav.addObject("timeSeriesHistogram", applicationTimeSeriesHistogramJson);
-
-        // looks like we need to specify "from, to" to the result. but data got passed thru as it is.
-        mav.addObject("resultFrom", range.getFrom());
-        mav.addObject("resultTo", range.getTo());
-
-        return mav;
-    }
-    @Deprecated
-    private final static ObjectMapper MAPPER = new ObjectMapper();
 }

web/src/main/java/com/navercorp/pinpoint/web/controller/ScatterChartController.java

@@ -30,6 +30,7 @@
 import com.navercorp.pinpoint.web.util.LimitUtils;
 import com.navercorp.pinpoint.web.util.TimeUtils;
 import com.navercorp.pinpoint.web.util.TimeWindow;
+import com.navercorp.pinpoint.web.view.TransactionMetaDataViewModel;
 import com.navercorp.pinpoint.web.vo.*;
 import com.navercorp.pinpoint.web.vo.scatter.Dot;
 import com.navercorp.pinpoint.web.vo.scatter.ScatterIndex;
@@ -43,11 +44,13 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 /**
  * @author netspider
  * @author emeroad
+ * @author jaehong.kim
  */
 @Controller
 public class ScatterChartController {
@@ -270,16 +273,17 @@ public ModelAndView getLastScatterData(
      * @return
      */
     @RequestMapping(value = "/transactionmetadata", method = RequestMethod.POST)
-    public String transactionmetadata(Model model, HttpServletRequest request, HttpServletResponse response) {
-
+    @ResponseBody
+    public TransactionMetaDataViewModel transactionmetadata(Model model, HttpServletRequest request, HttpServletResponse response) {
+        TransactionMetaDataViewModel viewModel = new TransactionMetaDataViewModel();
         TransactionMetadataQuery query = parseSelectTransaction(request);
+        ModelAndView mv = new ModelAndView();
         if (query.size() > 0) {
             List<SpanBo> metadata = scatter.selectTransactionMetadata(query);
-            model.addAttribute("metadata", metadata);
+            viewModel.setSpanBoList(metadata);
         }
 
-
-        return "transactionmetadata";
+        return viewModel;
     }
 
     private TransactionMetadataQuery parseSelectTransaction(HttpServletRequest request) {
@@ -300,88 +304,4 @@ private TransactionMetadataQuery parseSelectTransaction(HttpServletRequest reque
         logger.debug("query:{}", query);
         return query;
     }
-
-    /**
-     * transaction list query for selected points in scatter chart
-     * <p>
-     * <pre>
-     * TEST URL = http://localhost:7080/transactionmetadata2.pinpoint?application=FRONT-WEB&from=1394432299032&to=1394433498269&responseFrom=100&responseTo=200&responseOffset=100&limit=10
-     * </pre>
-     *
-     * @param model
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/transactionmetadata2", method = RequestMethod.GET)
-    public String getTransaction(Model model,
-                                 @RequestParam("application") String applicationName,
-                                 @RequestParam("from") long from,
-                                 @RequestParam("to") long to,
-                                 @RequestParam("responseFrom") int responseFrom,
-                                 @RequestParam("responseTo") int responseTo,
-                                 @RequestParam("limit") int limit,
-                                 @RequestParam(value = "offsetTime", required = false, defaultValue = "-1") long offsetTime,
-                                 @RequestParam(value = "offsetTransactionId", required = false) String offsetTransactionId,
-                                 @RequestParam(value = "offsetTransactionElapsed", required = false, defaultValue = "-1") int offsetTransactionElapsed,
-                                 @RequestParam(value = "filter", required = false) String filterText) {
-
-        limit = LimitUtils.checkRange(limit);
-
-        StopWatch watch = new StopWatch();
-        watch.start("selectScatterData");
-
-        final SelectedScatterArea area = SelectedScatterArea.createUncheckedArea(from, to, responseFrom, responseTo);
-        logger.debug("fetch scatter data. {}, LIMIT={}, FILTER={}", area, limit, filterText);
-
-        if (filterText == null) {
-
-            // query data above "limit" first
-            TransactionId offsetId = null;
-            List<SpanBo> extraMetadata = null;
-            if (offsetTransactionId != null) {
-                offsetId = new TransactionId(offsetTransactionId);
-
-                SelectedScatterArea extraArea = SelectedScatterArea.createUncheckedArea(offsetTime, offsetTime, responseFrom, responseTo);
-                List<Dot> extraAreaDotList = scatter.selectScatterData(applicationName, extraArea, offsetId, offsetTransactionElapsed, limit);
-                extraMetadata = scatter.selectTransactionMetadata(parseSelectTransaction(extraAreaDotList));
-                model.addAttribute("extraMetadata", extraMetadata);
-            }
-
-            // query data up to limit
-            if (extraMetadata == null || extraMetadata.size() < limit) {
-                int newlimit = limit - ((extraMetadata == null) ? 0 : extraMetadata.size());
-                List<Dot> selectedDotList = scatter.selectScatterData(applicationName, area, null, -1, newlimit);
-                List<SpanBo> metadata = scatter.selectTransactionMetadata(parseSelectTransaction(selectedDotList));
-                model.addAttribute("metadata", metadata);
-            }
-        } else {
-            final LimitedScanResult<List<TransactionId>> limitedScanResult = flow.selectTraceIdsFromApplicationTraceIndex(applicationName, area, limit);
-            final List<TransactionId> traceIdList = limitedScanResult.getScanData();
-            logger.trace("submitted transactionId count={}", traceIdList.size());
-
-            // TODO: just sorted?  we need range check based on tree structure
-            SortedSet<TransactionId> traceIdSet = new TreeSet<>(traceIdList);
-            logger.debug("unified traceIdSet size={}", traceIdSet.size());
-
-            List<Dot> dots = scatter.selectScatterData(traceIdSet, applicationName, filterBuilder.build(filterText));
-        }
-
-        watch.stop();
-        logger.info("Fetch scatterData time : {}ms", watch.getLastTaskTimeMillis());
-
-        return "transactionmetadata2";
-    }
-
-    private TransactionMetadataQuery parseSelectTransaction(List<Dot> dotList) {
-        TransactionMetadataQuery query = new TransactionMetadataQuery();
-        if (dotList == null) {
-            return query;
-        }
-        for (Dot dot : dotList) {
-            query.addQueryCondition(dot.getTransactionId(), dot.getAcceptedTime(), dot.getElapsedTime());
-        }
-        logger.debug("query:{}", query);
-        return query;
-    }
 }