influxdb-rails 1.0.1.beta2 → 1.0.3

data/spec/unit/tags.rb

@@ -0,0 +1,47 @@
+require "spec_helper"
+
+RSpec.describe InfluxDB::Rails::Tags do
+  let(:config) { InfluxDB::Rails::Configuration.new }
+
+  describe ".to_h" do
+    it "returns TrueClass" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: true })
+      expect(subject.to_h).to a_hash_including(hans: true)
+    end
+
+    it "returns FalseClass" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: false })
+      expect(subject.to_h).to a_hash_including(hans: false)
+    end
+
+    it "returns strings" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: "franz" })
+      expect(subject.to_h).to a_hash_including(hans: "franz")
+    end
+
+    it "returns strings containing blank" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: "franz hans" })
+      expect(subject.to_h).to a_hash_including(hans: "franz hans")
+    end
+
+    it "removes empty strings" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: "", franz: "   " })
+      expect(subject.to_h).not_to a_hash_including(hans: "", franz: "   ")
+    end
+
+    it "returns symbols" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: :franz })
+      expect(subject.to_h).to a_hash_including(hans: :franz)
+    end
+
+    it "removes nil" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: nil })
+      expect(subject.to_h).not_to a_hash_including(hans: nil)
+    end
+
+    it "leaves arrays alone" do
+      subject = InfluxDB::Rails::Tags.new(config: config, tags: { hans: [], franz: %w[a b] })
+      expect(subject.to_h).to a_hash_including(hans: [], franz: %w[a b])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta2
+  version: 1.0.3
 platform: ruby
 authors:
 - Christian Bruckmayer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -205,14 +205,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -250,10 +250,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -262,6 +263,7 @@ files:
 - config.ru
 - gemfiles/Gemfile.rails-5.2.x
 - gemfiles/Gemfile.rails-6.0.x
+- gemfiles/Gemfile.rails-6.1.x
 - influxdb-rails.gemspec
 - lib/influxdb-rails.rb
 - lib/influxdb/rails/configuration.rb
@@ -288,15 +290,25 @@ files:
 - 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 ActiveJob.json
+- 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/Ruby On Rails Requests.json
+- sample-dashboard/Ruby On Rails Slowlog by Action.json
+- sample-dashboard/Ruby On Rails Slowlog by Request.json
+- sample-dashboard/Ruby On Rails Slowlog by SQL.json
 - sample-dashboard/docker-compose.yml
+- sample-dashboard/provisioning/activejob.json
 - 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
+- sample-dashboard/provisioning/requests.json
+- sample-dashboard/provisioning/slowlog-action.json
+- sample-dashboard/provisioning/slowlog-requests.json
+- sample-dashboard/provisioning/slowlog-sql.json
 - spec/requests/action_controller_metrics_spec.rb
 - spec/requests/action_mailer_deliver_metrics_spec.rb
 - spec/requests/action_view_collection_metrics_spec.rb
@@ -304,7 +316,6 @@ files:
 - 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
@@ -322,6 +333,7 @@ files:
 - spec/unit/configuration_spec.rb
 - spec/unit/sql/normalizer_spec.rb
 - spec/unit/sql/query_spec.rb
+- spec/unit/tags.rb
 homepage: https://influxdata.com
 licenses:
 - MIT
@@ -338,15 +350,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: InfluxDB bindings for Ruby on Rails.
@@ -358,7 +369,6 @@ test_files:
 - 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
@@ -376,3 +386,4 @@ test_files:
 - spec/unit/configuration_spec.rb
 - spec/unit/sql/normalizer_spec.rb
 - spec/unit/sql/query_spec.rb
+- spec/unit/tags.rb

data/.travis.yml

@@ -1,28 +0,0 @@
-sudo: required
-dist: trusty
-language: ruby
-before_install:
-  - gem update --system --no-doc
-  - gem install bundler --no-doc
-  - gem update bundler --no-doc
-rvm:
-  - ruby-head
-  - "2.7"
-  - "2.6"
-  - "2.5"
-gemfile:
-  - gemfiles/Gemfile.rails-6.0.x
-  - gemfiles/Gemfile.rails-5.2.x
-env:
-  - TEST_TASK=spec
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  include:
-    - { rvm: "2.6",   gemfile: "Gemfile", env: [TEST_TASK=rubocop] }
-addons:
-  apt:
-    packages:
-      - haveged
-      - libgmp-dev
-script: bundle exec rake $TEST_TASK

data/spec/requests/active_job_perform_start_metrics_spec.rb

@@ -1,68 +0,0 @@
-require File.dirname(__FILE__) + "/../spec_helper"
-
-RSpec.describe "ActiveJob start metrics", type: :request do
-  let(:tags_middleware) do
-    lambda do |tags|
-      tags.merge(tags_middleware: :tags_middleware)
-    end
-  end
-  before do
-    allow_any_instance_of(InfluxDB::Rails::Configuration).to receive(:ignored_environments).and_return(%w[development])
-    allow_any_instance_of(ActionDispatch::Request).to receive(:request_id).and_return(:request_id)
-    allow_any_instance_of(InfluxDB::Rails::Configuration).to receive(:application_name).and_return(:app_name)
-    allow_any_instance_of(InfluxDB::Rails::Configuration).to receive(:tags_middleware).and_return(tags_middleware)
-  end
-
-  it "writes metric" do
-    perform_enqueued_jobs do
-      get "/metrics"
-    end
-
-    expect_metric(
-      tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "perform_start",
-        state:           "running",
-        job:             "MetricJob",
-        queue:           "default",
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
-      ),
-      values: a_hash_including(
-        value: 1
-      )
-    )
-  end
-
-  it "includes correct timestamps" do
-    travel_to Time.zone.local(2018, 1, 1, 9, 0, 0)
-
-    perform_enqueued_jobs do
-      get "/metrics"
-    end
-
-    expect_metric(
-      tags:      a_hash_including(
-        location: "MetricsController#index",
-        hook:     "perform_start"
-      ),
-      timestamp: 1_514_797_200
-    )
-  end
-
-  it "does not write metric when hook is ignored" do
-    allow_any_instance_of(InfluxDB::Rails::Configuration).to receive(:ignored_hooks).and_return(["perform_start.active_job"])
-
-    perform_enqueued_jobs do
-      get "/metrics"
-    end
-
-    expect_no_metric(
-      tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "perform_start"
-      )
-    )
-  end
-end