errplane 0.6.10 → 1.0.0

data/lib/errplane.rb

@@ -40,19 +40,37 @@ module Errplane
       @queue ||= MaxQueue.new(configuration.queue_maximum_depth)
     end
 
-    def report(name, params = {}, async = true)
+    def report(name, params = {}, udp = false)
       unless configuration.ignored_reports.find{ |msg| /#{msg}/ =~ name  }
-        data = {
-          :name => name.gsub(/\s+/, "_"),
-          :timestamp => "now"
-        }.merge(params)
-
-        if async
-          Errplane.queue.push(data)
-        else
-          Errplane.api.post(Errplane.process_line(data))
-        end
+        data = generate_data(name, params)
+        udp ? Errplane.api.send(data) : Errplane.queue.push(data)
+      end
+    end
+
+    def rollup(name, params = {})
+      Errplane.api.send generate_data(name, params), "t"
+    end
+
+    def count(name, params = {})
+      Errplane.api.send generate_data(name, params), "c"
+    end
+
+    def generate_data(name, params)
+      point = {:v => params[:value] || 1}
+      point[:t] = params[:timestamp] unless params[:timestamp].nil?
+
+      if context = params[:context]
+        point[:c] = params[:context].is_a?(String) ? params[:context] : params[:context].to_json
+      end
+
+      if dimensions = params[:dimensions]
+        point[:d] = Hash[params[:dimensions].map {|k,v| [k.to_s, v.to_s]}]
       end
+
+      {
+        :n => name.gsub(/\s+/, "_"),
+        :p => [point]
+      }
     end
 
     def report_deployment(context = nil, async = false)
@@ -84,35 +102,35 @@ module Errplane
       yield_value
     end
 
-    def transmit_unless_ignorable(e, env = {})
-      transmit(e, env) unless ignorable_exception?(e)
+    def report_exception_unless_ignorable(e, env = {})
+      report_exception(e, env) unless ignorable_exception?(e)
     end
+    alias_method :transmit_unless_ignorable, :report_exception_unless_ignorable
 
-    def transmit(e, env = {})
+    def report_exception(e, env = {})
       begin
         env = errplane_request_data if env.empty? && defined? errplane_request_data
         exception_presenter = ExceptionPresenter.new(e, env)
         log :info, "Exception: #{exception_presenter.to_json[0..512]}..."
 
         Errplane.queue.push({
-          :name => exception_presenter.time_series_name,
-          :context => exception_presenter
+          :n => "exceptions",
+          :p => [{
+            :v => 1,
+            :c => exception_presenter.context.to_json,
+            :d => exception_presenter.dimensions
+          }]
         })
       rescue => e
         log :info, "[Errplane] Something went terribly wrong. Exception failed to take off! #{e.class}: #{e.message}"
       end
     end
+    alias_method :transmit, :report_exception
 
     def current_timestamp
       Time.now.utc.to_i
     end
 
-    def process_line(line)
-      data = "#{line[:name]} #{line[:value] || 1} #{line[:timestamp] || "now"}"
-      data = "#{data} #{Base64.strict_encode64(line[:context].to_json)}" if line[:context]
-      data
-    end
-
     def ignorable_exception?(e)
       configuration.ignore_current_environment? ||
       !!configuration.ignored_exception_messages.find{ |msg| /.*#{msg}.*/ =~ e.message  } ||

data/lib/errplane/api.rb

@@ -4,6 +4,10 @@ module Errplane
 
     attr_reader :last_response
 
+    HTTPS_HOST = "w.apiv3.errplane.com"
+    UDP_HOST = "udp.apiv3.errplane.com"
+    UDP_PORT = 8126
+
     POST_RETRIES = 5
     READ_TIMEOUT = 3
     OPEN_TIMEOUT = 3
@@ -23,7 +27,7 @@ module Errplane
       log :debug, "POSTing to #{url}"
 
       response = begin
-                   https.post(url, data)
+                   https.post(url, data.to_json)
                  rescue *HTTP_ERRORS => e
                    log :error, "HTTP error contacting API! #{e.class}: #{e.message}"
                    retry_count -= 1
@@ -44,17 +48,31 @@ module Errplane
       @last_response = response
     end
 
+    def send(data, operator="r")
+      udp = UDPSocket.new
+
+      packet = {
+        :d => Errplane.configuration.database_name,
+        :a => Errplane.configuration.api_key.to_s,
+        :o => operator,
+        :w => [data]
+      }
+
+      log :debug, "Sending UDP Packet: #{packet.to_json}"
+
+      udp.send packet.to_json, 0, UDP_HOST, UDP_PORT
+    end
+
     private
     def url
       "/databases/" \
-      + Errplane.configuration.application_id.to_s \
-      + Errplane.configuration.environment.to_s \
+      + Errplane.configuration.database_name \
       + "/points?api_key=" \
       + Errplane.configuration.api_key.to_s
     end
 
     def initialize_secure_connection
-      connection = Net::HTTP.new("apiv2.errplane.com", 443)
+      connection = Net::HTTP.new(HTTPS_HOST, 443)
       connection.use_ssl = true
       connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
       connection.read_timeout = READ_TIMEOUT

data/lib/errplane/configuration.rb

@@ -112,6 +112,10 @@ module Errplane
       @custom_exception_data_handler.call(black_box) if @custom_exception_data_handler
     end
 
+    def database_name
+      @application_id.to_s + @environment.to_s
+    end
+
     private
     def initialize_http_connection
       Net::HTTP.new(@app_host, "80")

data/lib/errplane/exception_presenter.rb

@@ -31,8 +31,8 @@ module Errplane
       @environment_variables = ENV.to_hash || {}
     end
 
-    def to_json
-      payload = {
+    def context
+      c = {
         :time => Time.now.utc.to_i,
         :application_name => Errplane.configuration.application_name,
         :application_root => Errplane.configuration.application_root,
@@ -40,41 +40,29 @@ module Errplane
         :framework_version => Errplane.configuration.framework_version,
         :message => @exception.message,
         :backtrace => @backtrace,
-        :exception_class => @exception.class.to_s,
         :language => "Ruby",
         :language_version => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
         :reporter => reporter,
-        :hostname => Socket.gethostname,
         :custom_data => @custom_data
       }
 
-      payload[:environment_variables] = @environment_variables.reject do |k,v|
+      c[:environment_variables] = @environment_variables.reject do |k,v|
         Errplane.configuration.environment_variable_filters.any? { |filter| k =~ filter }
       end
 
       Errplane.configuration.add_custom_exception_data(self)
 
-      payload[:request_data] = request_data if @controller || @action || !@params.blank?
-      payload[:hash] = calculate_hash
-      payload.to_json
-    end
-
-    def calculate_hash
-      if hash
-        hash
-      elsif Errplane.configuration.aggregated_exception_classes.include?(@exception.class.to_s)
-        Digest::SHA1.hexdigest(@exception.class.to_s)
-      else
-        Digest::SHA1.hexdigest(@exception.class.to_s + @backtrace.first.to_s)
-      end
-    end
-
-    def time_series_name
-      "exceptions/" + calculate_hash
+      c[:request_data] = request_data if @controller || @action || !@params.blank?
+      c
     end
 
-    def context
-      Base64.strict_encode64(to_json)
+    def dimensions
+      d = {
+        :Class => @exception.class.to_s,
+        :class => @exception.class.to_s,
+        :method => "#{@controller}##{@action}",
+        :server => Socket.gethostname
+      }
     end
 
     def reporter

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.6.10"
+  VERSION = "1.0.0"
 end

data/lib/errplane/worker.rb

@@ -5,22 +5,18 @@ require "base64"
 
 module Errplane
   class Worker
-    MAX_POST_LINES = 200
+    MAX_POST_POINTS = 200
     MAX_TIME_SERIES_NAME_LENGTH = 255
 
     class << self
       include Errplane::Logger
 
-      def indent_lines(lines, num)
-        lines.split("\n").map {|line| (" " * num) + line[0..64]}.join("\n")
-      end
-
       def post_data(data)
         if Errplane.configuration.ignore_current_environment?
           log :debug, "Current environment is ignored, skipping POST."
           return false
         else
-          log :debug, "POSTing data:\n#{indent_lines(data, 13)}"
+          log :debug, "POSTing data:\n#{data}"
           begin
             Errplane.api.post(data)
           rescue => e
@@ -63,23 +59,23 @@ module Errplane
         begin
           data = []
 
-          while data.size < MAX_POST_LINES && !Errplane.queue.empty?
-            n = Errplane.queue.pop(true) rescue next;
-            log :debug, "Found data in the queue! (#{n[:name]})"
+          while data.size < MAX_POST_POINTS && !Errplane.queue.empty?
+            p = Errplane.queue.pop(true) rescue next;
+            log :debug, "Found data in the queue! (#{p[:n]})"
 
             begin
-              if n[:name].split("|").any?{|x| x.length > MAX_TIME_SERIES_NAME_LENGTH}
-                log :error, "Time series name too long! Discarding data for: #{n[:name]}"
+              if p[:n].size > MAX_TIME_SERIES_NAME_LENGTH
+                log :error, "Time series name too long! Discarding data for: #{p[:n]}"
               else
-                data << Errplane.process_line(n)
+                data.push p
               end
             rescue => e
-              log :info, "Instrumentation Error! #{e.inspect}"
+              log :info, "Instrumentation Error! #{e.inspect} #{e.backtrace.first}"
             end
           end
 
-          post_data(data.join("\n")) unless data.empty?
-        end while Errplane.queue.length > MAX_POST_LINES
+          post_data(data) unless data.empty?
+        end while Errplane.queue.length > MAX_POST_POINTS
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70115497526500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115497526500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70115497525700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70115497525700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70115497524960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497524960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70115497524280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497524280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70115497523800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497523800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70115497523300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497523300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70115497522800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497522800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70115497522320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497522320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70115497521840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115497521840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides implements instrumentation with Errplane for Rails
   2.3.x and 3.x applications.
 email:
@@ -204,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: errplane
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails-based instrumentation library for Errplane.