newrelic_rpm 8.10.0 → 8.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9556e153e6ae6bb4ea2894bc62e6c0745a08f2347c25074a97316fe6818ca6d
-  data.tar.gz: 1e07fc83567ff8b0e83a1c502265076fca5409021ff724801455c6e4ee5086ff
+  metadata.gz: 5293c4968708ee7ff95720c57446722d8649e7095fd44f03b88f562d156b7cbf
+  data.tar.gz: df7b918b393af7aa8852bbb2867e0f7468a0ce7e78316f3a0cb8e0cedeb2aaeb
 SHA512:
-  metadata.gz: 9bb9efe02ea356b8969d3466bde7c76e2f20cb8880d93628d707ee92c05338e91262d456c4b5e0b9943ad1ee50e8edf512cb82096a3f5f2ea166a6b5b1bfdb0b
-  data.tar.gz: 1e13ef2b0b0ab49ef8c08f5d54536a37a3b3f5812b8a0ef884f2b1df670842499edcef344297aae59822cc43d456b47f3164ba86daf678e62080c09912a871a7
+  metadata.gz: 863115396ffd0b911d11da3d0ccbe8a4e7bc98f6d406080261c4a41272a78139406146524e0f3f121ae0f729635235b40c8666caf8b70b9e20182d82b178789c
+  data.tar.gz: 24f7b15184ec2fd778712a215e4f6fc7d029c37b3cfb3f1efe9d0d085999abe2e795b6f644c6ac420904de3a5c7759797e462c94deb73173566c536c8bf3cb54

data/.gitignore

@@ -16,6 +16,7 @@ tags
 *.swo
 
 coverage
+coverage_*
 /doc/
 /log/
 /lerg/

data/.rubocop.yml

@@ -1,5 +1,12 @@
+inherit_from: .rubocop_todo.yml
+
 require:
+  # Default minitest configurations: https://github.com/rubocop/rubocop-minitest/blob/master/config/default.yml
+  - rubocop-minitest
+  # Default performance configurations: https://github.com/rubocop/rubocop-performance/blob/master/config/default.yml
   - rubocop-performance
+  # Default rake configurations: https://github.com/rubocop/rubocop-rake/blob/master/config/default.yml
+  <%= '- rubocop-rake' if RUBY_VERSION >= '2.4.0' %>
 
 AllCops:
   TargetRubyVersion: 2.7
@@ -256,7 +263,9 @@ Layout/LineEndStringConcatenationIndentation:
   Enabled: false
 
 Layout/LineLength:
-  Enabled: false
+  # TODO: get this down to something closer to the 80 col ideal
+  #       we should be able to manage 120
+  Max: 576
 
 Layout/MultilineArrayBraceLayout:
   Enabled: true
@@ -1466,7 +1475,7 @@ Style/MapToHash:
 
 Style/MethodCallWithArgsParentheses:
   Enabled: true
-  IgnoredMethods:
+  AllowedMethods:
     - puts
     - require
     - raise
@@ -1479,7 +1488,7 @@ Style/MethodCallWithArgsParentheses:
 
 Style/MethodCallWithoutArgsParentheses:
   Enabled: false
-  IgnoredMethods: []
+  AllowedMethods: []
 
 Style/MethodCalledOnDoEndBlock:
   Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,243 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-09-09 22:01:39 UTC using RuboCop version 1.36.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Exclude:
