influxdb-rails 1.0.0 → 1.0.1.beta1

data/spec/support/rails6/app.rb

@@ -0,0 +1,70 @@
+require "action_controller/railtie"
+require "active_record/railtie"
+require "active_job"
+
+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
+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 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
+    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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.beta1
 platform: ruby
 authors:
 - Christian Bruckmayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -37,14 +37,28 @@ 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: 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 +101,20 @@ 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
@@ -175,16 +203,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +235,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -217,23 +246,29 @@ 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/configuration.rb
 - lib/influxdb/rails/context.rb
-- lib/influxdb/rails/instrumentation.rb
+- lib/influxdb/rails/helpers/rspec_matchers.rb
+- lib/influxdb/rails/metric.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/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
@@ -249,20 +284,27 @@ files:
 - sample-dashboard/provisioning/performance-action.json
 - sample-dashboard/provisioning/performance-request.json
 - sample-dashboard/provisioning/performance.json
-- spec/controllers/widgets_controller_spec.rb
-- spec/integration/integration_helper.rb
-- spec/integration/metrics_spec.rb
-- spec/shared_examples/data.rb
+- spec/requests/action_controller_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/support/rails6/app.rb
+- 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/context_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
@@ -281,31 +323,39 @@ 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: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+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/integration_helper.rb
-- spec/integration/metrics_spec.rb
-- spec/shared_examples/data.rb
+- spec/requests/action_controller_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/support/rails6/app.rb
+- 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/context_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

data/gemfiles/Gemfile.rails-4.2.x

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

data/lib/influxdb/rails/instrumentation.rb

@@ -1,34 +0,0 @@
-module InfluxDB
-  module Rails
-    module Instrumentation
-      def benchmark_for_instrumentation # rubocop:disable Metrics/MethodLength
-        start = Time.now
-        yield
-
-        c = InfluxDB::Rails.configuration
-        return if c.ignore_current_environment?
-
-        InfluxDB::Rails.client.write_point \
-          "instrumentation".freeze,
-          values: {
-            value: ((Time.now - start) * 1000).ceil,
-          },
-          tags:   c.tags_middleware.call(
-            method: "#{controller_name}##{action_name}",
-            server: Socket.gethostname
-          )
-      end
-
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def instrument(methods = [])
-          methods = [methods] unless methods.is_a?(Array)
-          around_filter :benchmark_for_instrumentation, only: methods
-        end
-      end
-    end
-  end
-end

data/lib/influxdb/rails/middleware/simple_subscriber.rb

@@ -1,33 +0,0 @@
-require "influxdb/rails/middleware/subscriber"
-
-module InfluxDB
-  module Rails
-    module Middleware
-      # Subscriber acts as base class for different *Subscriber classes,
-      # which are intended as ActiveSupport::Notifications.subscribe
-      # consumers.
-      class SimpleSubscriber < Subscriber
-        def call(_name, started, finished, _id, payload)
-          return unless enabled?
-
-          InfluxDB::Rails.client.write_point \
-            configuration.measurement_name,
-            values:    values(started, finished, payload),
-            tags:      tags(payload),
-            timestamp: timestamp(finished)
-        rescue StandardError => e
-          ::Rails.logger.error("[InfluxDB::Rails] Unable to write points: #{e.message}")
-        end
-
-        private
-
-        def values(started, finished, _payload)
-          result = { value: ((finished - started) * 1000).ceil }
-          result.merge(InfluxDB::Rails.current.values).reject do |_, value|
-            value.nil? || value == ""
-          end
-        end
-      end
-    end
-  end
-end

data/spec/controllers/widgets_controller_spec.rb

@@ -1,15 +0,0 @@
-require "spec_helper"
-
-RSpec.describe WidgetsController, type: :controller do
-  describe "#new" do
-    it "should raise an exception" do
-      expect { get :new }.to raise_error(ZeroDivisionError)
-    end
-  end
-
-  describe "#index" do
-    it "should not raise an exception" do
-      expect { get :index }.to_not raise_error
-    end
-  end
-end

data/spec/integration/integration_helper.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + "/../spec_helper"

data/spec/integration/metrics_spec.rb

@@ -1,27 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/integration_helper")
-
-RSpec.describe "User visits widgets", type: :request do
-  before do
-    allow_any_instance_of(InfluxDB::Rails::Configuration).to receive(:ignored_environments).and_return(%w[development])
-  end
-
-  describe "in a normal request" do
-    it "should result in attempts to write metrics via the client" do
-      expect(InfluxDB::Rails.client).to receive(:write_point).exactly(5).times
-      get "/widgets"
-    end
-
-    context "additional values" do
-      it "should result in attempts to write metrics via the client" do
-        allow_any_instance_of(ActionDispatch::Request).to receive(:request_id).and_return(:request_id)
-        expect(InfluxDB::Rails.client).to receive(:write_point).with(
-          "rails", a_hash_including(
-                     tags:   a_hash_including(method: "WidgetsController#index", hook: "process_action"),
-                     values: a_hash_including(request_id: :request_id, key: :value)
-                   )
-        )
-        get "/widgets"
-      end
-    end
-  end
-end