datadog_rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48f1bb76428653e4d7194f2e32f02565e47056fa
-  data.tar.gz: 21120e0e20705f90a69cd815bc34970680dfe5d7
+  metadata.gz: 6052d1d544fcafc214dfd11756c58686c7344dd5
+  data.tar.gz: 6648e0ef9258937c998f4cacfbd5865bda341df7
 SHA512:
-  metadata.gz: b56c25ec68f93429209eee78cfb365780b59dfd93b830c907721de0dde4cf926aad3b3a6b75486f5ef7ebd61d061f07a0e9f5a5330b6eabe32660198608f5c21
-  data.tar.gz: bc0444d4c159ad1d9c8086fda3520e4e4e23314d2caefa45747698f4bb417f5b1ccbf9dfc4e27d697b9cfb92975d1228ec1632360b90e625ca7971abf3706f88
+  metadata.gz: 1967e90ef10456fa9e75930a31726887cc5f17549d7f09d526252730ea03430cc9bd272806cf546134e081c4033f7c2a726e9ddbe8fa5fe6af84ca4b92ebce70
+  data.tar.gz: a3e9566fb828f0aa063fe3768f70050af379eaaa33e19f46f1ad37d4c1071171f91416449ba6abfddafc55521943a61cd186bc6b28eb894fceca825db724cab3

data/lib/datadog_rails.rb

@@ -1 +1,67 @@
-require 'datadog_rails/railtie' if defined?(Rails)
+require "datadog_rails/configuration"
+
+require 'datadog_rails/railtie' if defined?(Rails::Railtie)
+
+module DatadogRails
+  class << self
+    attr_writer :configuration
+    attr_writer :client
+
+    # Embed in a String to clear all previous ANSI sequences.
+    CLEAR   = "\e[0m"
+    BOLD    = "\e[1m"
+
+    # Colors
+    BLACK   = "\e[30m"
+    RED     = "\e[31m"
+    GREEN   = "\e[32m"
+    YELLOW  = "\e[33m"
+    BLUE    = "\e[34m"
+    MAGENTA = "\e[35m"
+    CYAN    = "\e[36m"
+    WHITE   = "\e[37m"
+
+    def configuration
+      @configuration ||= DatadogRails::Configuration.new
+    end
+
+    def configure
+      yield(configuration)
+
+      self.client = nil
+    end
+
+    def client
+      @client ||= Statsd.new configuration.dogstatsd_host, configuration.dogstatsd_port
+    end
+
+    def send_event_to_statsd(payload)
+      key_name = "#{configuration.application_name}.#{payload[:measurement]}"
+
+      if payload[:action] == :increment
+        client.increment key_name, :tags => payload[:tags]
+      else
+        client.histogram key_name, payload[:value], :tags => payload[:tags]
+      end
+
+      log_event(payload) if configuration.debug?
+    end
+
+    def log_event(payload)
+      key_name = "#{configuration.application_name}.#{payload[:measurement]}"
+
+      info = "\n"
+      info << " \tmethod => #{payload[:action]}\n"
+      info << " \tmetric => #{key_name}\n"
+      info << " \tvalue  => #{payload[:value]}\n"
+      info << " \ttags   => #{payload[:tags]}"
+
+      Rails.logger.info color(" DatadogRails", GREEN, true) + color(info, WHITE, true)
+    end
+
+    def color(text, color, bold=false)
+      bold  = bold ? BOLD : ""
+      "#{bold}#{color}#{text}#{CLEAR}"
+    end
+  end
+end

data/lib/datadog_rails/configuration.rb

@@ -0,0 +1,34 @@
+module DatadogRails
+  class Configuration
+    attr_accessor :application_name
+    attr_accessor :dogstatsd_host
+    attr_accessor :dogstatsd_port
+    attr_accessor :instrumentation_environments
+    attr_accessor :instrumentation_enabled
+    attr_accessor :debug
+
+    DEFAULTS = {
+      :dogstatsd_host => "localhost",
+      :dogstatsd_port => 8125,
+      :instrumentation_environments => ["production"],
+      :instrumentation_enabled => true,
+      :debug => false
+    }
+
+    def initialize
+      @dogstatsd_host = DEFAULTS[:dogstatsd_host]
+      @dogstatsd_port = DEFAULTS[:dogstatsd_port]
+      @instrumentation_environments = DEFAULTS[:instrumentation_environments]
+      @instrumentation_enabled = DEFAULTS[:instrumentation_enabled]
+      @debug = DEFAULTS[:debug]
+    end
+
+    def debug?
+      !!@debug
+    end
+
+    def instrumentation_enabled?
+      !!@instrumentation_enabled
+    end
+  end
+end

data/lib/datadog_rails/railtie.rb

@@ -3,47 +3,47 @@ require 'statsd'
 
 module DatadogRails
   class Railtie < Rails::Railtie
