newrelic_rpm 4.8.0.341 → 5.0.0.342

data/lib/new_relic/recipes/capistrano3.rb

@@ -34,7 +34,10 @@ namespace :newrelic do
       user        = fetch(:newrelic_user)
       license_key = fetch(:newrelic_license_key)
 
-      unless scm == :none
+      has_scm_from_plugin = respond_to?(:scm_plugin_installed?) && scm_plugin_installed?
+      has_scm_from_config = defined?(scm) && !scm.nil? && scm != :none
+
+      if has_scm_from_plugin || has_scm_from_config
         changelog ||= lookup_changelog
         rev       ||= fetch(:current_revision)
       end
@@ -69,7 +72,7 @@ namespace :newrelic do
 
     debug "Retrieving changelog for New Relic Deployment details"
 
-    if scm == :git
+    if Rake::Task.task_defined?("git:check")
       log_command = "git --no-pager log --no-color --pretty=format:'  * %an: %s' " +
                     "--abbrev-commit --no-merges #{previous_revision}..#{current_revision}"
       `#{log_command}`

data/lib/new_relic/version.rb

@@ -10,8 +10,8 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 4
-    MINOR = 8
+    MAJOR = 5
+    MINOR = 0
     TINY  = 0
 
     begin

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Matthew Wear", "Chris Pine", "Dana Scheider" ]
+  s.authors = [ "Matthew Wear", "Chris Pine", "Erin Dees" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic']
   s.description = <<-EOS
@@ -47,7 +47,8 @@ EOS
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rails', '~> 3.2.13'
   s.add_development_dependency 'json', '>= 2.0.2' if RUBY_VERSION >= '2.4.0' # possible bundler issue?
-  s.add_development_dependency 'pry', '~> 0.9.12'
+  s.add_development_dependency 'pry-nav', '~> 0.2.4'
+  s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
   s.add_development_dependency 'hometown', '~> 0.2.5'
 
   if RUBY_PLATFORM == 'java'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 4.8.0.341
+  version: 5.0.0.342
 platform: ruby
 authors:
 - Matthew Wear
 - Chris Pine
-- Dana Scheider
+- Erin Dees
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,19 +83,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: hometown
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +194,7 @@ files:
 - init.rb
 - install.rb
 - lib/new_relic/agent.rb
+- lib/new_relic/agent/adaptive_sampler.rb
 - lib/new_relic/agent/agent.rb
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/attribute_filter.rb
@@ -208,7 +237,6 @@ files:
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/distributed_trace_monitor.rb
 - lib/new_relic/agent/distributed_trace_payload.rb
-- lib/new_relic/agent/distributed_trace_priority_sampled_buffer.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
@@ -219,6 +247,7 @@ files:
 - lib/new_relic/agent/event_loop.rb
 - lib/new_relic/agent/external.rb
 - lib/new_relic/agent/harvester.rb
+- lib/new_relic/agent/heap.rb
 - lib/new_relic/agent/hostname.rb
 - lib/new_relic/agent/http_clients/abstract_request.rb
 - lib/new_relic/agent/http_clients/curb_wrappers.rb
@@ -308,6 +337,7 @@ files:
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
 - lib/new_relic/agent/prepend_supportability.rb
+- lib/new_relic/agent/priority_sampled_buffer.rb
 - lib/new_relic/agent/range_extensions.rb
 - lib/new_relic/agent/rules_engine.rb
 - lib/new_relic/agent/rules_engine/replacement_rule.rb
@@ -335,7 +365,6 @@ files:
 - lib/new_relic/agent/threading/backtrace_node.rb
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
-- lib/new_relic/agent/throughput_monitor.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/abstract_segment.rb
 - lib/new_relic/agent/transaction/attributes.rb
@@ -454,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/lib/new_relic/agent/distributed_trace_priority_sampled_buffer.rb

@@ -1,72 +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.
-
-require 'new_relic/agent/event_buffer'
-require 'set'
-
-module NewRelic
-  module Agent
-    class DistributedTracePrioritySampledBuffer < SampledBuffer
-      attr_reader :seen_lifetime, :captured_lifetime
-
-      def initialize(capacity)
-        @low_priority_indices = []
-        @high_priority_indices = Set.new
-        super
-      end
-
-      def append_sampled(x = nil, &blk)
-        raise ArgumentError, "Expected argument or block, but received both" if x && blk
-
-        @seen += 1
-        @seen_lifetime += 1
-        if @items.size < @capacity
-          x = blk.call if block_given?
-          insert_high_priority x
-          @captured_lifetime += 1
-          return x
-        elsif !@low_priority_indices.empty? # overwite random low priority sample
-          m = rand(@low_priority_indices.size)
-          insert_high_priority x, @low_priority_indices.delete_at(m)
-          return x
-        else
-          NewRelic::Agent.increment_metric "Supportability/DistributedTracing/SampledBufferFailure/BufferFull"
-          return nil
-        end
-      end
-
-      def append_event(x = nil, &blk)
-        raise ArgumentError, "Expected argument or block, but received both" if x && blk
-
-        if @items.size < @capacity
-          x = blk.call if block_given?
-          insert_low_priority x
-          @captured_lifetime += 1
-          return x
-        else
-          m = rand(@seen) # [0, @seen)
-          if m < @capacity && !@high_priority_indices.include?(m)
-            x = blk.call if block_given?
-            insert_low_priority x, m
-            return x
-          else
-            # discard current sample
-            return nil
-          end
-        end
-      end
-
-      def insert_low_priority x, index = @items.size
-        @items[index] = x
-        @low_priority_indices << index
-      end
-
-      def insert_high_priority x, index = @items.size
-        @items[index] = x
-        @high_priority_indices << index
-      end
-    end
-  end
-end
-