From dc22e0e5bf3f1f7f72223fc37c57bf806789bcc8 Mon Sep 17 00:00:00 2001 From: Franklin Hu Date: Mon, 18 Jun 2012 16:53:36 -0700 Subject: [PATCH] Misc changes * Add metric for batch size (how many entries are added to the write queue) * Remove `OstrichProcessor` from default processors Author: @franklinhu Pull Request: #35 URL: https://github.com/twitter/zipkin/pull/35 --- .../com/twitter/zipkin/collector/ScribeCollectorService.scala | 1 + .../com/twitter/zipkin/config/ZipkinCollectorConfig.scala | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zipkin-scribe/src/main/scala/com/twitter/zipkin/collector/ScribeCollectorService.scala b/zipkin-scribe/src/main/scala/com/twitter/zipkin/collector/ScribeCollectorService.scala index 466f202e78d..5798d15d3cb 100644 --- a/zipkin-scribe/src/main/scala/com/twitter/zipkin/collector/ScribeCollectorService.scala +++ b/zipkin-scribe/src/main/scala/com/twitter/zipkin/collector/ScribeCollectorService.scala @@ -95,6 +95,7 @@ class ScribeCollectorService(config: ZipkinCollectorConfig, val writeQueue: Writ Ok } else if (writeQueue.add(scribeMessages)) { Stats.incr("collector.batches_added_to_queue") + Stats.addMetric("collector.batch_size", scribeMessages.size) Ok } else { Stats.incr("collector.pushback") diff --git a/zipkin-server/src/main/scala/com/twitter/zipkin/config/ZipkinCollectorConfig.scala b/zipkin-server/src/main/scala/com/twitter/zipkin/config/ZipkinCollectorConfig.scala index b8c108bdd6f..12d7cfb1363 100644 --- a/zipkin-server/src/main/scala/com/twitter/zipkin/config/ZipkinCollectorConfig.scala +++ b/zipkin-server/src/main/scala/com/twitter/zipkin/config/ZipkinCollectorConfig.scala @@ -108,8 +108,7 @@ trait ZipkinCollectorConfig extends ZipkinConfig[ZipkinCollector] { new SequenceProcessor[Span]( new FanoutProcessor[Span]({ new StorageProcessor(storage) :: - new IndexProcessor(index, indexingFilter) :: - new OstrichProcessor(serviceStatsPrefix) + new IndexProcessor(index, indexingFilter) }) )