Merge pull request #46 from ArjenSchwarz/feature/datadog-application-…

…name

Report the application name as well when deploying with Capistrano

lib/capistrano/datadog.rb

@@ -49,12 +49,13 @@ def initialize()
         @logging_output = {}
       end
 
-      def record_task(task_name, timing, roles, stage=nil)
+      def record_task(task_name, timing, roles, stage=nil, application_name=nil)
         @tasks << {
           :name   => task_name,
           :timing => timing,
           :roles  => roles,
-          :stage  => stage
+          :stage  => stage,
+          :application => application_name
         }
       end
 
@@ -80,7 +81,11 @@ def report()
           if !task[:stage].nil? and !task[:stage].empty? then
             tags << "#stage:#{task[:stage]}"
           end
-          title = "%s@%s ran %s on %s with capistrano in %.2f secs" % [user, hostname, name, roles.join(', '), task[:timing]]
+          application = ''
+          if !task[:application].nil? and !task[:application].empty? then
+            application = ' for ' + task[:application]
+          end
+          title = "%s@%s ran %s%s on %s with capistrano in %.2f secs" % [user, hostname, name, application, roles.join(', '), task[:timing]]
           type  = "deploy"
           alert_type = "success"
           source_type = "capistrano"

lib/capistrano/datadog/v2.rb

@@ -32,7 +32,7 @@ def find_and_execute_task(path, hooks = {})
         if roles.is_a? Proc
           roles = roles.call
         end
-        reporter.record_task(task_name, timing.real, roles, task.namespace.variables[:stage])
+        reporter.record_task(task_name, timing.real, roles, task.namespace.variables[:stage], fetch(:application))
 
         # Return the original result
         result

lib/capistrano/datadog/v3.rb

@@ -15,7 +15,7 @@ def invoke(*args)
         result = old_invoke(*args)
       end
       reporter.record_task(task_name, timing.real, roles,
-        Capistrano::Configuration.env.fetch(:stage))
+        Capistrano::Configuration.env.fetch(:stage), Capistrano::Configuration.env.fetch(:application))
       result
     end
   end