formatted-metrics 1.0.4 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f7edd948c0f2e561a7fba319c15f4708f92cf24e
+  data.tar.gz: 74220cfe25a93832000aa8620090508f99fef40d
+SHA512:
+  metadata.gz: f45582f1080e61c61ae1fd9db73f7c972f17b4c31fb887f95a2bcd3600283f2c0308c53618e4582bad08f3d18899d98dd2b3a5e14904eca772bb5f02eaf51f74
+  data.tar.gz: bdf3c63a206664ae884c2fd714faa630a95fe8211a1b32e523a62849fed5974c2b32935225d7a73af97d4a86a75464d2a379e7805c4fbc419ab7ee0e9b4fee1b

data/.travis.yml

@@ -2,6 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
 script: bundle exec rake

data/lib/metrics/formatters/l2met.rb

@@ -1,16 +1,14 @@
 module Metrics::Formatters
-  PRECISION = 3
+  PRECISION = 3.freeze
 
   class L2Met < Base
     # Example
     # source=web.2 sample#load_avg_1m=0.31 sample#load_avg_5m=0.10 sample#load_avg_15m=0.05
     def lines
       groups.map do |source, instrumenters|
-        [
-          "source=#{full_source(source)}",
-          instrumenters.map { |instrumenter| measurement(instrumenter) }.join(' ')
-        ].flatten.join(' ')
-      end
+        measurements = instrumenters.map { |instrumenter| measurement(instrumenter) }
+        Lines.new(full_source(source), measurements).lines
+      end.flatten
     end
 
   private
@@ -34,5 +32,51 @@ module Metrics::Formatters
     def blank?(string)
       string.nil? || string.empty?
     end
+
+    # Responsible for taking a prefix, and an array of measurements, and
+    # returning an array of log lines that are limited to 1024 characters per
+    # line.
+    class Lines
+      include Enumerable
+
+      MAX_LEN   = 1024.freeze
+      DELIMITER = ' '.freeze
+
+      attr_reader :source
+      attr_reader :measurements
+      attr_reader :max
+
+      def initialize(source, measurements)
+        @source = "source=#{source}"
+        @measurements = measurements
+        @max = MAX_LEN - @source.length + DELIMITER.length * 2
+      end
+
+      def each(&block)
+        measurements.each(&block)
+      end
+
+      # Groups the array of measurements into an array of log lines, each line
+      # prefixed with the source.
+      #
+      # Example
+      #
+      #   # This:
+      #   ['measure#rack.request=1', ..., 'measure#rack.request.time=200ms']
+      #
+      #   # Into this:
+      #   ['source=app measure#rack.request=1', 'source=app measure#rack.request.time=200ms', ...]
+      #
+      # Returns an Array.
+      def lines
+        total = 0
+        chunk { |measurement|
+          total += measurement.length + DELIMITER.length * 2
+          total / max
+        }.map { |_, line|
+          [source, line].join(DELIMITER)
+        }
+      end
+    end
   end
 end

data/lib/metrics/version.rb

@@ -1,3 +1,3 @@
 module FormattedMetrics
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/spec/metrics/formatters/l2met_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'securerandom'
 
 describe Metrics::Formatters::L2Met do
   let(:formatter) { described_class.new *instrumenters }
@@ -12,7 +13,7 @@ describe Metrics::Formatters::L2Met do
   end
 
   describe '.lines' do
-    subject(:format) { formatter.lines }
+    subject(:lines) { formatter.lines }
 
     context 'with a single instrumenter' do
       let(:instrumenters) { [ instrumenter(metric: 'rack.request.time', value: 10.3333, units: 'ms', type: 'sample') ] }
@@ -37,5 +38,17 @@ describe Metrics::Formatters::L2Met do
 
       it { should eq ['source=app sample#rack.request.time=10ms', 'source=app.foo count#jobs.queued=15jobs count#jobs.busy=10jobs'] }
     end
+
+    context 'with lots of metrics from the same source' do
+      let(:instrumenters) do
+        100.times.map { instrumenter(metric: SecureRandom.hex, value: rand(100), units: 'ms', type: 'sample') }
+      end
+
+      it 'limits each line to 1024 characters' do
+        lines.each do |line|
+          expect(line.length).to be < 1024
+        end
+      end
+    end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: formatted-metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Eric J. Holmes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,33 +90,26 @@ files:
 homepage: http://github.com/remind101/formatted-metrics
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -116079147036176157
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -116079147036176157
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily output formatted metrics to stdout
 test_files:
 - spec/metrics/formatters/l2met_spec.rb