+    - 'test/multiverse/suites/active_record/db/schema.rb'
+    - 'test/multiverse/suites/active_record_pg/db/schema.rb'
+
+# Offense count: 52
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertEmptyLiteral:
+  Enabled: false
+
+# Offense count: 13
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertEqual:
+  Exclude:
+    - 'test/multiverse/suites/config_file_loading/config_file_loading_test.rb'
+    - 'test/new_relic/agent/configuration/default_source_test.rb'
+    - 'test/new_relic/agent/error_trace_aggregator_test.rb'
+    - 'test/new_relic/agent/method_tracer_helpers_test.rb'
+    - 'test/new_relic/agent/method_tracer_test.rb'
+    - 'test/new_relic/agent/transaction_sampler_test.rb'
+    - 'test/new_relic/metric_data_test.rb'
+
+# Offense count: 145
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertInDelta:
+  Enabled: false
+
+# Offense count: 22
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertIncludes:
+  Exclude:
+    - 'test/agent_helper.rb'
+    - 'test/multiverse/suites/rails/active_support_logger_test.rb'
+    - 'test/multiverse/suites/sequel/sequel_plugin_test.rb'
+    - 'test/multiverse/suites/sinatra_agent_disabled/shim_test.rb'
+    - 'test/new_relic/agent/audit_logger_test.rb'
+    - 'test/new_relic/agent/configuration/manager_test.rb'
+    - 'test/new_relic/agent/configuration/orphan_configuration_test.rb'
+    - 'test/new_relic/agent/error_trace_aggregator_test.rb'
+    - 'test/new_relic/agent/javascript_instrumentor_test.rb'
+    - 'test/new_relic/agent/method_visibility_test.rb'
+    - 'test/new_relic/agent/sampler_test.rb'
+    - 'test/new_relic/agent/tracer_state_test.rb'
+    - 'test/new_relic/control/instance_methods_test.rb'
+    - 'test/new_relic/environment_report_test.rb'
+    - 'test/new_relic/metric_data_test.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertKindOf:
+  Exclude:
+    - 'test/new_relic/agent/agent_test.rb'
+    - 'test/new_relic/agent/pipe_channel_manager_test.rb'
+    - 'test/new_relic/agent_test.rb'
+
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertNil:
+  Exclude:
+    - 'test/multiverse/suites/agent_only/log_events_test.rb'
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertPathExists:
+  Exclude:
+    - 'infinite_tracing/test/support/fixtures.rb'
+    - 'test/multiverse/suites/mongo/helpers/mongo_server_test.rb'
+
+# Offense count: 140
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertPredicate:
+  Enabled: false
+
+# Offense count: 6
+Minitest/AssertRaisesCompoundBody:
+  Exclude:
+    - 'test/new_relic/agent/collector_response_code_test.rb'
+    - 'test/new_relic/agent/new_relic_service_test.rb'
+    - 'test/new_relic/cli/commands/deployments_test.rb'
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertRespondTo:
+  Exclude:
+    - 'test/multiverse/suites/sequel/sequel_plugin_test.rb'
+    - 'test/multiverse/suites/sinatra_agent_disabled/shim_test.rb'
+    - 'test/new_relic/agent/configuration/default_source_test.rb'
+    - 'test/new_relic/collection_helper_test.rb'
+    - 'test/new_relic/data_container_tests.rb'
+
+# Offense count: 35
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/AssertTruthy:
+  Exclude:
+    - 'test/multiverse/suites/agent_only/error_events_test.rb'
+    - 'test/multiverse/suites/rack/puma_rack_urlmap_test.rb'
+    - 'test/multiverse/suites/sequel/sequel_safety_test.rb'
+    - 'test/new_relic/agent/commands/thread_profiler_session_test.rb'
+    - 'test/new_relic/agent/configuration/environment_source_test.rb'
+    - 'test/new_relic/agent/configuration/manager_test.rb'
+    - 'test/new_relic/agent/configuration/security_policy_source_test.rb'
+    - 'test/new_relic/agent/configuration/yaml_source_test.rb'
+    - 'test/new_relic/agent/distributed_tracing/distributed_trace_payload_test.rb'
+    - 'test/new_relic/agent/distributed_tracing/trace_context_payload_test.rb'
+    - 'test/new_relic/agent/priority_sampled_buffer_test.rb'
+    - 'test/new_relic/agent/transaction/distributed_tracing_test.rb'
+    - 'test/new_relic/agent_test.rb'
+    - 'test/new_relic/gem_notifications_tests.rb'
+    - 'test/new_relic/language_support_test.rb'
+
+# Offense count: 27
+Minitest/AssertWithExpectedArgument:
+  Exclude:
+    - 'infinite_tracing/test/infinite_tracing/worker_test.rb'
+    - 'test/agent_helper.rb'
+    - 'test/multiverse/suites/grpc/grpc_client_test.rb'
+    - 'test/multiverse/suites/rails/error_tracing_test.rb'
+    - 'test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb'
+    - 'test/new_relic/agent/agent_test.rb'
+    - 'test/new_relic/agent/configuration/default_source_test.rb'
+    - 'test/new_relic/agent/configuration/orphan_configuration_test.rb'
+    - 'test/new_relic/agent/datastores/redis_test.rb'
+    - 'test/new_relic/agent/distributed_tracing/distributed_tracing_cross_agent_test.rb'
+    - 'test/new_relic/agent/method_tracer_helpers_test.rb'
+    - 'test/new_relic/control_test.rb'
+
+# Offense count: 4
+Minitest/DuplicateTestRun:
+  Exclude:
+    - 'test/multiverse/suites/rails/error_tracing_test.rb'
+    - 'test/multiverse/suites/sinatra/ignoring_test.rb'
+
+# Offense count: 38
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/LiteralAsActualArgument:
+  Exclude:
+    - 'test/multiverse/suites/rails/active_support_logger_test.rb'
+    - 'test/new_relic/agent/configuration/environment_source_test.rb'
+    - 'test/new_relic/agent/connect/request_builder_test.rb'
+    - 'test/new_relic/agent/error_trace_aggregator_test.rb'
+    - 'test/new_relic/agent/instrumentation/controller_instrumentation_test.rb'
+    - 'test/new_relic/agent/new_relic_service_test.rb'
+    - 'test/new_relic/agent/samplers/cpu_sampler_test.rb'
+    - 'test/new_relic/agent/samplers/memory_sampler_test.rb'
+    - 'test/new_relic/agent/stats_test.rb'
+    - 'test/new_relic/agent/transaction/abstract_segment_test.rb'
+    - 'test/new_relic/agent/transaction/datastore_segment_test.rb'
+    - 'test/new_relic/agent/transaction_sampler_test.rb'
+    - 'test/new_relic/gem_notifications_tests.rb'
+    - 'test/new_relic/marshalling_test_cases.rb'
+    - 'test/new_relic/noticed_error_test.rb'
+
+# Offense count: 260
+Minitest/MultipleAssertions:
+  Max: 28
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/RefuteEqual:
+  Exclude:
+    - 'test/agent_helper.rb'
+    - 'test/multiverse/suites/config_file_loading/config_file_loading_test.rb'
+    - 'test/new_relic/agent/agent_test.rb'
+    - 'test/new_relic/agent/configuration/manager_test.rb'
+    - 'test/new_relic/marshalling_test_cases.rb'
+
+# Offense count: 121
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/RefuteFalse:
+  Enabled: false
+
+# Offense count: 16
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/RefuteIncludes:
+  Exclude:
+    - 'test/multiverse/suites/datamapper/datamapper_test.rb'
+    - 'test/multiverse/suites/grpc/grpc_server_test.rb'
+    - 'test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb'
+    - 'test/multiverse/suites/mongo/mongo2_instrumentation_test.rb'
+    - 'test/multiverse/suites/rack/rack_cascade_test.rb'
+    - 'test/new_relic/agent/configuration/manager_test.rb'
+    - 'test/new_relic/control/instance_methods_test.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/RefutePathExists:
+  Exclude:
+    - 'test/multiverse/suites/mongo/helpers/mongo_server_test.rb'
+
+# Offense count: 96
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/RefutePredicate:
+  Enabled: false
+
+# Offense count: 27
+# This cop supports safe autocorrection (--autocorrect).
+Minitest/TestMethodName:
+  Enabled: false
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Rake/Desc:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/tasks/config.rake'
+
+# Offense count: 15
+Rake/MethodDefinitionInTask:
+  Exclude:
+    - 'Rakefile'
+    - 'infinite_tracing/tasks/proto.rake'
+    - 'lib/tasks/config.rake'
+    - 'lib/tasks/tests.rake'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'test/multiverse/suites/active_record/db/schema.rb'
+    - 'test/multiverse/suites/active_record_pg/db/schema.rb'
+
+# Offense count: 26
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: IgnoreMacros, AllowedMethods, IgnoredMethods, AllowedPatterns, IgnoredPatterns, IncludedMacros, AllowParenthesesInMultilineCall, AllowParenthesesInChaining, AllowParenthesesInCamelCaseMethod, AllowParenthesesInStringInterpolation, EnforcedStyle.
+# SupportedStyles: require_parentheses, omit_parentheses
+Style/MethodCallWithArgsParentheses:
+  Exclude:
+    - 'test/multiverse/suites/active_record/db/schema.rb'
+    - 'test/multiverse/suites/active_record_pg/db/schema.rb'

