influxdb-rails 0.4.999 → 1.0.0.beta1

data/spec/unit/exception_presenter_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe InfluxDB::Rails::ExceptionPresenter do
   before do
     begin
-      1/0
-    rescue Exception => e
+      1 / 0
+    rescue ZeroDivisionError => e
       @exception = e
     end
   end

data/spec/unit/influxdb_rails_spec.rb

@@ -1,66 +1,119 @@
-require 'spec_helper'
+require "spec_helper"
 
 RSpec.describe InfluxDB::Rails do
   before do
-    InfluxDB::Rails.configure { |config| config.ignored_environments = [] }
+    InfluxDB::Rails.configure do |config|
+      config.application_name = "my-rails-app"
+      config.ignored_environments = []
+      config.time_precision = "ms"
+    end
   end
 
-  describe '.convert_timestamp' do
-    let(:sometime) { Time.parse('2017-12-11 16:20:29.111222333 UTC') }
-    let(:configuration) { double("Configuration") }
-    before { allow(InfluxDB::Rails).to receive(:configuration).and_return configuration }
-
-    it "should return the timestamp in nanoseconds when precision is 'ns'" do
-      allow(configuration).to receive(:time_precision).and_return('ns')
-      expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(1513009229111222272)
-    end
-    it "should return the timestamp in nanoseconds when precision is nil" do
-      allow(configuration).to receive(:time_precision)
-      expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(1513009229111222272)
-    end
-    it "should return the timestamp in microseconds when precision is u" do
-      allow(configuration).to receive(:time_precision).and_return('u')
-      expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(1513009229111222)
-    end
-    it "should return the timestamp in milliseconds when precision is ms" do
-      allow(configuration).to receive(:time_precision).and_return('ms')
-      expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(1513009229111)
+  describe ".handle_action_controller_metrics" do
+    let(:start)   { Time.at(1_517_567_368) }
+    let(:finish)  { Time.at(1_517_567_370) }
+    let(:payload) { { view_runtime: 2, db_runtime: 2, controller: "MyController", action: "show", method: "GET", format: "*/*", path: "/posts", status: 200 } }
+    let(:data)    do
+      {
+        values:    {
+          value: 2
+        },
+        tags:      {
+          method:      "MyController#show",
+          status:      200,
+          format:      "*/*",
+          http_method: "GET",
+          path:        "/posts",
+          server:      Socket.gethostname,
+          app_name:    "my-rails-app",
+        },
+        timestamp: 1_517_567_370_000
+      }
     end
-    it "should return the timestamp in seconds when precision is s" do
-      allow(configuration).to receive(:time_precision).and_return('s')
-      expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(1513009229)
+
+    context "application_name is set" do
+      it "sends metrics with taggings and timestamps" do
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with(
+          "rails.controller", data.merge(values: { value: 2000 })
+        )
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with("rails.view", data)
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with("rails.db", data)
+
+        described_class.handle_action_controller_metrics("unused", start, finish, "unused", payload)
+      end
     end
-    it "should return the timestamp in minutes when precision is m" do
-      allow(configuration).to receive(:time_precision).and_return('m')
-      expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(25216820)
+
+    context "application_name is nil" do
+      before do
+        InfluxDB::Rails.configure do |config|
+          config.application_name = nil
+        end
+      end
+
+      it "does not add the app_name tag to metrics" do
+        tags = {
+          method:      "MyController#show",
+          status:      200,
+          format:      "*/*",
+          http_method: "GET",
+          path:        "/posts",
+          server:      Socket.gethostname,
+        }
+
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with(
+          "rails.controller", data.merge(values: { value: 2000 }, tags: tags)
+        )
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with("rails.view", data.merge(tags: tags))
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with("rails.db", data.merge(tags: tags))
+
+        described_class.handle_action_controller_metrics("unused", start, finish, "unused", payload)
+      end
     end
