newrelic_rpm 4.3.0.335 → 4.4.0.336

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 4.3.0.335
+  version: 4.4.0.336
 platform: ruby
 authors:
 - Matthew Wear
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -173,7 +173,6 @@ files:
 - lib/new_relic/agent/attribute_processing.rb
 - lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/autostart.rb
-- lib/new_relic/agent/aws_info.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
 - lib/new_relic/agent/commands/agent_command.rb
@@ -353,6 +352,11 @@ files:
 - lib/new_relic/agent/transaction_sampler.rb
 - lib/new_relic/agent/transaction_state.rb
 - lib/new_relic/agent/transaction_timings.rb
+- lib/new_relic/agent/utilization/aws.rb
+- lib/new_relic/agent/utilization/azure.rb
+- lib/new_relic/agent/utilization/gcp.rb
+- lib/new_relic/agent/utilization/pcf.rb
+- lib/new_relic/agent/utilization/vendor.rb
 - lib/new_relic/agent/utilization_data.rb
 - lib/new_relic/agent/vm.rb
 - lib/new_relic/agent/vm/jruby_vm.rb
@@ -419,6 +423,7 @@ files:
 - newrelic.yml
 - newrelic_rpm.gemspec
 - recipes/newrelic.rb
+- test/agent_helper.rb
 homepage: https://github.com/newrelic/rpm
 licenses:
 - New Relic

data/lib/new_relic/agent/aws_info.rb

@@ -1,90 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-module NewRelic
-  module Agent
-    class AWSInfo
-
-      class ResponseError < StandardError; end
-
-      attr_reader :instance_type, :instance_id, :availability_zone
-
-      def initialize
-        handle_remote_calls do
-          @instance_type = remote_fetch('instance-type')
-          @instance_id = remote_fetch('instance-id')
-          @availability_zone = remote_fetch('placement/availability-zone')
-        end
-      end
-
-      def loaded?
-        instance_type && instance_id && availability_zone
-      end
-
-      def to_collector_hash
-        {
-          :id => instance_id,
-          :type => instance_type,
-          :zone => availability_zone
-        }
-      end
-
-      private
-
-      def reset
-        @instance_type = @instance_id = @availability_zone = nil
-      end
-
-      REMOTE_DATA_VALID_CHARS = /^[0-9a-zA-Z_ .\/-]$/.freeze
-      INSTANCE_HOST = '169.254.169.254'
-      API_VERSION   = '2008-02-01'
-
-      def remote_fetch(remote_key)
-        uri = URI("http://#{INSTANCE_HOST}/#{API_VERSION}/meta-data/#{remote_key}")
-        response = Net::HTTP::get(uri)
-
-        data = filter_remote_data(response)
-
-        unless data
-          NewRelic::Agent.increment_metric('Supportability/utilization/aws/error')
-          raise ResponseError, "Fetching instance metadata for #{remote_key.inspect} returned invalid data: #{response.inspect}"
-        end
-
-        data
-      end
-
-      def handle_remote_calls
-        begin
-          Timeout::timeout(1) do
-            yield
-          end
-        rescue Timeout::Error
-          handle_error "UtilizationData timed out fetching remote keys."
-        rescue StandardError => e
-          handle_error "UtilizationData encountered error fetching remote keys: #{e.message}"
-        end
-      end
-
-      def handle_error(*messages)
-        NewRelic::Agent.logger.debug(*messages)
-        reset
-      end
-
-      def filter_remote_data(data_str)
-        return nil unless data_str.kind_of?(String)
-        return nil unless data_str.bytesize <= 255
-
-        data_str.each_char do |ch|
-          next if ch =~ REMOTE_DATA_VALID_CHARS
-          code_point = ch[0].ord # this works in Ruby 1.8.7 - 2.1.2
-          next if code_point >= 0x80
-
-          return nil # it's in neither set of valid characters
-        end
-
-        data_str
-      end
-    end
-  end
-end