data/.simplecov

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
+require 'securerandom'
+
+random = SecureRandom.uuid
+SimpleCov.command_name(random)
+SimpleCov.coverage_dir("coverage_#{random}")
+
 SimpleCov.start do
-  enable_coverage :branch
+  enable_coverage(:branch)
   SimpleCov.root(File.join(File.dirname(__FILE__), '/lib'))
-  track_files "**/*.rb"
+  track_files("**/*.rb")
+  formatter(SimpleCov::Formatter::SimpleFormatter)
 end

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 # New Relic Ruby Agent Release Notes #
 
 
+  ## v8.10.1
+
+
+  * **Bugfix: Missing unscoped metrics when instrumentation.thread.tracing is enabled**
+    
+    Previously, when `instrumentation.thread.tracing` was set to true, some puma applications encountered a bug where a varying number of unscoped metrics would be missing. The agent now will correctly store and send all unscoped metrics.
+    
+    Thank you to @texpert for providing details of their situation to help resolve the issue.
+  
+  
+  * **Bugfix: gRPC instrumentation causes ArgumentError when other Google gems are present**
+
+    Previously, when the agent had gRPC instrumentation enabled in an application using other gems (such as google-ads-googleads), the instrumentation could cause the error `ArgumentError: wrong number of arguments (given 3, expected 2)`. The gRPC instrumentation has been updated to prevent this issue from occurring in the future. 
+
+    Thank you to @FeminismIsAwesome for bringing this issue to our attention.
+
+
   ## v8.10.0
 
 
