chef-handler-datadog 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzlmYzNiOWYxODgxODhmZjNmY2Y3OTE1MGQ1MTlhMjMxNTA4M2NiZA==
+    NzQzODBiZTM2NjkxZDlhZTQ5OWVhNDAwZWQyODk5ZjY5NjMzMWRkNw==
   data.tar.gz: !binary |-
-    ODljYmFlYjg5Y2UyMDQ2OWQ2NjlkNzM4OGFkN2FkYmM5ZmEwMDQ1Yg==
-!binary "U0hBNTEy":
+    YmI2ZTljMTFjMDQ1YjEzOWJjNzBiNTFkMzMzMzBmY2QyODhjODMxMQ==
+SHA512:
   metadata.gz: !binary |-
-    YzNiODIxMTI1NTg1ZjNmYTdmZWEyMDVjYzRhOTY1OGViMjc5MDYyZDczNDBl
-    ZTVlYzM3YzFkZGI3OWUxMjlmNjcyNzMzNjMzMzQ3YmQyYTJhOWMxNmY3ZjU4
-    ZjA1MjFlMGZmY2MyMGJmZmUwZGEyYTI1MTIzNWM5MDU5NTIwNzE=
+    ZGJiZDVlYTQ3M2RlZjg0ZDNiOTA4OGVmMGEzZDdhOGY4MDkwMmQ4MzAzNWYy
+    NGM5MjJhOWI3MjgxMDNmOTczNmMwM2MwM2U1YjA0MTI3NTJjOThmZWFiZGM4
+    ZDUzYzA1MWQxMWNjODVhZjNlNGZmMTJkYTY3ZGZmNGFkNmYwNGI=
   data.tar.gz: !binary |-
-    NGNjYzFmNWI4OTJlNzZlYzFmMjA2NmFmYTRhZTc1M2YwMTg4MDMxZjBkYmJh
-    ZmNkMGY0ZTdlMjhlODAzODM4NGE3M2FkNDQxNGQ5NzNiMjAwNzgwNDc4ZGUz
-    MTE4NzZmYzM1YjQzMGQ2MWE2Yjc5MWEwNDQxZTk1MjAxOGE1MWI=
+    ZDE4ODE4NTdjMzAxZTgwZTkzM2M5N2Q0ZjExNGFhZTg1MThhOGMyYjAzNTYw
+    NmI1NWI2YWRmM2FmYjNiOGExNzU5MmQzYTU5ODJhMjhlNjI1MDQ5NTYzZDMz
+    NGE4OTBmNTMyYzQzZTEzN2ZiMTU3ZDAzMDEzZGIzMzUzNTk0MTA=

data/.gitignore

@@ -29,9 +29,6 @@ pkg
 #
 .DS_Store
 
-# For RVM
-.rvmrc
-
 # For TextMate
 *.tmproj
 # tmtags
@@ -53,8 +50,12 @@ pkg
 json
 rake
 Gemfile.lock
