influxdb-rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e3add8b49d3fbf1997dc07754f80def0d41912c63547089ecba0b2d3eb1e7d5
-  data.tar.gz: 20b896a9146f74b8dfd2ea3ee5b5e8461a41efbf189304b5e2c98a1c9a02458d
+  metadata.gz: bd28d1ed1a585a6ad1aef9945e693b2b1d20668de731e35ab0066c2c09ed50a5
+  data.tar.gz: df3e81593ce080e308018b2f94ea4ff4e3094f3584843051c60d6219ed9fe7aa
 SHA512:
-  metadata.gz: 97433217a36b42704ceed5fb5656f2ffbf11dbd0d08bbd17a14972355ba6fe63ed1c4382d789f0691c3496a95b5e4ff8e388399ce4876614c237add03ed27926
-  data.tar.gz: b8f0b71d8ba29926e7924489b69b4a199c24a821bc2f0268b804714f44c946aecc3fcf3115305ddab23eccd092efdebb6f77c3d71616d7de8b8226288d7c2832
+  metadata.gz: 8cbea1f68ee5ad8b68f9b8a4ee953999215bf62f6300aff3fb7b679f6d5fa797a49a2c28f9d0d2f0594f14cc15955d34291b6344371ad141d107d6dc8ff7a8c2
+  data.tar.gz: 6723fc68b1ba75a1efd39e820e9752e757bbb34007763b832ea565942716606a6ee388bfdb967dbabd4790eefb9b7414e6dc0697b7d6388454713b4b879700f6

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-For the full commit log, [see here](https://github.com/influxdata/influxdb-rails/commits/master).
+For the full commit log, [see here](https://github.com/influxdata/influxdb-rails/commits/one-stable).
+
+## v1.0.2, released 2021-04-13
+
+Fix passing booleans to custom tags.
 
 ## v1.0.1, released 2021-03-23
 

data/lib/influxdb/rails/tags.rb

@@ -9,7 +9,7 @@ module InfluxDB
 
       def to_h
         expanded_tags.reject do |_, value|
-          value.blank?
+          value.to_s.blank?
         end
       end
 

data/lib/influxdb/rails/values.rb

@@ -8,7 +8,7 @@ module InfluxDB
 
       def to_h
         expanded_values.reject do |_, value|
-          value.blank?
+          value.to_s.blank?
         end
       end
 

data/lib/influxdb/rails/version.rb

@@ -1,5 +1,5 @@
 module InfluxDB
   module Rails
-    VERSION = "1.0.1".freeze
+    VERSION = "1.0.2".freeze
   end
 end

data/spec/requests/action_controller_metrics_spec.rb

@@ -18,11 +18,27 @@ RSpec.describe "ActionController metrics", type: :request do
     expect_metric(
       name:   "rails",
       tags:   a_hash_including(
-        method:          "MetricsController#index",
+        hook:        "process_action",
+        status:      200,
+        format:      :html,
+        http_method: "GET"
+      ),
+      values: a_hash_including(
+        view:       be_between(1, 500),
+        db:         be_between(1, 500),
+        controller: be_between(1, 500)
+      )
+    )
+  end
+
+  it "writes default and custom tags" do
+    get "/metrics"
+
+    expect_metric(
+      name:   "rails",
+      tags:   a_hash_including(
         hook:            "process_action",
-        status:          200,
-        format:          :html,
-        http_method:     "GET",
+        location:        "MetricsController#index",
         additional_tag:  :value,
         server:          Socket.gethostname,
         app_name:        :app_name,
@@ -30,10 +46,7 @@ RSpec.describe "ActionController metrics", type: :request do
       ),
       values: a_hash_including(
         additional_value: :value,
-        request_id:       :request_id,
-        view:             be_between(1, 500),
-        db:               be_between(1, 500),
-        controller:       be_between(1, 500)
+        request_id:       :request_id
       )
     )
   end

data/spec/requests/action_mailer_deliver_metrics_spec.rb

@@ -18,18 +18,11 @@ RSpec.describe "ActionMailer deliver metrics", type: :request do
 
     expect_metric(
       tags:   a_hash_including(
-        hook:            "deliver",
-        mailer:          "MetricMailer",
-        location:        "MetricsController#index",
-        additional_tag:  :value,
-        server:          Socket.gethostname,
-        app_name:        :app_name,
-        tags_middleware: :tags_middleware
+        hook:   "deliver",
+        mailer: "MetricMailer"
       ),
       values: a_hash_including(
-        additional_value: :value,
-        request_id:       :request_id,
-        value:            1
+        value: 1
       )
     )
   end

data/spec/requests/action_view_collection_metrics_spec.rb

@@ -18,19 +18,12 @@ RSpec.describe "ActionView collection metrics", type: :request do
     expect_metric(
       name:   "rails",
       tags:   a_hash_including(
-        location:        "MetricsController#index",
-        hook:            "render_collection",
-        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_collection",
+        filename: include("spec/support/views/metrics/_item.html.erb")
       ),
       values: a_hash_including(
-        additional_value: :value,
-        count:            3,
-        request_id:       :request_id,
-        value:            be_between(1, 500)
+        count: 3,
+        value: be_between(1, 500)
       )
     )
   end
@@ -43,8 +36,7 @@ RSpec.describe "ActionView collection metrics", type: :request do
     expect_metric(
       name:      "rails",
       tags:      a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_collection"
+        hook: "render_collection"
       ),
       timestamp: 1_514_797_200
     )
@@ -58,8 +50,7 @@ RSpec.describe "ActionView collection metrics", type: :request do
     expect_no_metric(
       name: "rails",
       tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_collection"
+        hook: "render_collection"
       )
     )
   end

data/spec/requests/action_view_partial_metrics_spec.rb

@@ -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, 500)
+        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

@@ -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, 500)
+        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

@@ -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

@@ -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

@@ -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, 500),
-        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

@@ -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, 500),
-        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, 500),
-        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

@@ -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, 500)
+        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/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
+  version: 1.0.2
 platform: ruby
 authors:
 - Christian Bruckmayer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -333,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
@@ -385,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