@@ -17,12 +34,17 @@
     | `instrumentation.grpc.host_denylist` | "" |  Provide a comma delimited list of host regex patterns (ex: "private.com$,exception.*") |
 
 
+  * **Code-level metrics functionality is enabled by default**
+
+    The code-level metrics functionality for the Ruby agent's [CodeStream integration](https://docs.newrelic.com/docs/apm/agents/ruby-agent/features/ruby-codestream-integration) is now enabled by default after we have received positive feedback and no open bugs for the past two releases.
+
+
   * **Performance: Rework timing range overlap calculations for multiple transaction segments**
 
     Many thanks to GitHub community members @bmulholland and @hkdnet. @bmulholland alerted us to [rmosolgo/graphql-ruby#3945](https://github.com/rmosolgo/graphql-ruby/issues/3945). That Issue essentially notes that the New Relic Ruby agent incurs a significant perfomance hit when the `graphql` RubyGem (which ships with New Relic Ruby agent support) is used with DataLoader to generate a high number of transactions. Then @hkdnet diagnosed the root cause in the Ruby agent and put together both a proof of concept fix and a full blown PR to resolve the problem. The agent keeps track multiple segments that are concurrently in play for a given transaction in order to merge the ones whose start and stop times intersect. The logic for doing this find-and-merge operation has been reworked to a) be deferred entirely until the transaction is ready to be recorded, and b) made more performant when it is needed. GraphQL DataLoader users and other users who generate lots of activity for monitoring within a short amount of time will hopefully see some good performance gains from these changes.
 
 
-  * **Performance: Make frozen string literals the default for the agent
+  * **Performance: Make frozen string literals the default for the agent**
 
     The Ruby `frozen_string_literal: true` magic source code comment has now been applied consistently across all Ruby files belonging to the agent. This can provide a performance boost, given that Ruby can rely on the strings remaining immutable. Previously only about a third of the agent's code was freezing string literals by default. Now that 100% of the code freezes string literals by default, we have internally observed some related performance gains through testing. We are hopeful that these will translate into some real world gains in production capacities.
 

data/Thorfile

@@ -0,0 +1,6 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+Dir["./lib/tasks/**/*.thor"].sort.each { |f| load f }

data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb

@@ -12,13 +12,10 @@ module NewRelic
     module Instrumentation
       class ActionControllerSubscriber < NotificationsSubscriber
         def start(name, id, payload) # THREAD_LOCAL_ACCESS
-          # @req is a historically stable but not guaranteed Rails header property
-          request = payload[:headers].instance_variable_get(:@req)
-
           controller_class = controller_class(payload)
 
           if state.is_execution_traced? && !should_ignore(payload, controller_class)
-            finishable = start_transaction_or_segment(payload, request, controller_class)
+            finishable = start_transaction_or_segment(payload, request_for_payload(payload), controller_class)
             push_segment(id, finishable)
           else
             # if this transaction is ignored, make sure child
@@ -98,6 +95,13 @@ module NewRelic
             QueueTime.parse_frontend_timestamp(request.env, Process.clock_gettime(Process::CLOCK_REALTIME))
           end
         end
+
+        def request_for_payload(payload)
+          # @req is a historically stable but not guaranteed Rails header property
+          return unless payload[:headers].instance_variables.include?(:@req)
+
+          payload[:headers].instance_variable_get(:@req)
+        end
       end
     end
   end

data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb

@@ -13,14 +13,6 @@ module NewRelic::Agent::Instrumentation
           ::GRPC::ClientStub.class_eval do
             include NewRelic::Agent::Instrumentation::GRPC::Client
 
-            def initialize_with_newrelic_trace(*args)
-              @trace_with_newrelic = trace_with_newrelic?(args.first)
-              initialize_without_newrelic_trace(*args)
-            end
-
-            alias initialize_without_newrelic_trace initialize
-            alias initialize initialize_with_newrelic_trace
-
             def bidi_streamer_with_new_relic_trace(method, requests, marshal, unmarshal,
               deadline: nil,
               return_op: false,

data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb

@@ -70,16 +70,18 @@ module NewRelic
             "grpc://#{@host}/#{method}"
           end
 
-          def trace_with_newrelic?(host = nil)
-            return false if self.class.name.eql?('GRPC::InterceptorRegistry')
-
-            do_trace = instance_variable_get(:@trace_with_newrelic)
-            return do_trace unless do_trace.nil? # check for nil, not falsey
+          def interceptor?
+            self.class.name.eql?('GRPC::InterceptorRegistry')
+          end
 
-            host ||= @host
-            return false unless host && !host_denylisted?(host)
+          def trace_with_newrelic?
+            return @trace_with_newrelic unless @trace_with_newrelic.nil? # check for nil, not false
 
-            true
+            @trace_with_newrelic = if interceptor?
+              false
+            else
+              !host_denylisted?(@host)
+            end
           end
         end
       end

data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb

@@ -13,11 +13,6 @@ module NewRelic
           module Prepend
             include NewRelic::Agent::Instrumentation::GRPC::Client
 
-            def initialize(*args)
-              @trace_with_newrelic = trace_with_newrelic?(args.first)
-              super(*args)
-            end
-
             def bidi_streamer(method, requests, marshal, unmarshal,
               deadline: nil,
               return_op: false,

data/lib/new_relic/agent/instrumentation/grpc/helper.rb

@@ -18,6 +18,8 @@ module NewRelic
           end
 
           def host_denylisted?(host)
+            return false unless host
+
             ignore_patterns.any? { |regex| host.match?(regex) }
           end
 

data/lib/new_relic/agent/threading/agent_thread.rb

@@ -8,21 +8,25 @@ module NewRelic
     module Threading
       class AgentThread
         def self.create(label, &blk)
-          ::NewRelic::Agent.logger.debug("Creating New Relic thread: #{label}")
+          ::NewRelic::Agent.logger.debug("Creating AgentThread: #{label}")
           wrapped_blk = Proc.new do
+            if ::Thread.current[:newrelic_tracer_state] && Thread.current[:newrelic_tracer_state].current_transaction
+              txn = ::Thread.current[:newrelic_tracer_state].current_transaction
+              ::NewRelic::Agent.logger.warn("AgentThread created with current transaction #{txn.best_name}")
+            end
             begin
               blk.call
             rescue => e
-              ::NewRelic::Agent.logger.error("Thread #{label} exited with error", e)
+              ::NewRelic::Agent.logger.error("AgentThread #{label} exited with error", e)
             rescue Exception => e
-              ::NewRelic::Agent.logger.error("Thread #{label} exited with exception. Re-raising in case of interrupt.", e)
+              ::NewRelic::Agent.logger.error("AgentThread #{label} exited with exception. Re-raising in case of interrupt.", e)
               raise
             ensure
-              ::NewRelic::Agent.logger.debug("Exiting New Relic thread: #{label}")
+              ::NewRelic::Agent.logger.debug("Exiting AgentThread: #{label}")
             end
           end
-
-          thread = backing_thread_class.new(&wrapped_blk)
+          thread = nil
+          NewRelic::Agent.disable_all_tracing { thread = backing_thread_class.new(&wrapped_blk) }
           thread[:newrelic_label] = label
           thread
         end

data/lib/new_relic/agent/tracer.rb

@@ -407,11 +407,13 @@ module NewRelic
         alias_method :tl_clear, :clear_state
 
         def thread_block_with_current_transaction(*args, &block)
-          current_txn = ::Thread.current[:newrelic_tracer_state].current_transaction if ::Thread.current[:newrelic_tracer_state]
+          current_txn = ::Thread.current[:newrelic_tracer_state].current_transaction if ::Thread.current[:newrelic_tracer_state] && ::Thread.current[:newrelic_tracer_state].is_execution_traced?
           Proc.new do
             begin
-              NewRelic::Agent::Tracer.state.current_transaction = current_txn
-              segment = NewRelic::Agent::Tracer.start_segment(name: "Ruby/Thread/#{::Thread.current.object_id}")
+              if current_txn
+                NewRelic::Agent::Tracer.state.current_transaction = current_txn
+                segment = NewRelic::Agent::Tracer.start_segment(name: "Ruby/Thread/#{::Thread.current.object_id}")
+              end
               block.call(*args) if block.respond_to?(:call)
             ensure
               segment.finish if segment

data/lib/new_relic/language_support.rb

@@ -73,6 +73,11 @@ module NewRelic
       end
     end
 
+    def camelize(string)
+      camelized = string.downcase
+      camelized.split(/\-|\_/).map(&:capitalize).join
+    end
+
     def bundled_gem?(gem_name)
       defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
     rescue => e

data/lib/new_relic/version.rb

@@ -8,7 +8,7 @@ module NewRelic
   module VERSION # :nodoc:
     MAJOR = 8
     MINOR = 10
-    TINY = 0
+    TINY = 1
 
     STRING = "#{MAJOR}.#{MINOR}.#{TINY}"
   end

data/lib/tasks/coverage_report.rake

@@ -7,17 +7,27 @@ namespace :coverage do
   desc "Collates all result sets generated by the different test runners"
   task :report do
     require 'simplecov'
-    require 'simplecov_json_formatter'
-    unless ENV['CI']
-      puts 'This task is intended to be run only on the CI.'
-      return
-    end
-    SimpleCov.collate(Dir["coverage*/.resultset.json"]) do
-      formatter SimpleCov::Formatter::MultiFormatter.new([
-        SimpleCov::Formatter::JSONFormatter,
-        SimpleCov::Formatter::HTMLFormatter
-      ])
-      refuse_coverage_drop
+    require 'fileutils'
+
+    SimpleCov.coverage_dir('coverage_results')
+
+    if ENV['CI']
+      SimpleCov.collate(Dir['*/coverage_*/.resultset.json']) do
+        formatter SimpleCov::Formatter::HTMLFormatter
+        refuse_coverage_drop
+      end
+    else
+      SimpleCov.collate(Dir['lib/coverage_*/.resultset.json']) do
+        formatter SimpleCov::Formatter::HTMLFormatter
+      end
     end
+
+    Dir['lib/coverage_{[!r][!e][!s][!u][!l][!t][!s]}*'].each { |dir| FileUtils.rm_rf(dir) }
+  end
+
+  desc "Removes all coverage_* directories"
+  task :clear do
+    require 'fileutils'
+    Dir["lib/coverage_*"].each { |dir| FileUtils.rm_rf(dir) }
   end
 end

data/lib/tasks/instrumentation_generator/README.md

@@ -0,0 +1,63 @@
+# Instrumentation Generator
+
+## Usage
+
+`thor list` can be passed to get a list of all available thor commands
+
+### instrumentation:scaffold
+
+This task requires one parameter by default: the name of the library or class you are instrumenting. This task generates the basic file structure needed to add new instrumentation to the Ruby agent.
+
+Run it using:
+
+`thor instrumentation:scaffold gem_name`
+
+It accepts two optional parameters:
+
+- `--method`: the name of a method to instrument. Only one method can be accepted at this time. Defaults to `method_to_instrument`
+- `--args`: the arguments for the instrumented method. A comma-separated list can be given if there are multiple arguments. Defaults to `*args`.
+
+With the optional parameters, the task can be run like so:
+
+`thor instrumentation:scaffold gem_name --method=method_to_instrument --args=arg1,arg2,arg3`
+
+### WIP: instrumentation:add_new_method
+
+Are you trying add instrumentation for a method within library we already instrument? This task is for you! Instead of building the entire scaffold, this task inserts only the changes needed within the `instrumentation.rb` and test files to instrument the new method. It requires one argument, the name of the existing instrumentation to add the method to. If the instrumented library does not already exist, it will create a new scaffold for that library.
+
+Run it using:
+
+`thor instrumentation:scaffold gem_name`
+
+It accepts two optional paramters:
+
+- `--method`: the name of a method to instrument. Only one method can be accepted at this time. Defaults to `method_to_instrument`
+- `--args`: the arguments for the instrumented method. A comma-separated list can be given if there are multiple arguments. Defaults to `*args`.
+
+With the optional parameters, the task can be run like so:
+
+`thor instrumentation:add_new_method gem_name --method=method_to_instrument --args=arg1,arg2,arg3`
+
+## Idea
+
+Create a CLI, similar to Rails’ generators and scaffold scripts, to create the required files and basic classes for instrumenting new libraries. The hope is that the parts of adding new instrumentation that is repetitive can be eliminated and/or reduced so that it takes less time to add new instrumentation and we can spend development time considering the best attributes to collect and interactions to measure. I also hope this project will reduce the overall toil related to adding new instrumentation.
+
+The files we create with little variation besides library and method names are:
+
+- Lib
+  - Dependency detection
+  - Chain
+  - Prepend
+  - Instrumentation
+- Tests
+  - configuration/newrelic.yml
+  - Envfile
+  - Test file
+
+Furthermore, we also create very similar snippets inside the default source configuration file that could be generated by this project as well.
+
+## Outcome
+
+A prototype outside the agent has been created that generates the required files to create new instrumentation. This prototype accepts three arguments: name (name of the library), method (method to instrument), args (arguments for the method).
+
+The Ruby gem Thor, a toolkit for building powerful command-line interfaces used in Bundler, Vagrant, Rails and others powers this CLI.