influxdb-rails 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de0cfd84ca5bae35a32387eeec7748a1750461df
-  data.tar.gz: e00acc0bf340c656ef380821ee08919037147c13
+  metadata.gz: 4fbc8ed2ad3fcc3e00a8913460854beb566531cd
+  data.tar.gz: a9a795b4e24031b8c4be889f291a978556536882
 SHA512:
-  metadata.gz: a084fe24ad599cd77c15ae0c3e06f442a577f5d6edc096758163b6cdcff378c6ea30a6b2c020b8f59d80328440532812611866b9dc8332520b7454e34507396f
-  data.tar.gz: 4002d54a3ac373c68312132102100beebe199dfe96f6819131fafdec4e379068a1f3c142b08b54eff41667e224784f432dbdcccc2d1797be288c353728b12993
+  metadata.gz: 9f5fe545ea23eba285578df5e329ed0a93c47b15759bab28417aeb3c96f95d45e5ccd37afe863ff7d54695114cce44de3b85698bd9e150fb48ac5cd1e2366173
+  data.tar.gz: '0717389a1e94d52d4f07a142408a3b457dd153dca41d4a309d9544387937e854bc4b27c6467162ec9373bc19c8ae5388d4e7f6b69a61291352d6d43d7113e51f'

data/CHANGELOG.md

