influxdb-rails 1.0.0.beta2 → 1.0.1.beta2

data/spec/support/rails6/app.rb

@@ -0,0 +1,84 @@
+require "action_controller/railtie"
+require "active_record/railtie"
+require "active_job"
+require "action_mailer"
+
+app = Class.new(Rails::Application)
+app.config.secret_key_base = "1234567890abcdef1234567890abcdef"
+app.config.secret_token = "1234567890abcdef1234567890abcdef"
+app.config.session_store :cookie_store, key: "_myapp_session"
+app.config.active_support.deprecation = :log
+app.config.eager_load = false
+app.config.root = __dir__
+Rails.backtrace_cleaner.remove_silencers!
+ActiveJob::Base.logger = Rails.logger
+ActionMailer::Base.delivery_method = :test
+app.initialize!
+
+app.routes.draw do
+  resources :metrics, only: %i[index show]
+  resources :exceptions, only: :index
+end
+
+InfluxDB::Rails.configure do |config|
+end
+
+ENV["DATABASE_URL"] = "sqlite3::memory:"
+ActiveRecord::Schema.define do
+  create_table :metrics, force: true do |t|
+    t.string :name
+
+    t.timestamps
+  end
+end
+
+class MetricJob < ActiveJob::Base
+  queue_as :default
+
+  def perform
+    # Do something later
+  end
+end
+
+class MetricMailer < ActionMailer::Base
+  default from: "from@example.com"
+  layout "mailer"
+
+  def welcome_mail
+    mail(to: "eisendieter@werder.de", subject: "Welcome to metrics!") do |format|
+      format.text { render plain: "Hello Dieter!" }
+    end
+  end
+end
+
+class Metric < ActiveRecord::Base; end
+class ApplicationController < ActionController::Base; end
+class MetricsController < ApplicationController
+  prepend_view_path File.join(__dir__, "..", "views")
+
+  before_action do
+    InfluxDB::Rails.current.values = { additional_value: :value }
+    InfluxDB::Rails.current.tags = { additional_tag: :value }
+  end
+
+  def index
+    InfluxDB::Rails.instrument "name", tags: { block_tag: :block_tag }, values: { block_value: :block_value } do
+      1 + 1
+    end
+    MetricJob.perform_later
+    MetricMailer.with(user: "eisendieter").welcome_mail.deliver_now
+    Metric.create!(name: "name")
+  end
+
+  def show
+    @metric = Metric.find_by(name: "name")
+  end
+end
+
+class ExceptionsController < ApplicationController
+  def index
+    1 / 0
+  end
+end
+
+Object.const_set(:ApplicationHelper, Module.new)

data/spec/support/views/layouts/mailer.txt.erb

@@ -0,0 +1 @@
+<%= yield %>

data/spec/support/views/metrics/show.html.erb

@@ -0,0 +1,4 @@
+<h1>Show</h1>
+<div>
+  <%= @metric.name %>
+</div>

data/spec/unit/block_instrumentation_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+RSpec.describe InfluxDB::Rails do
+  describe ".instrument" do
+    it "supports calling wihout a block" do
+      InfluxDB::Rails.instrument "name", values: { value: 1 }
+
+      expect_metric(
+        values: a_hash_including(value: 1),
+        tags:   a_hash_including(
+          hook:     "block_instrumentation",
+          server:   Socket.gethostname,
+          location: :raw
+        )
+      )
+    end
+  end
+end

data/spec/unit/configuration_spec.rb

@@ -5,90 +5,72 @@ RSpec.describe InfluxDB::Rails::Configuration do
     @configuration = InfluxDB::Rails::Configuration.new
   end
 
-  describe "#ignore_user_agent?" do
-    it "should be true for user agents that have been set as ignorable" do
-      @configuration.ignored_user_agents = %w[Googlebot]
-      expect(@configuration.ignore_user_agent?("Googlebot/2.1")).to be_truthy
-    end
-
-    it "should be false for user agents that have not been set as ignorable" do
-      @configuration.ignored_user_agents = %w[Googlebot]
-      expect(@configuration.ignore_user_agent?("Mozilla/5.0")).to be_falsey
-    end
-
-    it "should be false if the ignored user agents list is empty" do
-      @configuration.ignored_user_agents = []
-      expect(@configuration.ignore_user_agent?("Googlebot/2.1")).to be_falsey
-    end
+  describe "client configuration" do
+    subject { InfluxDB::Rails.configuration.client }
 
