From 05dfc38f66c0db58acdec8e427c33b20034ec444 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 26 Jul 2014 02:17:04 +0100
Subject: [PATCH] Add inventory.<url>.RequestsMade stat.

This gives a count of all requests made to the remote inventory service.
This is finer grained than inventory.httpfetch.ProcessedFetchInventoryRequests since such a request can be comprised of many individual inv service calls.
In addition, this will count requests that don't go through the HTTP inventory fetch (e.g. HG, archiving, etc.)

Conflicts:
	OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
---
 .../Inventory/XInventoryServicesConnector.cs  | 21 +++++++++++++++++++
 prebuild.xml                                  |  1 +
 2 files changed, 22 insertions(+)

diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index f86d2f104d..fd309a004d 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -34,6 +34,7 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Services.Interfaces;
 using OpenSim.Server.Base;
 using OpenMetaverse;
@@ -46,6 +47,11 @@ namespace OpenSim.Services.Connectors
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// Number of requests made to the remote inventory service.
+        /// </summary>
+        public int RequestsMade { get; private set; }
+
         private string m_ServerURI = String.Empty;
 
         private object m_Lock = new object();
@@ -83,6 +89,19 @@ namespace OpenSim.Services.Connectors
                 throw new Exception("Inventory connector init error");
             }
             m_ServerURI = serviceURI;
+
+            StatsManager.RegisterStat(
+                new Stat(
+                "RequestsMade", 
+                "Requests made", 
+                "Number of requests made to the remove inventory service", 
+                "requests", 
+                "inventory", 
+                serviceURI, 
+                StatType.Pull, 
+                MeasuresOfInterest.AverageChangeOverTime,
+                s => s.Value = RequestsMade,
+                StatVerbosity.Debug));
         }
 
         private bool CheckReturn(Dictionary<string, object> ret)
@@ -502,6 +521,8 @@ namespace OpenSim.Services.Connectors
             foreach (KeyValuePair<string, object> kvp in temp)
                 sendData.Add(kvp.Key, kvp.Value);
 
+            RequestsMade++;
+
             string reply = string.Empty;
             lock (m_Lock)
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
diff --git a/prebuild.xml b/prebuild.xml
index 8137d1f803..001c16cd23 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -823,6 +823,7 @@
       <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Server.Base"/>