Merge pull request #354 from tumblr/bhaskar-adding-stats

Adding additional stats.
tumblr · Aug 5, 2015 · b3b816a · b3b816a
2 parents 5ef1769 + f8879cf
commit b3b816a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/collins/models/Asset.scala b/app/collins/models/Asset.scala
@@ -216,7 +216,7 @@ object Asset extends Schema with AnormAdapter[Asset] with AssetKeys {
   // Loads assets from cache, then database if not available in cache.
   // Asset are loaded from database using 'in' clause, and are added to cache
   // Returns assets in the order requested, i.e. tag order in params
-  def findByTags(tags: Seq[String]) = {
+  def findByTags(tags: Seq[String]) = Stats.time("Asset.findByTags") {
     val ltags = tags.map { _.toLowerCase }
     val assetOpts = ltags.map { tag => tag -> Cache.get[Option[Asset]](findByTagKey(tag)) }.toMap
     val loadedAssets = inTransaction { from(tableDef)(s =>

diff --git a/app/collins/solr/CollinsSearchQuery.scala b/app/collins/solr/CollinsSearchQuery.scala
@@ -5,6 +5,8 @@ import org.apache.solr.common.SolrDocument
 
 import play.api.Logger
 
+import collins.util.Stats
+
 import collins.models.Asset
 import collins.models.AssetLog
 import collins.models.shared.Page
@@ -48,8 +50,11 @@ abstract class CollinsSearchQuery[T](docType: SolrDocType, query: TypedSolrExpre
     Left("Solr is not initialized!")
   }
 
-  def getPage[V](f: Seq[T] => Seq[V] ): Either[String, Page[V]] = getResults().right.map{case (results, total) =>
-    Page(f(results), page.page, page.page * page.size, total)
+  def getPage[V](f: Seq[T] => Seq[V]): Either[String, Page[V]] = Stats.time(f"Solr.find-pgs-${page.size}%d") {
+    getResults().right.map {
+      case (results, total) =>
+        Page(f(results), page.page, page.page * page.size, total)
+    }
   }
 
   protected def getSortDirection() = {