-    initializer "datadog_rails.configure_rails_initialization" do
-      # Create a stats instance.
-      $statsd = Statsd.new('localhost', 8125)
+    config.datadog_rails = ActiveSupport::OrderedOptions.new
 
+    initializer "datadog_rails.configure" do |app|
+      DatadogRails.configure do |config|
+        config.application_name             = app.config.datadog_rails[:application_name] || ::Rails.application.class.parent_name.underscore
+        config.dogstatsd_host               = app.config.datadog_rails[:dogstatsd_host] || config.dogstatsd_host
+        config.dogstatsd_port               = app.config.datadog_rails[:dogstatsd_port] || config.dogstatsd_port
+        config.instrumentation_environments = app.config.datadog_rails[:instrumentation_environments] || config.instrumentation_environments
+        config.instrumentation_enabled      = app.config.datadog_rails[:instrumentation_enabled] || config.instrumentation_enabled
+        config.debug                        = app.config.datadog_rails[:debug] || config.debug
+      end
+    end
+
+    initializer "datadog_rails.configure_rails_initialization" do |app|
       # Setting up a subscriber to /process_action.action_controller/
       ActiveSupport::Notifications.subscribe /process_action.action_controller/ do |*args|
         event = ActiveSupport::Notifications::Event.new(*args)
+
         controller = "controller:#{event.payload[:controller]}"
-        action = "action:#{event.payload[:action]}"
-        format = "format:#{event.payload[:format] || 'all'}"
-        format = "format:all" if format == "format:*/*"
-        host = "host:#{ENV['INSTRUMENTATION_HOSTNAME']}"
-        status = event.payload[:status]
-        tags = [controller, action, format, host]
+        action     = "action:#{event.payload[:action]}"
+        format     = "format:#{event.payload[:format] || 'all'}"
+        format     = "format:all" if format == "format:*/*"
+        status     = "status:#{event.payload[:status]}"
+
+        tags = [controller, action, format, status]
 
-        ActiveSupport::Notifications.instrument :performance, :action => :timing, :tags => tags, :measurement => "request.total_duration", :value => event.duration
-        ActiveSupport::Notifications.instrument :performance, :action => :timing, :tags => tags, :measurement => "database.query.time", :value => event.payload[:db_runtime]
-        ActiveSupport::Notifications.instrument :performance, :action => :timing, :tags => tags, :measurement => "web.view.time", :value => event.payload[:view_runtime]
-        ActiveSupport::Notifications.instrument :performance, :tags => tags, :measurement => "request.status.#{status}"
+        ActiveSupport::Notifications.instrument :performance, :action => :increment, :tags => tags, :measurement => "request.number",           :value => 1
+        ActiveSupport::Notifications.instrument :performance, :action => :histogram, :tags => tags, :measurement => "request.total_duration",   :value => event.duration
+        ActiveSupport::Notifications.instrument :performance, :action => :histogram, :tags => tags, :measurement => "database.query.time",      :value => event.payload[:db_runtime]
+        ActiveSupport::Notifications.instrument :performance, :action => :histogram, :tags => tags, :measurement => "web.view.time",            :value => event.payload[:view_runtime]
       end
 
       # Setting up a subscriber to /performance/
       ActiveSupport::Notifications.subscribe /performance/ do |name, start, finish, id, payload|
-        send_event_to_statsd(name, payload) if DatadogRails.configuration.environments.include?(Rails.env)
-      end
-
-      # Send metric to DogStatsD
-      def send_event_to_statsd(name, payload)
-        action = payload[:action] || :increment
-        measurement = payload[:measurement]
-        value = payload[:value]
-        tags = payload[:tags]
-        key_name = "#{name.to_s.capitalize}.#{measurement}"
-
-        if action == :increment
-          $statsd.increment key_name, :tags => tags
-        else
-          $statsd.histogram key_name, value, :tags => tags
+        if DatadogRails.configuration.instrumentation_enabled? and
+           DatadogRails.configuration.instrumentation_environments.include?(Rails.env)
+          DatadogRails.send_event_to_statsd(payload)
+        elsif DatadogRails.configuration.instrumentation_enabled?
+          DatadogRails.log_event(payload)
         end
       end
-
     end
   end
-end
+end

data/lib/datadog_rails/version.rb

@@ -1,3 +1,3 @@
 module DatadogRails
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Henrique Menezes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,10 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- README.rdoc
 - Rakefile
 - lib/datadog_rails.rb
+- lib/datadog_rails/configuration.rb
 - lib/datadog_rails/railtie.rb
 - lib/datadog_rails/version.rb
 - lib/tasks/datadog_rails_tasks.rake

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2016 Henrique Menezes
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,3 +0,0 @@
-= DatadogRails
-
-This project rocks and uses MIT-LICENSE.