-    it "should be false if the ignored user agents list is inadvertently set to nil" do
-      @configuration.ignored_user_agents = nil
-      expect(@configuration.ignore_user_agent?("Googlebot/2.1")).to be_falsey
-    end
-  end
-
-  describe "#retry" do
-    it "defaults to nil" do
-      expect(InfluxDB::Rails.configuration.retry).to be_nil
-    end
+    describe "#retry" do
+      it "defaults to nil" do
+        expect(subject.retry).to be_nil
+      end
 
-    it "can be updated" do
-      InfluxDB::Rails.configure do |config|
-        config.retry = 5
+      it "can be updated" do
+        InfluxDB::Rails.configure do |config|
+          config.client.retry = 5
+        end
+        expect(subject.retry).to eql(5)
       end
-      expect(InfluxDB::Rails.configuration.retry).to eql(5)
     end
-  end
 
-  describe "#open_timeout" do
-    it "defaults to 5" do
-      expect(InfluxDB::Rails.configuration.open_timeout).to eql(5)
-    end
+    describe "#open_timeout" do
+      it "defaults to 5" do
+        expect(subject.open_timeout).to eql(5)
+      end
 
-    it "can be updated" do
-      InfluxDB::Rails.configure do |config|
-        config.open_timeout = 5
+      it "can be updated" do
+        InfluxDB::Rails.configure do |config|
+          config.client.open_timeout = 5
+        end
+        expect(subject.open_timeout).to eql(5)
       end
-      expect(InfluxDB::Rails.configuration.open_timeout).to eql(5)
     end
-  end
 
-  describe "#read_timeout" do
-    it "defaults to 300" do
-      expect(InfluxDB::Rails.configuration.read_timeout).to eql(300)
-    end
+    describe "#read_timeout" do
+      it "defaults to 300" do
+        expect(subject.read_timeout).to eql(300)
+      end
 
-    it "can be updated" do
-      InfluxDB::Rails.configure do |config|
-        config.read_timeout = 5
+      it "can be updated" do
+        InfluxDB::Rails.configure do |config|
+          config.client.read_timeout = 5
+        end
+        expect(subject.read_timeout).to eql(5)
       end
-      expect(InfluxDB::Rails.configuration.read_timeout).to eql(5)
     end
-  end
 
-  describe "#max_delay" do
-    it "defaults to 30" do
-      expect(InfluxDB::Rails.configuration.max_delay).to eql(30)
-    end
+    describe "#max_delay" do
+      it "defaults to 30" do
+        expect(subject.max_delay).to eql(30)
+      end
 
-    it "can be updated" do
-      InfluxDB::Rails.configure do |config|
-        config.max_delay = 5
+      it "can be updated" do
+        InfluxDB::Rails.configure do |config|
+          config.client.max_delay = 5
+        end
+        expect(subject.max_delay).to eql(5)
       end
-      expect(InfluxDB::Rails.configuration.max_delay).to eql(5)
     end
-  end
 
-  describe "#time_precision" do
-    it "defaults to seconds" do
-      expect(InfluxDB::Rails.configuration.time_precision).to eql("s")
-    end
+    describe "#time_precision" do
+      it "defaults to seconds" do
+        expect(subject.time_precision).to eql("s")
+      end
 
-    it "can be updated" do
-      InfluxDB::Rails.configure do |config|
-        config.time_precision = "ms"
+      it "can be updated" do
+        InfluxDB::Rails.configure do |config|
+          config.client.time_precision = "ms"
+        end
+        expect(subject.time_precision).to eql("ms")
       end
-      expect(InfluxDB::Rails.configuration.time_precision).to eql("ms")
     end
   end
 

data/spec/unit/sql/query_spec.rb

