influxdb-rails 1.0.1.beta2 → 1.0.3

data/spec/requests/action_view_partial_metrics_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "ActionView partial metrics", type: :request do
   let(:tags_middleware) do
@@ -17,18 +17,11 @@ RSpec.describe "ActionView partial metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "render_partial",
-        additional_tag:  :value,
-        filename:        include("spec/support/views/metrics/_item.html.erb"),
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:     "render_partial",
+        filename: include("spec/support/views/metrics/_item.html.erb")
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        value:            be_between(1, 30)
+        value: be_between(1, 500)
       )
     )
   end
@@ -40,8 +33,7 @@ RSpec.describe "ActionView partial metrics", type: :request do
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_partial"
+        hook: "render_partial"
       ),
       timestamp: 1_514_797_200
     )
@@ -54,8 +46,7 @@ RSpec.describe "ActionView partial metrics", type: :request do
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_partial"
+        hook: "render_partial"
       )
     )
   end

data/spec/requests/action_view_template_metrics_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "ActionView template metrics", type: :request do
   let(:tags_middleware) do
@@ -17,18 +17,11 @@ RSpec.describe "ActionView template metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "render_template",
-        additional_tag:  :value,
-        filename:        include("spec/support/views/metrics/index.html.erb"),
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:     "render_template",
+        filename: include("spec/support/views/metrics/index.html.erb")
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        value:            be_between(1, 30)
+        value: be_between(1, 500)
       )
     )
   end
@@ -40,8 +33,7 @@ RSpec.describe "ActionView template metrics", type: :request do
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_template"
+        hook: "render_template"
       ),
       timestamp: 1_514_797_200
     )
@@ -54,8 +46,7 @@ RSpec.describe "ActionView template metrics", type: :request do
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_template"
+        hook: "render_template"
       )
     )
   end

data/spec/requests/active_job_enqueue_metrics_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "ActiveJob enqueue metrics", type: :request do
   let(:tags_middleware) do
@@ -18,20 +18,13 @@ RSpec.describe "ActiveJob enqueue metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "enqueue",
-        job:             "MetricJob",
-        queue:           "default",
-        state:           "queued",
-        additional_tag:  :value,
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:  "enqueue",
+        job:   "MetricJob",
+        queue: "default",
+        state: "queued"
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        value:            1
+        value: 1
       )
     )
   end
@@ -43,7 +36,6 @@ RSpec.describe "ActiveJob enqueue metrics", type: :request do
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
         hook:     "enqueue"
       ),
       timestamp: 1_514_797_200
@@ -57,7 +49,6 @@ RSpec.describe "ActiveJob enqueue metrics", type: :request do
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
         hook:     "enqueue"
       )
     )

data/spec/requests/active_job_perform_metrics_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "ActiveJobs perform metrics", type: :request do
   let(:tags_middleware) do
@@ -20,14 +20,10 @@ RSpec.describe "ActiveJobs perform metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "perform",
-        state:           "succeeded",
-        job:             "MetricJob",
-        queue:           "default",
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:  "perform",
+        state: "succeeded",
+        job:   "MetricJob",
+        queue: "default"
       ),
       values: a_hash_including(
         value: be_between(0, 30)
@@ -44,7 +40,6 @@ RSpec.describe "ActiveJobs perform metrics", type: :request do
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
         hook:     "perform"
       ),
       timestamp: 1_514_797_200
@@ -60,7 +55,6 @@ RSpec.describe "ActiveJobs perform metrics", type: :request do
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
         hook:     "perform"
       )
     )

data/spec/requests/active_record_instantiation_metrics_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "ActiveRecord instantiation metrics", type: :request do
   let(:tags_middleware) do
@@ -19,19 +19,12 @@ RSpec.describe "ActiveRecord instantiation metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#show",
-        hook:            "instantiation",
-        class_name:      "Metric",
-        additional_tag:  :value,
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:       "instantiation",
+        class_name: "Metric"
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        value:            be_between(1, 30),
-        record_count:     1
+        value:        be_between(1, 500),
+        record_count: 1
       )
     )
   end
@@ -43,8 +36,7 @@ RSpec.describe "ActiveRecord instantiation metrics", type: :request do
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#show",
-        hook:     "instantiation"
+        hook: "instantiation"
       ),
       timestamp: 1_514_797_200
     )
@@ -57,8 +49,7 @@ RSpec.describe "ActiveRecord instantiation metrics", type: :request do
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#show",
-        hook:     "instantiation"
+        hook: "instantiation"
       )
     )
   end

data/spec/requests/active_record_sql_metrics_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "ActiveRecord SQL metrics", type: :request do
   let(:tags_middleware) do
