home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-17 00:36:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335 from denzelsN/1.0.x

Browse Source 
backported to 1.0.x ( added request mappings to support serviceTypeName ...
This commit is contained in:
denzelsN
2015-04-16 11:20:05 +09:00
parent 8666d8a8dd 1f88cfd33d
commit 4e63a7d2f5
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/java/com/navercorp/pinpoint/web/controller/FilteredMapController.java
+5 -6
View File
@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.web.controller;
import java.util.List;
import com.navercorp.pinpoint.common.service.ServiceTypeRegistryService;
import com.navercorp.pinpoint.common.ServiceType;
import com.navercorp.pinpoint.common.util.DateUtils;
import com.navercorp.pinpoint.web.applicationmap.ApplicationMap;
import com.navercorp.pinpoint.web.applicationmap.FilterMapWrap;
@@ -56,9 +56,6 @@ public class FilteredMapController {
@Autowired
private FilterBuilder filterBuilder;
@Autowired
private ServiceTypeRegistryService registry;
/**
* filtered server map data query within from ~ to timeframe
*
@@ -81,7 +78,8 @@ public class FilteredMapController {
@RequestParam(value = "filter", required = false) String filterText,
@RequestParam(value = "hint", required = false) String filterHint,
@RequestParam(value = "limit", required = false, defaultValue = "10000") int limit) {
String serviceTypeName = registry.findServiceType(serviceTypeCode).getName();
ServiceType serviceType = ServiceType.findServiceType(serviceTypeCode);
String serviceTypeName = serviceType.name();
return getFilteredServerMapData(applicationName, serviceTypeName, from, to, originTo, filterText, filterHint, limit);
}
@@ -148,7 +146,8 @@ public class FilteredMapController {
@RequestParam(value = "filter", required = false) String filterText,
@RequestParam(value = "hint", required = false) String filterHint,
@RequestParam(value = "limit", required = false, defaultValue = "1000000") int limit) {
String serviceTypeName = this.registry.findServiceType(serviceTypeCode).getName();
ServiceType serviceType = ServiceType.findServiceType(serviceTypeCode);
String serviceTypeName = serviceType.name();
return getLastFilteredServerMapData(applicationName, serviceTypeName, period, filterText, filterHint, limit);
}
web/src/main/java/com/navercorp/pinpoint/web/controller/MapController.java
+9 -7
View File
@@ -16,6 +16,7 @@
package com.navercorp.pinpoint.web.controller;
import com.navercorp.pinpoint.common.ServiceType;
import com.navercorp.pinpoint.web.applicationmap.ApplicationMap;
import com.navercorp.pinpoint.web.applicationmap.MapWrap;
import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram;
@@ -74,8 +75,9 @@ public class MapController {
@RequestParam("serviceTypeCode") short serviceTypeCode,
@RequestParam("from") long from,
@RequestParam("to") long to) {
ServiceType serviceType = registry.findServiceType(serviceTypeCode);
return getServerMapData(applicationName, serviceType.getName(), from, to);
ServiceType serviceType = ServiceType.findServiceType(serviceTypeCode);
String serviceTypeName = serviceType.name();
return getServerMapData(applicationName, serviceTypeName, from, to);
}
/**
@@ -98,7 +100,7 @@ public class MapController {
this.dateLimit.limit(from, to);
logger.debug("range:{}", TimeUnit.MILLISECONDS.toMinutes(range.getRange()));
ServiceType serviceType = registry.findServiceTypeByName(serviceTypeName);
ServiceType serviceType = ServiceType.valueOf(serviceTypeName);
Application application = new Application(applicationName, serviceType);
ApplicationMap map = mapService.selectApplicationMap(application, range);
@@ -168,8 +170,8 @@ public class MapController {
@RequestParam("sourceServiceType") short sourceServiceType,
@RequestParam("targetApplicationName") String targetApplicationName,
@RequestParam("targetServiceType") short targetServiceType) {
String sourceServiceTypeName = registry.findServiceType(sourceServiceType).getName();
String targetServiceTypeName = registry.findServiceType(targetServiceType).getName();
String sourceServiceTypeName = ServiceType.findServiceType(sourceServiceType).name();
String targetServiceTypeName = ServiceType.findServiceType(targetServiceType).name();
return getLinkStatistics(model, from, to, sourceApplicationName, sourceServiceTypeName, targetApplicationName, targetServiceTypeName);
}
@@ -196,8 +198,8 @@ public class MapController {
@RequestParam("targetApplicationName") String targetApplicationName,
@RequestParam("targetServiceTypeName") String targetServiceTypeName) {
final Application sourceApplication = new Application(sourceApplicationName, registry.findServiceTypeByName(sourceServiceTypeName));
final Application destinationApplication = new Application(targetApplicationName, registry.findServiceTypeByName(targetServiceTypeName));
final Application sourceApplication = new Application(sourceApplicationName, ServiceType.valueOf(sourceServiceTypeName));
final Application destinationApplication = new Application(targetApplicationName, ServiceType.valueOf(targetServiceTypeName));
final Range range = new Range(from, to);
NodeHistogram nodeHistogram = mapService.linkStatistics(sourceApplication, destinationApplication, range);