@@ -0,0 +1,65 @@
+# Changelog
+
+For the full commit log, [see here](https://github.com/influxdata/influxdb-rails/commits/master).
+
+
+## Unreleased changes
+
+## v0.1.12, released 2017-06-06
+
+- Added Rails 5.1 compatibility (#31, @djgould).
+- Added `retry` config option (#17, @scambra and #18, @bcantin).
+
+## v0.1.11, released 2016-11-24
+
+- Bumped `influxdb` Rubygem dependency (#28, #32, @agx).
+
+**Note:** The real changelog starts here. Previous entries are reconstructed
+from the commit history by correlating release version with Git tags, which
+may or may not reflect what was really released.
+
+## v0.1.10, released 2014-10-08
+
+- Lazy loading of `InfluxDB::Client` (#15, @chingo13).
+- Various test fixes.
+
+## v0.1.9, released 2014-06-18
+
+- v0.1.8 was yanked
+- Initializer now allows multiple hosts.
+
+## v0.1.7, released 2014-04-09
+
+- Added logger.
+
+## v0.1.6, released 2014-04-08
+
+- No changes (?)
+
+## v0.1.5, released 2014-04-02
+
+- No changes (?)
+
+## v0.1.4, released 2014-03-26
+
+- Added docs
+- Made `async` option default to `true`.
+
+## v0.1.3, released 2014-02-11
+
+- Set series name defaults.
+- Fixed a configuration bug.
+
+## v0.1.2, released 2014-02-11
+
+- Graceful handling of authentication errors.
+- Fixes in documentation.
+
+## v0.1.1, released 2014-02-06
+
+- Refactoring of `ActiveSupport::Notification` handling.
+- Added more initializer options.
+
+## v0.1.0, released 2014-02-06
+
+- Larger refactoring.

data/Gemfile.lock

@@ -1,89 +1,93 @@
+GIT
+  remote: git://github.com/influxdata/influxdb-ruby.git
+  revision: ea982962b89f3c994406cecdd211bd5bc8475c2f
+  branch: timestamps
+  specs:
+    influxdb (0.3.14)
+      json
+
 PATH
   remote: .
   specs:
     influxdb-rails (0.1.11)
-      influxdb (~> 0.3.0)
+      influxdb
       railties
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (5.0.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    builder (3.2.2)
-    cause (0.1)
-    concurrent-ruby (1.0.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    erubi (1.6.0)
     fakeweb (1.3.0)
-    i18n (0.7.0)
-    influxdb (0.3.13)
-      cause
-      json
-    json (2.0.2)
+    i18n (0.8.4)
+    json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    rack (2.0.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
-    rdoc (5.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -92,6 +96,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   fakeweb
+  influxdb!
   influxdb-rails!
   rake
   rdoc
@@ -100,4 +105,4 @@ DEPENDENCIES
   tzinfo
 
 BUNDLED WITH
-   1.13.6
+   1.14.6

data/README.md

@@ -14,7 +14,8 @@ Maintained by [@toddboom][] and [@dmke][].
 
 ---
 
-[![Build Status](https://travis-ci.org/influxdb/influxdb-rails.png?branch=master)](https://travis-ci.org/influxdb/influxdb-rails)
+[![Gem Version](https://badge.fury.io/rb/influxdb-rails.svg)](https://badge.fury.io/rb/influxdb-rails)
+[![Build Status](https://travis-ci.org/influxdata/influxdb-rails.svg?branch=master)](https://travis-ci.org/influxdata/influxdb-rails)
 
 Automatically instrument your Ruby on Rails applications and write the
 metrics directly into [InfluxDB](http://influxdb.org/).

data/gemfiles/Gemfile.rails-3.0.x

@@ -5,4 +5,6 @@ gem 'actionpack', '~> 3.0.15'
 gem 'activesupport', '~> 3.0.15'
 gem 'rspec-rails', '>= 2.0'
 
+gem "test-unit", "~> 3.0" if RUBY_VERSION > "2.1"
+
 gemspec :path => '../'

data/gemfiles/Gemfile.rails-3.1.x

@@ -5,4 +5,6 @@ gem 'actionpack', '~> 3.1.5'
 gem 'activesupport', '~> 3.1.5'
 gem 'rspec-rails', '>= 2.0'
 
+gem "test-unit", "~> 3.0" if RUBY_VERSION > "2.1"
+
 gemspec :path => '../'

data/gemfiles/Gemfile.rails-3.2.x

@@ -5,4 +5,6 @@ gem 'actionpack', '~> 3.2.3'
 gem 'activesupport', '~> 3.2.3'
 gem 'rspec-rails', '>= 2.0'
 
+gem "test-unit", "~> 3.0" if RUBY_VERSION > "2.1"
+
 gemspec :path => '../'

data/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'actionpack', '~> 5.0.0'
+gem 'activesupport', '~> 5.0.0'
+gem 'activemodel', '~> 5.0.0'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.rails-5.1.x

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'actionpack', '~> 5.1.0'
+gem 'activesupport', '~> 5.1.0'
+gem 'activemodel', '~> 5.1.0'
+
+gemspec :path => '../'

data/lib/influxdb-rails.rb

@@ -37,7 +37,8 @@ module InfluxDB
           :hosts => configuration.influxdb_hosts,
           :port => configuration.influxdb_port,
           :async => configuration.async,
-          :use_ssl => configuration.use_ssl
+          :use_ssl => configuration.use_ssl,
+          :retry => configuration.retry
       end
 
       def configuration
@@ -140,6 +141,15 @@ module InfluxDB
         transmit_unless_ignorable(e)
         raise(e)
       end
+
+      def safely_prepend(module_name, opts = {})
+        return if opts[:to].nil? || opts[:from].nil?
+        if opts[:to].respond_to?(:prepend, true)
+          opts[:to].send(:prepend, opts[:from].const_get(module_name))
+        else
+          opts[:to].send(:include, opts[:from].const_get("Old" + module_name))
+        end
+      end
     end
   end
 end

data/lib/influxdb/rails/configuration.rb

@@ -8,12 +8,15 @@ module InfluxDB
       attr_accessor :influxdb_database
       attr_accessor :async
       attr_accessor :use_ssl
+      attr_accessor :retry
 
       attr_accessor :series_name_for_controller_runtimes
       attr_accessor :series_name_for_view_runtimes
       attr_accessor :series_name_for_db_runtimes
 
       attr_accessor :application_id
+      deprecate :application_id => "This method serve no purpose and will be removed in the release after 0.1.12"
+
       attr_accessor :application_name
       attr_accessor :application_root
 
@@ -37,18 +40,20 @@ module InfluxDB
       attr_accessor :debug
       attr_accessor :reraise_global_exceptions
 
+
       DEFAULTS = {
-        :influxdb_hosts => ["localhost"],
-        :influxdb_port => 8086,
-        :influxdb_username => "root",
-        :influxdb_password => "root",
-        :influxdb_database => nil,
-        :async => true,
-        :use_ssl => false,
-
-        :series_name_for_controller_runtimes => "rails.controller",
-        :series_name_for_view_runtimes => "rails.view",
-        :series_name_for_db_runtimes => "rails.db",
+        :influxdb_hosts     => ["localhost"],
+        :influxdb_port      => 8086,
+        :influxdb_username  => "root",
+        :influxdb_password  => "root",
+        :influxdb_database  => nil,
+        :async              => true,
+        :use_ssl            => false,
+        :retry              => nil,
+
+        :series_name_for_controller_runtimes  => "rails.controller",
+        :series_name_for_view_runtimes        => "rails.view",
+        :series_name_for_db_runtimes          => "rails.db",
 
         :ignored_exceptions => %w{ActiveRecord::RecordNotFound
                                   ActionController::RoutingError},
@@ -80,29 +85,31 @@ module InfluxDB
       }
 
       def initialize
-        @influxdb_hosts = DEFAULTS[:influxdb_hosts]
-        @influxdb_port = DEFAULTS[:influxdb_port]
-        @influxdb_username = DEFAULTS[:influxdb_username]
-        @influxdb_password = DEFAULTS[:influxdb_password]
-        @influxdb_database = DEFAULTS[:influxdb_database]
-        @async = DEFAULTS[:async]
-        @use_ssl = DEFAULTS[:use_ssl]
-
-        @series_name_for_controller_runtimes = DEFAULTS[:series_name_for_controller_runtimes]
-        @series_name_for_view_runtimes = DEFAULTS[:series_name_for_view_runtimes]
-        @series_name_for_db_runtimes = DEFAULTS[:series_name_for_db_runtimes]
-
-        @ignored_exceptions = DEFAULTS[:ignored_exceptions].dup
-        @ignored_exception_messages = DEFAULTS[:ignored_exception_messages].dup
-        @ignored_reports = DEFAULTS[:ignored_reports].dup
-        @ignored_environments = DEFAULTS[:ignored_environments].dup
-        @ignored_user_agents = DEFAULTS[:ignored_user_agents].dup
-        @backtrace_filters = DEFAULTS[:backtrace_filters].dup
+        @influxdb_hosts     = DEFAULTS[:influxdb_hosts]
+        @influxdb_port      = DEFAULTS[:influxdb_port]
+        @influxdb_username  = DEFAULTS[:influxdb_username]
+        @influxdb_password  = DEFAULTS[:influxdb_password]
+        @influxdb_database  = DEFAULTS[:influxdb_database]
+        @async              = DEFAULTS[:async]
+        @use_ssl            = DEFAULTS[:use_ssl]
+        @retry              = DEFAULTS[:retry]
+
+        @series_name_for_controller_runtimes  = DEFAULTS[:series_name_for_controller_runtimes]
+        @series_name_for_view_runtimes        = DEFAULTS[:series_name_for_view_runtimes]
+        @series_name_for_db_runtimes          = DEFAULTS[:series_name_for_db_runtimes]
+
+        @ignored_exceptions           = DEFAULTS[:ignored_exceptions].dup
+        @ignored_exception_messages   = DEFAULTS[:ignored_exception_messages].dup
+        @ignored_reports              = DEFAULTS[:ignored_reports].dup
+        @ignored_environments         = DEFAULTS[:ignored_environments].dup
+        @ignored_user_agents          = DEFAULTS[:ignored_user_agents].dup
+        @backtrace_filters            = DEFAULTS[:backtrace_filters].dup
         @environment_variable_filters = DEFAULTS[:environment_variable_filters]
         @aggregated_exception_classes = []
-        @debug = false
+
+        @debug                    = false
         @rescue_global_exceptions = false
-        @instrumentation_enabled = true
+        @instrumentation_enabled  = true
       end
 
       def debug?
@@ -137,6 +144,7 @@ module InfluxDB
       def database_name
         @application_id.to_s + @environment.to_s
       end
+      deprecate :database_name => "This method will be removed in the release after 0.1.12, you ought to use #influxdb_database"
 
       private
       def initialize_http_connection

data/lib/influxdb/rails/exception_presenter.rb

@@ -5,8 +5,6 @@ require "json"
 module InfluxDB
   module Rails
     class ExceptionPresenter
-      attr_accessor :hash
-
       attr_reader :exception
       attr_reader :backtrace
       attr_reader :params
@@ -54,13 +52,7 @@ module InfluxDB
           :custom_data => @custom_data
         }
 
-        # c[:environment_variables] = JSON.generate(@environment_variables.reject do |k,v|
-        #   InfluxDB::Rails.configuration.environment_variable_filters.any? { |filter| k =~ filter }
-        # end)
-
         InfluxDB::Rails.configuration.add_custom_exception_data(self)
-
-        # c[:request_data] = JSON.generate(request_data) if @controller || @action || !@params.blank?
         c
       end