Added config parameter to configure app name …

README.md

@@ -58,6 +58,8 @@ InfluxDB::Rails.configure do |config|
   # config.series_name_for_controller_runtimes = "rails.controller"
   # config.series_name_for_view_runtimes       = "rails.view"
   # config.series_name_for_db_runtimes         = "rails.db"
+
+  config.rails_app_name = "my-rails-app"
 end
 ```
 

lib/influxdb-rails.rb

@@ -31,7 +31,8 @@ def configure(silent = false)
       end
 
       def client
-        @client ||= InfluxDB::Client.new configuration.influxdb_database,
+        @client ||= InfluxDB::Client.new(
+          configuration.influxdb_database,
           :username => configuration.influxdb_username,
           :password => configuration.influxdb_password,
           :hosts => configuration.influxdb_hosts,
@@ -43,6 +44,7 @@ def client
           :read_timeout => configuration.read_timeout,
           :max_delay => configuration.max_delay,
           :time_precision => configuration.time_precision
+        )
       end
 
       def configuration
@@ -74,6 +76,7 @@ def report_exception(e, env = {})
           log :info, "[InfluxDB::Rails] Something went terribly wrong. Exception failed to take off! #{e.class}: #{e.message}"
         end
       end
+
       alias_method :transmit, :report_exception
 
       def handle_action_controller_metrics(name, start, finish, id, payload)
@@ -83,40 +86,38 @@ def handle_action_controller_metrics(name, start, finish, id, payload)
         db_runtime = (payload[:db_runtime] || 0).ceil
         method = "#{payload[:controller]}##{payload[:action]}"
         hostname = Socket.gethostname
+        app_name = configuration.rails_app_name
 
-        begin
-          client.write_point configuration.series_name_for_controller_runtimes, {
-            values: {
-              value: controller_runtime,
-            },
-            tags: {
-              method: method,
-              server: hostname,
-            },
-            timestamp: timestamp,
-          }
+        tags = { method: method, server: hostname, app_name: app_name }
+        tags.delete_if { |k, v| v.nil? }
 
-          client.write_point configuration.series_name_for_view_runtimes, {
-            values: {
-              value: view_runtime,
-            },
-            tags: {
-              method: method,
-              server: hostname,
-            },
-            timestamp: timestamp,
-          }
-
-          client.write_point configuration.series_name_for_db_runtimes, {
-            values: {
-              value: db_runtime,
-            },
-            tags: {
-              method: method,
-              server: hostname,
-            },
-            timestamp: timestamp,
-          }
+        begin
+          client.write_point(
+            configuration.series_name_for_controller_runtimes,
+            {
+              values:     { value: controller_runtime },
+              tags:       tags,
+              timestamp:  timestamp,
+            }
+          )
+
+          client.write_point(
+            configuration.series_name_for_view_runtimes,
+            {
+              values:     { value: view_runtime },
+              tags:       tags,
+              timestamp:  timestamp,
+            }
+          )
+
+          client.write_point(
+            configuration.series_name_for_db_runtimes,
+            {
+              values:     { value: db_runtime },
+              tags:       tags,
+              timestamp:  timestamp,
+            }
+          )
         rescue => e
           log :error, "[InfluxDB::Rails] Unable to write points: #{e.message}"
         end

lib/influxdb/rails/configuration.rb

@@ -18,6 +18,8 @@ class Configuration
       attr_accessor :series_name_for_view_runtimes
       attr_accessor :series_name_for_db_runtimes
 
+      attr_accessor :rails_app_name
+
       attr_accessor :application_id
       deprecate :application_id => "This method serve no purpose and will be removed in the release after 0.1.12"
 
@@ -65,6 +67,8 @@ class Configuration
         :series_name_for_view_runtimes        => "rails.view",
         :series_name_for_db_runtimes          => "rails.db",
 
+        :rails_app_name => nil,
+
         :ignored_exceptions => %w{ActiveRecord::RecordNotFound
                                   ActionController::RoutingError},
         :ignored_exception_messages => [],
@@ -112,6 +116,8 @@ def initialize
         @series_name_for_view_runtimes        = DEFAULTS[:series_name_for_view_runtimes]
         @series_name_for_db_runtimes          = DEFAULTS[:series_name_for_db_runtimes]
 
+        @rails_app_name = DEFAULTS[:rails_app_name]
+
         @ignored_exceptions           = DEFAULTS[:ignored_exceptions].dup
         @ignored_exception_messages   = DEFAULTS[:ignored_exception_messages].dup
         @ignored_reports              = DEFAULTS[:ignored_reports].dup

spec/unit/configuration_spec.rb

@@ -101,4 +101,18 @@
       expect(InfluxDB::Rails.configuration.time_precision).to eql('ms')
     end
   end
+
+  describe "#rails_app_name" do
+    it 'defaults to nil' do
+      expect(InfluxDB::Rails.configuration.rails_app_name).to be(nil)
+    end
+
+    it "can be set to own name" do
+      InfluxDB::Rails.configure do |config|
+        config.rails_app_name = 'my-app'
+      end
+
+      expect(InfluxDB::Rails.configuration.rails_app_name).to eq('my-app')
+    end
+  end
 end

spec/unit/influxdb_rails_spec.rb

@@ -2,7 +2,62 @@
 
 RSpec.describe InfluxDB::Rails do
   before do
-    InfluxDB::Rails.configure { |config| config.ignored_environments = [] }
+    InfluxDB::Rails.configure do |config|
+      config.rails_app_name = 'my-rails-app'
+      config.ignored_environments = []
+    end
+  end
+
+  describe '.handle_action_controller_metrics' do
+    let(:start)   { Time.at(1517567368) }
+    let(:finish)  { Time.at(1517567370) }
+    let(:payload) { { view_runtime: 2, db_runtime: 2, controller: 'MyController', action: 'show' } }
+    let(:data)    {
+      {
+        values: {
+          value: 2
+        },
+        tags: {
+          method: 'MyController#show',
+          server: Socket.gethostname,
+          app_name: 'my-rails-app'
+        },
+        timestamp: 1517567370000
+      }
+    }
+
+    context 'rails_app_name is set' do
+      it 'sends metrics with taggings and timestamps' do
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with(
+          'rails.controller', data.merge({ values: { value: 2000}})
+        )
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with('rails.view', data)
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with('rails.db', data)
+
+        described_class.handle_action_controller_metrics('unused', start, finish, 'unused', payload)
+      end
+    end
+
+    context 'rails_app_name is nil' do
+      before do
+        InfluxDB::Rails.configure do |config|
+          config.rails_app_name = nil
+          config.ignored_environments = []
+        end
+      end
+
+      it 'doesn not add the app_name tag to metrics' do
+        tags = { method: 'MyController#show', server: Socket.gethostname }
+
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with(
+          'rails.controller', data.merge({ values: { value: 2000}, tags: tags })
+        )
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with('rails.view', data.merge(tags: tags))
+        expect_any_instance_of(InfluxDB::Client).to receive(:write_point).with('rails.db', data.merge(tags: tags))
+
+        described_class.handle_action_controller_metrics('unused', start, finish, 'unused', payload)
+      end
+    end
   end
 
   describe '.convert_timestamp' do