-    it "should return the timestamp in hours when precision is h" do
-      allow(configuration).to receive(:time_precision).and_return('h')
-      expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(420280)
+  end
+
+  describe ".convert_timestamp" do
+    let(:sometime) { Time.parse("2017-12-11 16:20:29.111222333 UTC") }
+    let(:configuration) { double("Configuration") }
+    before { allow(InfluxDB::Rails).to receive(:configuration).and_return configuration }
+
+    {
+      "ns" => 1_513_009_229_111_222_333,
+      nil  => 1_513_009_229_111_222_333,
+      "u"  => 1_513_009_229_111_222,
+      "ms" => 1_513_009_229_111,
+      "s"  => 1_513_009_229,
+      "m"  => 25_216_820,
+      "h"  => 420_280,
+    }.each do |precision, converted_value|
+      it "should return the timestamp in nanoseconds when precision is #{precision.inspect}" do
+        allow(configuration).to receive(:time_precision).and_return(precision)
+        expect(InfluxDB::Rails.convert_timestamp(sometime)).to eq(converted_value)
+      end
     end
+
     it "should raise an excpetion when precision is unrecognized" do
-      allow(configuration).to receive(:time_precision).and_return('whatever')
-      expect{InfluxDB::Rails.convert_timestamp(sometime)}.
-        to raise_exception /invalid time precision.*whatever/i
+      allow(configuration).to receive(:time_precision).and_return("whatever")
+      expect { InfluxDB::Rails.convert_timestamp(sometime) }
+        .to raise_exception(/invalid time precision.*whatever/i)
     end
   end
 
-  describe '.current_timestamp' do
+  describe ".current_timestamp" do
     it "should return the current timestamp in the configured precision" do
-      now = Time.parse('2017-12-11 16:20:29.111222333 UTC')
+      now = Time.parse("2017-12-11 16:20:29.111222333 UTC")
       allow(Time).to receive(:now).and_return(now)
-      InfluxDB::Rails.configure {|config| config.time_precision = 'ms'}
-      expect(InfluxDB::Rails.current_timestamp).to eq(1513009229111)
+      InfluxDB::Rails.configure { |config| config.time_precision = "ms" }
+      expect(InfluxDB::Rails.current_timestamp).to eq(1_513_009_229_111)
     end
   end
 
   describe ".ignorable_exception?" do
     it "should be true for exception types specified in the configuration" do
-      class DummyException < Exception; end
+      class DummyException < RuntimeError; end
       exception = DummyException.new
 
       InfluxDB::Rails.configure do |config|
-        config.ignored_exceptions << 'DummyException'
+        config.ignored_exceptions << "DummyException"
       end
 
       expect(InfluxDB::Rails.ignorable_exception?(exception)).to be_truthy
@@ -77,40 +130,35 @@ RSpec.describe InfluxDB::Rails do
     end
   end
 
-  describe 'rescue' do
+  describe "rescue" do
     it "should transmit an exception when passed" do
-      InfluxDB::Rails.configure do |config|
-        config.ignored_environments = []
-        config.instrumentation_enabled = false
-      end
-
       expect(InfluxDB::Rails.client).to receive(:write_point)
 
       InfluxDB::Rails.rescue do
-        raise ArgumentError.new('wrong')
+        raise ArgumentError, "wrong"
       end
     end
 
     it "should also raise the exception when in an ignored environment" do
-      InfluxDB::Rails.configure { |config| config.ignored_environments = %w{development test} }
+      InfluxDB::Rails.configure do |config|
+        config.ignored_environments = %w[development test]
+      end
 