@@ -24,5 +24,6 @@ RSpec.describe InfluxDB::Rails::Sql::Query do
     it { expect(described_class.new(sql: "DELETE").track?).to be true }
     it { expect(described_class.new(sql: "SCHEMA").track?).to be false }
     it { expect(described_class.new(sql: "BEGIN").track?).to be false }
+    it { expect(described_class.new(sql: "SELECT", name: "SCHEMA").track?).to be false }
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.1.beta2
 platform: ruby
 authors:
-- Dominik Menke
-- Todd Persen
-autorequire: 
+- Christian Bruckmayer
+- Henne Vogelsang
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -37,14 +37,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +115,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -149,14 +205,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.61.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -185,15 +241,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem automatically instruments your Ruby on Rails 4.2/5.x applications
-  using InfluxDB for storage.
+description: This gem instruments your Ruby on Rails application using InfluxDB.
 email:
-- dominik.menke@gmail.com
-- todd@influxdb.com
+- christian@bruckmayer.net
+- hvogel@hennevogel.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -204,55 +260,77 @@ files:
 - README.md
 - Rakefile
 - config.ru
-- gemfiles/Gemfile.rails-4.2.x
-- gemfiles/Gemfile.rails-5.0.x
-- gemfiles/Gemfile.rails-5.1.x
 - gemfiles/Gemfile.rails-5.2.x
+- gemfiles/Gemfile.rails-6.0.x
 - influxdb-rails.gemspec
 - lib/influxdb-rails.rb
-- lib/influxdb/rails/air_traffic_controller.rb
-- lib/influxdb/rails/backtrace.rb
 - lib/influxdb/rails/configuration.rb
-- lib/influxdb/rails/exception_presenter.rb
-- lib/influxdb/rails/instrumentation.rb
-- lib/influxdb/rails/logger.rb
-- lib/influxdb/rails/middleware/hijack_render_exception.rb
-- lib/influxdb/rails/middleware/hijack_rescue_action_everywhere.rb
+- lib/influxdb/rails/context.rb
+- lib/influxdb/rails/helpers/rspec_matchers.rb
+- lib/influxdb/rails/metric.rb
+- lib/influxdb/rails/middleware/action_mailer_subscriber.rb
+- lib/influxdb/rails/middleware/active_job_subscriber.rb
+- lib/influxdb/rails/middleware/active_record_subscriber.rb
+- lib/influxdb/rails/middleware/block_instrumentation_subscriber.rb
 - lib/influxdb/rails/middleware/render_subscriber.rb
 - lib/influxdb/rails/middleware/request_subscriber.rb
-- lib/influxdb/rails/middleware/simple_subscriber.rb
 - lib/influxdb/rails/middleware/sql_subscriber.rb
 - lib/influxdb/rails/middleware/subscriber.rb
-- lib/influxdb/rails/rack.rb
 - lib/influxdb/rails/railtie.rb
 - lib/influxdb/rails/sql/normalizer.rb
 - lib/influxdb/rails/sql/query.rb
+- lib/influxdb/rails/tags.rb
+- lib/influxdb/rails/test_client.rb
+- lib/influxdb/rails/values.rb
 - lib/influxdb/rails/version.rb
 - lib/rails/generators/influxdb/influxdb_generator.rb
 - lib/rails/generators/influxdb/templates/initializer.rb
