use new stats harness

twitter-archive · Apr 7, 2011 · 6b75012 · 6b75012
1 parent d9a691a
commit 6b75012
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 22 deletions.
diff --git a/src/main/scala/com/twitter/flockdb/EdgesService.scala b/src/main/scala/com/twitter/flockdb/EdgesService.scala
@@ -16,14 +16,13 @@
 
 package com.twitter.flockdb
 
-import com.twitter.gizzard.Future
+import com.twitter.gizzard.{Stats, Future}
 import com.twitter.gizzard.nameserver.{NameServer, NonExistentShard, InvalidShard}
 import com.twitter.gizzard.scheduler.{CopyJobFactory, JsonJob, PrioritizingJobScheduler}
 import com.twitter.gizzard.shards.{ShardBlackHoleException, ShardDatabaseTimeoutException,
   ShardOfflineException, ShardTimeoutException}
 import com.twitter.gizzard.thrift.conversions.Sequences._
 import operations.{ExecuteOperations, SelectOperation}
-import com.twitter.ostrich.stats.Stats
 import com.twitter.logging.Logger
 import queries._
 import thrift.FlockException
@@ -122,7 +121,7 @@ class EdgesService(val nameServer: NameServer[shards.Shard],
   }
 
   private def countAndRethrow(e: Throwable) = {
-    Stats.incr("exceptions-" + e.getClass.getName.split("\\.").last)
+    Stats.internal.incr("exceptions-" + e.getClass.getName.split("\\.").last)
     throw(new FlockException(e.getMessage))
   }
 
@@ -137,7 +136,7 @@ class EdgesService(val nameServer: NameServer[shards.Shard],
         log.error(e, "NonexistentShard: %s", e)
         throw(new FlockException(e.getMessage))
       case e: FlockException =>
-        Stats.incr(e.getClass.getName)
+        Stats.internal.incr(e.getClass.getName)
         throw(e)
       case e: ShardTimeoutException =>
         countAndRethrow(e)
@@ -146,7 +145,7 @@ class EdgesService(val nameServer: NameServer[shards.Shard],
       case e: ShardOfflineException =>
         countAndRethrow(e)
       case e: Throwable =>
-        Stats.incr("exceptions-unknown")
+        Stats.internal.incr("exceptions-unknown")
         log.error(e, "Unhandled error in EdgesService: %s", e)
         throw(new FlockException(e.toString))
     }

diff --git a/src/main/scala/com/twitter/flockdb/FlockDB.scala b/src/main/scala/com/twitter/flockdb/FlockDB.scala
@@ -27,7 +27,7 @@ import com.twitter.gizzard.shards.{ShardException, ShardInfo, ReplicatingShard,
 import com.twitter.gizzard.thrift.conversions.Sequences._
 import com.twitter.gizzard.proxy.{ExceptionHandlingProxyFactory}
 import com.twitter.logging.Logger
-import com.twitter.ostrich.stats.Stats
+import com.twitter.gizzard.Stats
 import com.twitter.querulous.StatsCollector
 import com.twitter.querulous.database.DatabaseFactory
 import com.twitter.querulous.evaluator.QueryEvaluatorFactory
@@ -60,8 +60,8 @@ class FlockDB(config: FlockDBConfig) extends GizzardServer[shards.Shard](config)
   })
 
   val stats = new StatsCollector {
-    def incr(name: String, count: Int) = Stats.incr(name, count)
-    def time[A](name: String)(f: => A): A = Stats.time(name)(f)
+    def incr(name: String, count: Int) = Stats.transaction.incr(name, count)
+    def time[A](name: String)(f: => A): A = Stats.transaction.time(name)(f)
   }
 
   val readWriteShardAdapter = new shards.ReadWriteShardAdapter(_)

diff --git a/src/main/scala/com/twitter/flockdb/Main.scala b/src/main/scala/com/twitter/flockdb/Main.scala
@@ -1,6 +1,5 @@
 package com.twitter.flockdb
 
