Merge pull request #171 from hennevogel/bugfix/custom-tags

Do not reject FalseClass from tags/values

Author: hennevogel

lib/influxdb/rails/tags.rb

@@ -9,7 +9,7 @@ def initialize(config:, tags: {}, additional_tags: InfluxDB::Rails.current.tags)
 
       def to_h
         expanded_tags.reject do |_, value|
-          value.blank?
+          value.to_s.blank?
         end
       end
 

lib/influxdb/rails/values.rb

@@ -8,7 +8,7 @@ def initialize(values: {}, additional_values: InfluxDB::Rails.current.values)
 
       def to_h
         expanded_values.reject do |_, value|
-          value.blank?
+          value.to_s.blank?
         end
       end
 

spec/requests/action_controller_metrics_spec.rb

@@ -18,22 +18,35 @@
     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,
         tags_middleware: :tags_middleware
       ),
       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

spec/requests/action_mailer_deliver_metrics_spec.rb

@@ -18,18 +18,11 @@
 
     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

spec/requests/action_view_collection_metrics_spec.rb

@@ -18,19 +18,12 @@
     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 @@
     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 @@
     expect_no_metric(
       name: "rails",
       tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_collection"
+        hook: "render_collection"
       )
     )
   end

spec/requests/action_view_partial_metrics_spec.rb

@@ -17,18 +17,11 @@
 
     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 @@
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_partial"
+        hook: "render_partial"
       ),
       timestamp: 1_514_797_200
     )
@@ -54,8 +46,7 @@
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_partial"
+        hook: "render_partial"
       )
     )
   end

spec/requests/action_view_template_metrics_spec.rb

@@ -17,18 +17,11 @@
 
     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 @@
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_template"
+        hook: "render_template"
       ),
       timestamp: 1_514_797_200
     )
@@ -54,8 +46,7 @@
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
-        hook:     "render_template"
+        hook: "render_template"
       )
     )
   end

spec/requests/active_job_enqueue_metrics_spec.rb

@@ -18,20 +18,13 @@
 
     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 @@
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
         hook:     "enqueue"
       ),
       timestamp: 1_514_797_200
@@ -57,7 +49,6 @@
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
         hook:     "enqueue"
       )
     )

spec/requests/active_job_perform_metrics_spec.rb

@@ -20,14 +20,10 @@
 
     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 @@
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#index",
         hook:     "perform"
       ),
       timestamp: 1_514_797_200
@@ -60,7 +55,6 @@
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#index",
         hook:     "perform"
       )
     )

spec/requests/active_record_instantiation_metrics_spec.rb

@@ -19,19 +19,12 @@
 
     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 @@
 
     expect_metric(
       tags:      a_hash_including(
-        location: "MetricsController#show",
-        hook:     "instantiation"
+        hook: "instantiation"
       ),
       timestamp: 1_514_797_200
     )
@@ -57,8 +49,7 @@
 
     expect_no_metric(
       tags: a_hash_including(
-        location: "MetricsController#show",
-        hook:     "instantiation"
+        hook: "instantiation"
       )
     )
   end