+gemfiles/*.lock
 
 # For Ruby Managers:
 .ruby-gemset
 .ruby-version
 .rvmrc
+
+# Any environment-specific files
+.env

data/.rspec

@@ -0,0 +1 @@
+--color

data/.rubocop.yml

@@ -0,0 +1,36 @@
+AllCops:
+  Includes:
+    - chef-handler-datadog.gemspec
+    - Appraisals
+    - Gemfile
+    - Rakefile
+
+# We want to continue to support Ruby 1.8.x for now
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# 80 characters is a nice goal, but not worth currently changing in existing
+# code for the sake of changing it to conform to a length set in 1928 (IBM).
+LineLength:
+  Max: 150
+
+#####
+# These exceptions are good goals to attain, and probably will over time,
+# so periodic disabling and re-running to inspect values is suggested.
+
+# TODO: Main class is currently over 100 lines of code, making comprehending
+# it harder. With refactors and simplifications, we can bring this down,
+# but for now, let's not make it too much worse.
+ClassLength:
+  Max: 160
+
+# TODO: this is currently down to 12 from 22, and should be a constant
+# goal to reduce method complexity. The accepted goal is 6.
+CyclomaticComplexity:
+  Max: 12
+
+# TODO: The main method `report` is now down from 85 lines. As refactors
+# continue, this should drop. However, the goal of 10 lines in a method may
+# be a little lofty.
+MethodLength:
+  Max: 78

data/.travis.yml

@@ -1,6 +1,11 @@
 language: ruby
 rvm:
   - 1.9.3
+bundler_args: --without=localdev
 gemfile:
-  - gemfiles/Gemfile.chef-11
-  - gemfiles/Gemfile.chef-10
+  - gemfiles/chef_10.14.0.gemfile
+  - gemfiles/chef_10.26.0.gemfile
+  - gemfiles/chef_10.30.2.gemfile
+  - gemfiles/chef_11.8.2.gemfile
+env:
+  - API_KEY=somefakeapikey APPLICATION_KEY=somefakeapplicationkey

data/Appraisals

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+# Describe any version dependencies here.
+
+%w(
+  10.14.0
+  10.30.2
+).each do |tv|
+  appraise "chef-#{tv}" do
+    gem 'chef', tv
+  end
+end
+
+# Due to some oddity in json gem version pinning for versions that have
+# conflicts, specify best version here.
+%w(
+  10.26.0
+  11.8.2
+).each do |tv|
+  appraise "chef-#{tv}" do
+    gem 'chef', tv
+    gem 'json', '1.7.7'
+  end
+end

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 Changes
 =======
+
+# 0.3.0 / 2014-01-23
+
+* [MISC] **Breaking Change**: Chef 0.9.x is no longer supported. Extra code implemented for 0.9 versions has been removed. [@miketheman][]
+* [BUGFIX] Report correct response when failing to submit tags, [#39][] [@miketheman][]
+* [OPTIMIZE] Refactor hostname resolution to its own method, simplify `report` method. [@miketheman][]
+* [OPTIMIZE] Refactor metrics reporting to its own method, simplify `report` method. [@miketheman][]
+* [OPTIMIZE] Refactor tagging get/set to own methods, simplify `report` method. [@miketheman][]
+* [MISC] Converted `opts` to an instance variable of `config` to reduce the amount of instance variables passing around. [@miketheman][]
+* [OPTIMIZE] Don't try to tag node when Application Key isn't provided, [#31][] [@miketheman][]
+* [OPTIMIZE] Only load in the parts of the Chef gem that are used. [@miketheman][]
+* [OPTIMIZE] Change order in which event_data is constructed, to not lose the full backtrace, [#37][] [@miketheman][]
+
+Testing suite: [#18][], [@miketheman][]
+* Removed Tailor testing in favor of Rubocop
+* Added Appraisals with specific Chef versions to be tested
+* Added RSpec testing via VCR and Webmock
+
 # 0.2.0 / 2013-10-31
 
 * [BUGFIX] moved Chef gem dependency to development, [#34][] [@miketheman][]
@@ -10,8 +28,13 @@ Changes
 # 0.1.2 / 2013-04-03
 
 And all other versions were prior to this. See git history for more.
+
 <!--- The following link definition list is generated by PimpMyChangelog --->
+[#18]: https://github.com/DataDog/chef-handler-datadog/issues/18
+[#31]: https://github.com/DataDog/chef-handler-datadog/issues/31
 [#34]: https://github.com/DataDog/chef-handler-datadog/issues/34
+[#37]: https://github.com/DataDog/chef-handler-datadog/issues/37
+[#39]: https://github.com/DataDog/chef-handler-datadog/issues/39
 [@alq]: https://github.com/alq
 [@miketheman]: https://github.com/miketheman
 [@remh]: https://github.com/remh

data/Gemfile

@@ -1,4 +1,10 @@
-source "http://rubygems.org"
+# encoding: utf-8
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in chef-handler-datadog.gemspec
 gemspec
+
+group :localdev do
+  gem 'pry'
+  gem 'travis-lint'
+end

data/README.md

@@ -2,7 +2,10 @@
 
 An Exception and Report Handler for Chef.
 
+[![Gem Version](https://badge.fury.io/rb/chef-handler-datadog.png)](http://badge.fury.io/rb/chef-handler-datadog)
 [![Build Status](https://secure.travis-ci.org/DataDog/chef-handler-datadog.png?branch=master)](http://travis-ci.org/DataDog/chef-handler-datadog)
+[![Code Climate](https://codeclimate.com/github/DataDog/chef-handler-datadog.png)](https://codeclimate.com/github/DataDog/chef-handler-datadog)
+[![Dependency Status](https://gemnasium.com/DataDog/chef-handler-datadog.png)](https://gemnasium.com/DataDog/chef-handler-datadog)
 
 ## Using chef-handler-datadog
 
@@ -10,14 +13,24 @@ The Datadog Docs on [Chef](http://docs.datadoghq.com/guides/chef/#deployhandler)
 
 ## Contributing to chef-handler-datadog
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the latest `master` to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
 * Start a feature/bugfix branch
+* Place a `.env` file in the root of the project with `API_KEY` and `APPLICATION_KEY`:
+
+        API_KEY: myapikey
+        APPLICATION_KEY: chefhandlerspecificapplicationkey
+
+  This file is intentionally .gitignored to prevent security exposure.
+
+* Run `rake` to execute tests, ensure they pass
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Please try not to mess with the `Rakefile`, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 ## Copyright
 
-Copyright (c) 2012-2013 Datadog, Inc. See LICENSE.txt for further details.
+Copyright (c) 2012-2014 Datadog, Inc. See LICENSE.txt for further details.
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/DataDog/chef-handler-datadog/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/Rakefile

@@ -3,15 +3,15 @@
 require 'rubygems'
 require 'bundler/gem_tasks'
 
+require 'appraisal'
+require 'rake/clean'
 require 'rspec/core/rake_task'
-require 'tailor/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :test
+task :default => [:cops, :spec]
+
+CLEAN.include(['coverage/', 'doc/', 'pkg/'])
 
 RSpec::Core::RakeTask.new(:spec)
 
-Tailor::RakeTask.new do |task|
-  task.file_set('lib/**/*.rb', "code") do |style|
-    style.max_line_length 160, :level => :warn
-  end
-end
+Rubocop::RakeTask.new(:cops)