-      expect {
+      expect do
         InfluxDB::Rails.rescue do
-          raise ArgumentError.new('wrong')
+          raise ArgumentError, "wrong"
         end
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 
   describe "rescue_and_reraise" do
     it "should transmit an exception when passed" do
-      InfluxDB::Rails.configure { |config| config.ignored_environments = [] }
-
       expect(InfluxDB::Rails.client).to receive(:write_point)
 
-      expect {
-        InfluxDB::Rails.rescue_and_reraise { raise ArgumentError.new('wrong') }
-      }.to raise_error(ArgumentError)
+      expect do
+        InfluxDB::Rails.rescue_and_reraise { raise ArgumentError, "wrong" }
+      end.to raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.999
+  version: 1.0.0.beta1
 platform: ruby
 authors:
-- Christian Bruckmayer
-- Henne Vogelsang
+- Dominik Menke
+- Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.60.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -137,17 +151,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem automatically instruments your Ruby on Rails application using
-  InfluxDB.
+description: This gem automatically instruments your Ruby on Rails 4.2/5.x applications
+  using InfluxDB for storage.
 email:
-- christian@bruckmayer.net
-- hvogel@hennevogel.de
+- dominik.menke@gmail.com
+- todd@influxdb.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -155,11 +170,10 @@ files:
 - README.md
 - Rakefile
 - config.ru
-- gemfiles/Gemfile.rails-4.0.x
-- gemfiles/Gemfile.rails-4.1.x
 - gemfiles/Gemfile.rails-4.2.x
 - gemfiles/Gemfile.rails-5.0.x
 - gemfiles/Gemfile.rails-5.1.x
+- gemfiles/Gemfile.rails-5.2.x
 - influxdb-rails.gemspec
 - lib/influxdb-rails.rb
 - lib/influxdb/rails/air_traffic_controller.rb
@@ -181,29 +195,16 @@ files:
 - spec/integration/metrics_spec.rb
 - spec/spec_helper.rb
 - spec/support/rails4/app.rb
-- spec/support/rails4/log/test.log
 - spec/support/rails5/app.rb
-- spec/support/rails5/log/development.log
-- spec/support/rails5/log/test.log
 - spec/unit/backtrace_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/exception_presenter_spec.rb
 - spec/unit/influxdb_rails_spec.rb
-homepage: http://influxdb.com
+homepage: https://influxdata.com
 licenses:
 - MIT
-metadata:
-  bug_tracker_uri: https://github.com/influxdata/influxdb-rails/issues
-  changelog_uri: https://github.com/influxdata/influxdb-rails/blob/master/CHANGELOG.md
-  documentation_uri: https://github.com/influxdata/influxdb-rails/blob/master/README.md
-  source_code_uri: https://github.com/influxdata/influxdb-rails
-post_install_message: |2+
-
-  This is the last supported version of influxdb-rails in the 0.4 series. The
-  next release will be 1.0 with quite a lot of breaking changes. For details:
-
-  https://github.com/influxdata/influxdb-rails/wiki/1.0-Upgrade-Guide
-
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -211,29 +212,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: InfluxDB bindings for Ruby on Rails.
 test_files:
-- spec/spec_helper.rb
-- spec/unit/influxdb_rails_spec.rb
-- spec/unit/backtrace_spec.rb
-- spec/unit/configuration_spec.rb
-- spec/unit/exception_presenter_spec.rb
+- spec/controllers/widgets_controller_spec.rb
 - spec/integration/exceptions_spec.rb
 - spec/integration/integration_helper.rb
 - spec/integration/metrics_spec.rb
+- spec/spec_helper.rb
 - spec/support/rails4/app.rb
-- spec/support/rails4/log/test.log
 - spec/support/rails5/app.rb
-- spec/support/rails5/log/test.log
-- spec/support/rails5/log/development.log
-- spec/controllers/widgets_controller_spec.rb
+- spec/unit/backtrace_spec.rb
+- spec/unit/configuration_spec.rb
+- spec/unit/exception_presenter_spec.rb
+- spec/unit/influxdb_rails_spec.rb

data/gemfiles/Gemfile.rails-4.0.x

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gem 'actionpack', '~> 4.0.0'
-gem 'activesupport', '~> 4.0.0'
-gem 'activemodel', '~> 4.0.0'
-gem 'rspec-rails', '>= 2.0'
-
-gemspec :path => '../'

data/gemfiles/Gemfile.rails-4.1.x

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