-- spec/controllers/widgets_controller_spec.rb
-- spec/integration/exceptions_spec.rb
-- spec/integration/integration_helper.rb
-- spec/integration/metrics_spec.rb
+- sample-dashboard/Dockerfile
+- sample-dashboard/README.md
+- sample-dashboard/Rakefile
+- sample-dashboard/Ruby On Rails Performance (per Action).json
+- sample-dashboard/Ruby On Rails Performance (per Request).json
+- sample-dashboard/Ruby On Rails Performance.json
+- sample-dashboard/docker-compose.yml
+- sample-dashboard/provisioning/grafana-dashboards.yml
+- sample-dashboard/provisioning/grafana-datasource.yml
+- sample-dashboard/provisioning/performance-action.json
+- sample-dashboard/provisioning/performance-request.json
+- sample-dashboard/provisioning/performance.json
+- spec/requests/action_controller_metrics_spec.rb
+- spec/requests/action_mailer_deliver_metrics_spec.rb
+- spec/requests/action_view_collection_metrics_spec.rb
+- spec/requests/action_view_partial_metrics_spec.rb
+- spec/requests/action_view_template_metrics_spec.rb
+- spec/requests/active_job_enqueue_metrics_spec.rb
+- spec/requests/active_job_perform_metrics_spec.rb
+- spec/requests/active_job_perform_start_metrics_spec.rb
+- spec/requests/active_record_instantiation_metrics_spec.rb
+- spec/requests/active_record_sql_metrics_spec.rb
+- spec/requests/block_inistrumentation_spec.rb
+- spec/requests/context_spec.rb
+- spec/requests/logger_spec.rb
 - spec/spec_helper.rb
-- spec/support/rails4/app.rb
+- spec/support/broken_client.rb
 - spec/support/rails5/app.rb
-- spec/support/views/widgets/_item.html.erb
-- spec/support/views/widgets/index.html.erb
-- spec/unit/backtrace_spec.rb
+- spec/support/rails6/app.rb
+- spec/support/views/layouts/mailer.txt.erb
+- spec/support/views/metrics/_item.html.erb
+- spec/support/views/metrics/index.html.erb
+- spec/support/views/metrics/show.html.erb
+- spec/unit/block_instrumentation_spec.rb
 - spec/unit/configuration_spec.rb
-- spec/unit/exception_presenter_spec.rb
-- spec/unit/influxdb_rails_spec.rb
-- spec/unit/middleware/render_subscriber_spec.rb
-- spec/unit/middleware/request_subscriber_spec.rb
-- spec/unit/middleware/sql_subscriber_spec.rb
 - spec/unit/sql/normalizer_spec.rb
 - spec/unit/sql/query_spec.rb
 homepage: https://influxdata.com
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,34 +338,41 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: InfluxDB bindings for Ruby on Rails.
 test_files:
-- spec/controllers/widgets_controller_spec.rb
-- spec/integration/exceptions_spec.rb
-- spec/integration/integration_helper.rb
-- spec/integration/metrics_spec.rb
+- spec/requests/action_controller_metrics_spec.rb
+- spec/requests/action_mailer_deliver_metrics_spec.rb
+- spec/requests/action_view_collection_metrics_spec.rb
+- spec/requests/action_view_partial_metrics_spec.rb
+- spec/requests/action_view_template_metrics_spec.rb
+- spec/requests/active_job_enqueue_metrics_spec.rb
+- spec/requests/active_job_perform_metrics_spec.rb
+- spec/requests/active_job_perform_start_metrics_spec.rb
+- spec/requests/active_record_instantiation_metrics_spec.rb
+- spec/requests/active_record_sql_metrics_spec.rb
+- spec/requests/block_inistrumentation_spec.rb
+- spec/requests/context_spec.rb
+- spec/requests/logger_spec.rb
 - spec/spec_helper.rb
-- spec/support/rails4/app.rb
+- spec/support/broken_client.rb
 - spec/support/rails5/app.rb
-- spec/support/views/widgets/_item.html.erb
-- spec/support/views/widgets/index.html.erb
-- spec/unit/backtrace_spec.rb
+- spec/support/rails6/app.rb
+- spec/support/views/layouts/mailer.txt.erb
+- spec/support/views/metrics/_item.html.erb
+- spec/support/views/metrics/index.html.erb
+- spec/support/views/metrics/show.html.erb
+- spec/unit/block_instrumentation_spec.rb
 - spec/unit/configuration_spec.rb
-- spec/unit/exception_presenter_spec.rb
-- spec/unit/influxdb_rails_spec.rb
-- spec/unit/middleware/render_subscriber_spec.rb
-- spec/unit/middleware/request_subscriber_spec.rb
-- spec/unit/middleware/sql_subscriber_spec.rb
 - spec/unit/sql/normalizer_spec.rb
 - spec/unit/sql/query_spec.rb