data/chef-handler-datadog.gemspec

@@ -1,28 +1,33 @@
+# encoding: utf-8
 require File.expand_path('../lib/chef-handler-datadog', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = "chef-handler-datadog"
+  gem.name          = 'chef-handler-datadog'
   gem.summary       = %q{Chef Handler for DataDog events and metrics}
   gem.description   = %q{This Handler will report the events and metrics for a chef-client run to DataDog.}
-  gem.license       = "BSD"
+  gem.license       = 'BSD'
   gem.version       = ChefHandlerDatadog::VERSION
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.files         = `git ls-files`.split($\) # rubocop:disable SpecialGlobalVars
+  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
   gem.require_paths = ['lib']
   gem.extra_rdoc_files = ['README.md', 'LICENSE.txt']
 
-  gem.add_dependency 'dogapi', ">= 1.2"
+  gem.add_dependency 'dogapi', '>= 1.2'
 
+  gem.add_development_dependency 'appraisal', '~> 1.0.0.beta2'
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'chef', ">= 10", "<= 12"
+  gem.add_development_dependency 'chef', '>= 10', '<= 12'
+  gem.add_development_dependency 'dotenv'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'tailor', '~> 1.3'
-  gem.add_development_dependency 'travis-lint'
+  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'vcr'
+  gem.add_development_dependency 'webmock'
 
-  gem.authors       = ["Mike Fiedler", "Adam Jacob", "Alexis Le-Quoc"]
-  gem.email         = ["package@datadoghq.com"]
-  gem.homepage      = "http://www.datadoghq.com/"
+  gem.authors       = ['Mike Fiedler', 'Adam Jacob', 'Alexis Le-Quoc']
+  gem.email         = ['package@datadoghq.com']
+  gem.homepage      = 'http://www.datadoghq.com/'
 end

data/gemfiles/chef_10.14.0.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "chef", "10.14.0"
+
+group :localdev do
+  gem "pry"
+  gem "travis-lint"
+end
+
+gemspec :path=>".././"

data/gemfiles/chef_10.26.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "chef", "10.26.0"
+gem "json", "1.7.7"
+
+group :localdev do
+  gem "pry"
+  gem "travis-lint"
+end
+
+gemspec :path=>".././"

data/gemfiles/chef_10.30.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "chef", "10.30.2"
+
+group :localdev do
+  gem "pry"
+  gem "travis-lint"
+end
+
+gemspec :path=>".././"

data/gemfiles/chef_11.8.2.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "chef", "11.8.2"
+gem "json", "1.7.7"
+
+group :localdev do
+  gem "pry"
+  gem "travis-lint"
+end
+
+gemspec :path=>".././"

data/lib/chef-handler-datadog.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+# Helper module for version number only.
+# Real deal in 'chef/handler/datadog.rb'
 module ChefHandlerDatadog
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'
 end

data/lib/chef/handler/datadog.rb

@@ -1,82 +1,72 @@
+# encoding: utf-8
 require 'rubygems'
-require 'chef'
 require 'chef/handler'
 require 'dogapi'
 
 class Chef
   class Handler
+    # Datadog handler to send Chef run details to Datadog
     class Datadog < Chef::Handler
+      attr_reader :config
 
       # For the tags to work, the client must have created an Application Key on the
       # "Account Settings" page here: https://app.datadoghq.com/account/settings
       # It should be passed along from the node/role/environemnt attributes, as the default is nil.
-      def initialize(opts = nil)
-        opts = opts || {}
-        @api_key = opts[:api_key]
-        @application_key = opts[:application_key]
-        # If we're on ec2, use the instance by default, unless instructed otherwise
-        @use_ec2_instance_id = !opts.has_key?(:use_ec2_instance_id) || opts.has_key?(:use_ec2_instance_id) && opts[:use_ec2_instance_id]
-        @dog = Dogapi::Client.new(@api_key, application_key = @application_key)
+      def initialize(config = {})
+        @config = config
+        # If *any* api_key is not provided, this will fail immediately.
+        @dog = Dogapi::Client.new(config[:api_key], config[:application_key])
       end
 
       def report
         # resolve correct hostname
-        hostname = run_status.node.name
-        if @use_ec2_instance_id && run_status.node.attribute?("ec2") && run_status.node.ec2.attribute?("instance_id")
-          hostname = run_status.node.ec2.instance_id
-        end
+        hostname = select_hostname(run_status.node)
 
         # Send the metrics
-        begin
-          @dog.emit_point("chef.resources.total", run_status.all_resources.length, :host => hostname)
-          @dog.emit_point("chef.resources.updated", run_status.updated_resources.length, :host => hostname)
-          @dog.emit_point("chef.resources.elapsed_time", run_status.elapsed_time, :host => hostname)
-          Chef::Log.debug("Submitted chef metrics back to Datadog")
-        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
-          Chef::Log.error("Could not send metrics to Datadog. Connection error:\n" + e)
-        end
+        emit_metrics_to_datadog(hostname, run_status)
 
         # Build the correct event
-        event_title = ""
-        run_time = pluralize(run_status.elapsed_time, "second")
+        event_title = ''
+        run_time = pluralize(run_status.elapsed_time, 'second')
         if run_status.success?
-          alert_type = "success"
-          event_priority = "low"
+          alert_type = 'success'
+          event_priority = 'low'
           event_title << "Chef completed in #{run_time} on #{hostname} "
         else
           event_title << "Chef failed in #{run_time} on #{hostname} "
         end
 
         event_data = "Chef updated #{run_status.updated_resources.length} resources out of #{run_status.all_resources.length} resources total."
+
+        if run_status.failed?
+          alert_type = 'error'
+          event_priority = 'normal'
+          event_data << "\n@@@\n#{run_status.formatted_exception}\n@@@\n"
+          event_data << "\n@@@\n#{run_status.backtrace.join("\n")}\n@@@\n"
+        end
+
         if run_status.updated_resources.length.to_i > 0
           event_data << "\n@@@\n"
           run_status.updated_resources.each do |r|
-            event_data << "- #{r.to_s} (#{defined_at(r)})\n"
+            event_data << "- #{r.to_s} (#{r.defined_at})\n"
           end
           event_data << "\n@@@\n"
         end
 
-        if run_status.failed?
-          alert_type = "error"
-          event_priority = "normal"
-          event_data << "\n@@@\n#{run_status.formatted_exception}\n@@@\n"
-          event_data << "\n@@@\n#{run_status.backtrace.join("\n")}\n@@@\n"
-        end
-
         # Submit the details back to Datadog
         begin
           # Send the Event data
           evt = @dog.emit_event(Dogapi::Event.new(event_data,
-            :msg_title => event_title,
-            :event_type => 'config_management.run',
-            :event_object => hostname,
-            :alert_type => alert_type,
-            :priority => event_priority,
-            :source_type_name => 'chef'
+                                                  :msg_title => event_title,
+                                                  :event_type => 'config_management.run',
+                                                  :event_object => hostname,
+                                                  :alert_type => alert_type,
+                                                  :priority => event_priority,
+                                                  :source_type_name => 'chef'
           ), :host => hostname)
 
           begin
-            # FIXME nice-to-have: abstract format of return value away a bit
+            # FIXME: nice-to-have: abstract format of return value away a bit
             # in dogapi directly. See https://github.com/DataDog/dogapi-rb/issues/18
             if evt.length < 2
               Chef::Log.warn("Unexpected response from Datadog Event API: #{evt}")
@@ -93,38 +83,25 @@ class Chef
             Chef::Log.warn("Could not determine whether chef run was successfully submitted to Datadog: #{evt}")
           end
 
-          # Get the current list of tags, remove any "role:" entries
-          host_tags = @dog.host_tags(hostname)[1]["tags"] || []
-          host_tags.delete_if { |tag| tag.start_with?('role:') }
-
-          # Get list of chef roles, rename them to tag format
-          chef_roles = node.run_list.roles
-          chef_roles.collect! { |role| "role:" + role }
-
-          # Get the chef environment (as long as it's not '_default')
-          if node.respond_to?('chef_environment') && node.chef_environment != '_default'
-            host_tags.delete_if { |tag| tag.start_with?('env:') }
-            host_tags << "env:" + node.chef_environment
-          end
-
-          # Combine (union) both arrays. Removes dupes, preserves non-chef tags.
-          new_host_tags = host_tags | chef_roles
-
-          if @application_key.nil?
+          # Update tags
+          if config[:application_key].nil?
             Chef::Log.warn("You need an application key to let Chef tag your nodes " \
               "in Datadog. Visit https://app.datadoghq.com/account/settings#api to " \
                 "create one and update your datadog attributes in the datadog cookbook."
             )
+            fail ArgumentError, 'Missing Datadog Application Key'
           else
+            new_host_tags = get_combined_tags(hostname, node)
+
             # Replace all tags with the new tags
             rc = @dog.update_tags(hostname, new_host_tags)
             begin
               # See FIXME above about why I feel dirty repeating this code here
               if rc.length < 2
-                Chef::Log.warn("Unexpected response from Datadog Event API: #{evt}")
+                Chef::Log.warn("Unexpected response from Datadog Event API: #{rc}")
               else
                 if rc[0].to_i / 100 != 2
-                  Chef::Log.warn("Could not submit #{new_host_tags} tags for #{hostname} to Datadog: #{evt}")
+                  Chef::Log.warn("Could not submit #{new_host_tags} tags for #{hostname} to Datadog: #{rc}")
                 else
                   Chef::Log.debug("Successfully updated #{hostname}'s tags to #{new_host_tags.join(', ')}")
                 end
@@ -135,48 +112,94 @@ class Chef
           end
         rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
           Chef::Log.error("Could not connect to Datadog. Connection error:\n" + e)
-          Chef::Log.error("Data to be submitted was:")
+          Chef::Log.error('Data to be submitted was:')
           Chef::Log.error(event_title)
           Chef::Log.error(event_data)
-          Chef::Log.error("Tags to be set for this run:")
+          Chef::Log.error('Tags to be set for this run:')
           Chef::Log.error(new_host_tags)
         end
       end
 
       private
 
+      # Emit Chef metrics to Datadog
+      #
+      # @param hostname [String] resolved hostname to attach to series
+      # @param run_status [Chef::RunStatus] current run status
+      def emit_metrics_to_datadog(hostname, run_status)
+        @dog.emit_point('chef.resources.total', run_status.all_resources.length, :host => hostname)
+        @dog.emit_point('chef.resources.updated', run_status.updated_resources.length, :host => hostname)
+        @dog.emit_point('chef.resources.elapsed_time', run_status.elapsed_time, :host => hostname)
+        Chef::Log.debug('Submitted Chef metrics back to Datadog')
+      rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
+        Chef::Log.error("Could not send metrics to Datadog. Connection error:\n" + e)
+      end
+
+      # Call Datadog API for a given hostname and retrieve the current list
+      # of Datadog tags - not the same as Chef 'tags' - rather all tags in
+      # are `key:value` e.g. `role:database-master`.
+      # Build up an array of Datadog tags to send back
+      #
+      # @param hostname [String]
+      # @return [Array] an array of current Datadog tags, roles, env
+      def get_combined_tags(hostname, node)
+        host_tags = get_host_tags(hostname)
+        host_tags << get_node_env(node)
+
+        chef_roles = get_node_roles(node)
+        chef_tags = get_node_tags(node)
+
+        # Combine (union) all arrays. Removes dupes, preserves non-Chef tags.
+        host_tags | chef_roles | chef_tags
+      end
+
+      # Get current tags, drop any that will be replaced
+      def get_host_tags(hostname)
+        tags = @dog.host_tags(hostname)[1]['tags'] || []
+        tags.delete_if { |tag| tag.start_with?('role:', 'env:', 'tag:') }
+      end
+
+      def get_node_roles(node)
+        node.run_list.roles.map! { |role| 'role:' + role }
+      end
+
+      def get_node_env(node)
+        'env:' + node.chef_environment if node.respond_to?('chef_environment')
+      end
+
+      def get_node_tags(node)
+        node.tags.map! { |tag| 'tag:' + tag }
+      end
+
       def pluralize(number, noun)
-        begin
-          case number
-          when 0..1
-            "less than 1 #{noun}"
-          else
-            "#{number.round} #{noun}s"
-          end
-        rescue
-          Chef::Log.warn("Cannot make #{number} more legible")
-          "#{number} #{noun}s"
+        case number
+        when 0..1
+          "less than 1 #{noun}"
+        else
+          "#{number.round} #{noun}s"
         end
+      rescue
+        Chef::Log.warn("Cannot make #{number} more legible")
+        "#{number} #{noun}s"
       end
 
-    # TODO: Remove this once confirmed that Chef 0.9.x is no longer used.
-    ## This function is to mimic behavior built into a later version of chef than 0.9.x
-    ## Source is here: https://github.com/opscode/chef/blob/19bc40b148f3862ce88d044e600d01a9838c60bc/chef/lib/chef/resource.rb#L375-L384
-    ## Including this based on help from schisamo
-      def defined_at(resource)
-        cookbook_name = resource.cookbook_name
-        recipe_name = resource.recipe_name
-        source_line = resource.source_line
-        if cookbook_name && recipe_name && source_line
-          "#{cookbook_name}::#{recipe_name} line #{source_line.split(':')[1]}"
-        elsif source_line
-          file, line_no = source_line.split(':')
-          "#{file} line #{line_no}"
+      # Select which hostname to report back to Datadog.
+      # Makes decision based on inputs from `config` and when absent, use the
+      # node's `ec2` attribute existence to make the decision.
+      #
+      # @param node [Chef::Node] from `run_status`, can feasibly any `node`
+      # @return [String] the hostname decided upon
+      def select_hostname(node)
+        use_ec2_instance_id = !config.key?(:use_ec2_instance_id) ||
+                                (config.key?(:use_ec2_instance_id) &&
+                                  config[:use_ec2_instance_id])
+
+        if use_ec2_instance_id && node.attribute?('ec2') && node.ec2.attribute?('instance_id')
+          node.ec2.instance_id
         else
-          "dynamically defined"
+          node.name
         end
       end
-
-    end #end class Datadog
-  end #end class Handler
-end #end class Chef
+    end # end class Datadog
+  end # end class Handler
+end # end class Chef