-import com.twitter.ostrich.stats.Stats
 import com.twitter.ostrich.admin.{ServiceTracker, Service}
 import com.twitter.logging.{FileHandler, Logger}
 import com.twitter.util.Eval

diff --git a/src/main/scala/com/twitter/flockdb/jobs/Copy.scala b/src/main/scala/com/twitter/flockdb/jobs/Copy.scala
@@ -20,7 +20,7 @@ package jobs
 import com.twitter.gizzard.scheduler._
 import com.twitter.gizzard.shards.ShardId
 import com.twitter.gizzard.nameserver.NameServer
-import com.twitter.ostrich.stats.Stats
+import com.twitter.gizzard.Stats
 import com.twitter.util.TimeConversions._
 import conversions.Numeric._
 import shards.Shard
@@ -56,7 +56,7 @@ class Copy(sourceShardId: ShardId, destinationShardId: ShardId, cursor: Copy.Cop
   def copyPage(sourceShard: Shard, destinationShard: Shard, count: Int) = {
     val (items, newCursor) = sourceShard.selectAll(cursor, count)
     destinationShard.writeCopies(items)
-    Stats.incr("edges-copy", items.size)
+    Stats.internal.incr("edges-copy", items.size)
     if (newCursor == Copy.END) {
       None
     } else {
@@ -87,7 +87,7 @@ class MetadataCopy(sourceShardId: ShardId, destinationShardId: ShardId, cursor:
   def copyPage(sourceShard: Shard, destinationShard: Shard, count: Int) = {
     val (items, newCursor) = sourceShard.selectAllMetadata(cursor, count)
     destinationShard.writeMetadata(items)
-    Stats.incr("edges-copy", items.size)
+    Stats.internal.incr("edges-copy", items.size)
     if (newCursor == MetadataCopy.END)
       Some(new Copy(sourceShardId, destinationShardId, Copy.START, Copy.COUNT, nameServer, scheduler))
     else

diff --git a/src/main/scala/com/twitter/flockdb/jobs/Diff.scala b/src/main/scala/com/twitter/flockdb/jobs/Diff.scala
@@ -20,7 +20,6 @@ package jobs
 import com.twitter.gizzard.scheduler._
 import com.twitter.gizzard.shards.ShardId
 import com.twitter.gizzard.nameserver.NameServer
-import com.twitter.ostrich.stats.Stats
 import com.twitter.util.TimeConversions._
 import com.twitter.logging.Logger
 import com.twitter.gizzard.nameserver.{NameServer, NonExistentShard}

diff --git a/src/main/scala/com/twitter/flockdb/jobs/Repair.scala b/src/main/scala/com/twitter/flockdb/jobs/Repair.scala
@@ -23,7 +23,6 @@ import com.twitter.gizzard.nameserver.NameServer
 import com.twitter.gizzard.nameserver.{NameServer, NonExistentShard}
 import com.twitter.gizzard.shards.{ShardDatabaseTimeoutException, ShardTimeoutException}
 import com.twitter.logging.Logger
-import com.twitter.ostrich.stats.Stats
 import com.twitter.util.TimeConversions._
 import collection.mutable.ListBuffer
 import conversions.Numeric._

diff --git a/src/main/scala/com/twitter/flockdb/jobs/UnsafeCopy.scala b/src/main/scala/com/twitter/flockdb/jobs/UnsafeCopy.scala
@@ -20,7 +20,7 @@ package jobs
 import com.twitter.gizzard.scheduler._
 import com.twitter.gizzard.shards.ShardId
 import com.twitter.gizzard.nameserver.NameServer
-import com.twitter.ostrich.stats.Stats
+import com.twitter.gizzard.Stats
 import com.twitter.util.TimeConversions._
 import conversions.Numeric._
 import shards.Shard
@@ -56,7 +56,7 @@ class UnsafeCopy(sourceShardId: ShardId, destinationShardId: ShardId, cursor: Un
   def copyPage(sourceShard: Shard, destinationShard: Shard, count: Int) = {
     val (items, newCursor) = sourceShard.selectAll(cursor, count)
     destinationShard.bulkUnsafeInsertEdges(items)
-    Stats.incr("edges-copy", items.size)
+    Stats.internal.incr("edges-copy", items.size)
     if (newCursor == UnsafeCopy.END) {
       None
     } else {
@@ -88,7 +88,7 @@ class MetadataUnsafeCopy(sourceShardId: ShardId, destinationShardId: ShardId,
   def copyPage(sourceShard: Shard, destinationShard: Shard, count: Int) = {
     val (items, newCursor) = sourceShard.selectAllMetadata(cursor, count)
     destinationShard.bulkUnsafeInsertMetadata(items)
-    Stats.incr("edges-copy", items.size)
+    Stats.internal.incr("edges-copy", items.size)
     if (newCursor == MetadataUnsafeCopy.END)
       Some(new UnsafeCopy(sourceShardId, destinationShardId, UnsafeCopy.START, UnsafeCopy.COUNT,
                           nameServer, scheduler))

diff --git a/src/main/scala/com/twitter/flockdb/jobs/multi/Multi.scala b/src/main/scala/com/twitter/flockdb/jobs/multi/Multi.scala
@@ -19,7 +19,6 @@ package jobs.multi
 
 import com.twitter.gizzard.scheduler._
 import com.twitter.gizzard.shards.ShardBlackHoleException
-import com.twitter.ostrich.stats.Stats
 import com.twitter.util.Time
 import com.twitter.util.TimeConversions._
 import conversions.Numeric._
@@ -70,7 +69,6 @@ abstract class Multi(sourceId: Long, graphId: Int, direction: Direction, updated
   def toMap = Map("source_id" -> sourceId, "updated_at" -> updatedAt.inSeconds, "graph_id" -> graphId, "direction" -> direction.id, "priority" -> priority.id)
 
   def apply() {
-    Stats.incr("multijobs-" + getClass.getName.split("\\.").last)
     var cursor = Cursor.Start
     val forwardShard = forwardingManager.find(sourceId, graphId, direction)
     try {

diff --git a/src/main/scala/com/twitter/flockdb/shards/SqlShard.scala b/src/main/scala/com/twitter/flockdb/shards/SqlShard.scala
@@ -22,7 +22,7 @@ import java.sql.{BatchUpdateException, ResultSet, SQLException, SQLIntegrityCons
 import scala.collection.mutable
 import com.twitter.gizzard.proxy.SqlExceptionWrappingProxyFactory
 import com.twitter.gizzard.shards
-import com.twitter.ostrich.stats.Stats
+import com.twitter.gizzard.Stats
 import com.twitter.gizzard.shards.ShardException
 import com.twitter.querulous.config.Connection
 import com.twitter.querulous.evaluator.{QueryEvaluator, QueryEvaluatorFactory, Transaction}
@@ -518,7 +518,7 @@ class SqlShard(val queryEvaluator: QueryEvaluator, val shardInfo: shards.ShardIn
 
   def writeCopies(edges: Seq[Edge]) {
     if (!edges.isEmpty) {
-      Stats.addMetric("x-copy-burst", edges.size)
+      Stats.internal.addMetric("copy-burst", edges.size)
 
       var sourceIdsSet = Set[Long]()
       edges.foreach { edge => sourceIdsSet += edge.sourceId }
@@ -543,7 +543,7 @@ class SqlShard(val queryEvaluator: QueryEvaluator, val shardInfo: shards.ShardIn
         }
 
         if (result.failed.size > 0) {
-          Stats.incr("x-copy-fallback")
+          Stats.internal.incr("copy-fallback")
           var currentSourceId = -1L
           var countDelta = 0
           result.failed.foreach { edge =>