@@ -19,21 +19,14 @@ RSpec.describe "ActiveRecord SQL metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "sql",
-        name:            "Metric Create",
-        class_name:      "Metric",
-        operation:       "INSERT",
-        additional_tag:  :value,
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:       "sql",
+        name:       "Metric Create",
+        class_name: "Metric",
+        operation:  "INSERT"
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        value:            be_between(1, 30),
-        sql:              "INSERT INTO \"metrics\" (\"name\", \"created_at\", \"updated_at\") VALUES (xxx)"
+        value: be_between(1, 500),
+        sql:   "INSERT INTO \"metrics\" (\"name\", \"created_at\", \"updated_at\") VALUES (xxx)"
       )
     )
   end
@@ -45,21 +38,14 @@ RSpec.describe "ActiveRecord SQL metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "sql",
-        name:            "SQL",
-        class_name:      "SQL",
-        operation:       "INSERT",
-        additional_tag:  :value,
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:       "sql",
+        name:       "SQL",
+        class_name: "SQL",
+        operation:  "INSERT"
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        value:            be_between(1, 30),
-        sql:              "INSERT INTO \"metrics\" (\"name\", \"created_at\", \"updated_at\") VALUES (xxx)"
+        value: be_between(1, 500),
+        sql:   "INSERT INTO \"metrics\" (\"name\", \"created_at\", \"updated_at\") VALUES (xxx)"
       )
     )
   end
@@ -71,7 +57,6 @@ RSpec.describe "ActiveRecord SQL metrics", type: :request do
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
         hook:     "sql"
       ),
       timestamp: 1_514_797_200
@@ -85,7 +70,6 @@ RSpec.describe "ActiveRecord SQL metrics", type: :request do
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
         hook:     "sql"
       )
     )

data/spec/requests/block_inistrumentation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "BlockInstrumentation metrics", type: :request do
   let(:tags_middleware) do
@@ -17,20 +17,13 @@ RSpec.describe "BlockInstrumentation metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "block_instrumentation",
-        additional_tag:  :value,
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware,
-        block_tag:       :block_tag,
-        name:            "name"
+        hook:      "block_instrumentation",
+        block_tag: :block_tag,
+        name:      "name"
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        block_value:      :block_value,
-        value:            be_between(1, 30)
+        block_value: :block_value,
+        value:       be_between(1, 500)
       )
     )
   end
@@ -42,8 +35,7 @@ RSpec.describe "BlockInstrumentation metrics", type: :request do
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
-        hook:     "block_instrumentation"
+        hook: "block_instrumentation"
       ),
       timestamp: 1_514_797_200
     )
@@ -56,8 +48,7 @@ RSpec.describe "BlockInstrumentation metrics", type: :request do
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "block_instrumentation"
+        hook: "block_instrumentation"
       )
     )
   end

data/spec/requests/context_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "Context", type: :request do
   it "resets the context after a request" do

data/spec/requests/logger_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 RSpec.describe "Logger", type: :request do
   it "logs exception" do

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require "active_support"
 require_relative "../lib/influxdb/rails/helpers/rspec_matchers"
-require File.expand_path(File.dirname(__FILE__) + "/support/broken_client")
+require File.expand_path("#{File.dirname(__FILE__)}/support/broken_client")
 
 ENV["RAILS_ENV"] ||= "test"
 
@@ -34,6 +34,7 @@ RSpec.configure do |config|
   end
 
   config.include ActiveSupport::Testing::TimeHelpers
+  config.include ActiveSupport::Testing::Assertions
   config.include ActiveJob::TestHelper
 
   config.include InfluxDB::Rails::BrokenClient

data/spec/support/rails5/app.rb

@@ -20,9 +20,6 @@ app.routes.draw do
   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|
@@ -52,7 +49,9 @@ class MetricMailer < ActionMailer::Base
 end
 
 class Metric < ActiveRecord::Base; end
+
 class ApplicationController < ActionController::Base; end
+
 class MetricsController < ApplicationController
   prepend_view_path File.join(__dir__, "..", "views")
 
@@ -77,7 +76,7 @@ end
 
 class ExceptionsController < ApplicationController
   def index
-    1 / 0
+    raise ActiveRecord::RecordNotFound
   end
 end
 

data/spec/support/rails6/app.rb

@@ -20,9 +20,6 @@ app.routes.draw do
   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|
@@ -52,7 +49,9 @@ class MetricMailer < ActionMailer::Base
 end
 
 class Metric < ActiveRecord::Base; end
+
 class ApplicationController < ActionController::Base; end
+
 class MetricsController < ApplicationController
   prepend_view_path File.join(__dir__, "..", "views")
 
@@ -77,7 +76,7 @@ end
 
 class ExceptionsController < ApplicationController
   def index
-    1 / 0
+    raise ActiveRecord::RecordNotFound
   end
 end