bug fix.

- wrong sum of request in scatter-chart. - analytics send bug.
pinpoint-apm · Oct 17, 2016 · c537c77 · c537c77
1 parent 6e0ca8b
commit c537c77
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/web/src/main/webapp/common/services/analytics.service.js b/web/src/main/webapp/common/services/analytics.service.js
@@ -12,7 +12,7 @@
 	pinpointApp.service( "AnalyticsService", [ "globalConfig", function ( globalConfig) {
 		if ( typeof ga !== "undefined" ) {
 			this.send = function( category, name, label, count, options ) {
-				if ( globalConfig.sendAllowed === false ) return;
+				if ( globalConfig.sendUsage !== true ) return;
 				if ( arguments.length == 1 ) {
 					ga( "send", "pageview", arguments[0] );
 				} else {

diff --git a/web/src/main/webapp/features/scatter/scatter.directive.js b/web/src/main/webapp/features/scatter/scatter.directive.js
@@ -214,13 +214,17 @@
 						htScatterSet = {};
 					}
 					function getAgentList( scatterData ) {
-						var aAgentList = [], server;
-						if ( typeof scatterData !== "undefined" ) {
-							$.each( scatterData.scatter.metadata, function( key, oInfo ) {
-								aAgentList.push( oInfo[0] );
-							});
-							return aAgentList;
-						}
+						var oDupCheck = {};
+												var aAgentList = [], server;
+												if ( typeof scatterData !== "undefined" ) {
+													$.each( scatterData.scatter.metadata, function( key, oInfo ) {
+														if ( typeof oDupCheck[ oInfo[0] ] === "undefined" ) {
+															oDupCheck[ oInfo[0] ] = true;
+															aAgentList.push( oInfo[0] );
+														}
+													});
+													return aAgentList;
+												}
 						if ( htLastNode.agentList ) {
 							return htLastNode.agentList;
 						}