newrelic_rpm 4.0.0.332 → 4.8.0.341

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

@@ -133,7 +133,11 @@ module NewRelic
               name = self.class.name
             end
 
-            segment = NewRelic::Agent::Transaction.start_datastore_segment DATA_MAPPER, metric_operation, name
+            segment = NewRelic::Agent::Transaction.start_datastore_segment(
+              product: DATA_MAPPER,
+              operation: metric_operation,
+              collection: name
+            )
 
             begin
               self.send("#{method_name}_without_newrelic", *args, &blk)
@@ -164,7 +168,7 @@ module NewRelic
 
               raise
             ensure
-              segment.finish
+              segment.finish if segment
             end
           end
         end
@@ -184,8 +188,11 @@ module NewRelic
           state = NewRelic::Agent::TransactionState.tl_get
           return unless state.is_execution_traced?
 
-          duration = msg.duration / 1000000.0
-          NewRelic::Agent.instance.transaction_sampler.notice_sql(msg.query, nil, duration, state)
+          txn = state.current_transaction
+
+          if txn && txn.current_segment.respond_to?(:notice_sql)
+            txn.current_segment.notice_sql msg.query
+          end
         ensure
           super
         end

data/lib/new_relic/agent/instrumentation/excon/connection.rb

@@ -18,7 +18,10 @@ module ::Excon
       resolved_params = newrelic_resolved_request_params(params)
       wrapped_request = ::NewRelic::Agent::HTTPClients::ExconHTTPRequest.new(resolved_params)
       segment = NewRelic::Agent::Transaction.start_external_request_segment(
-                  wrapped_request.type, wrapped_request.uri, wrapped_request.method)
+        library: wrapped_request.type,
+        uri: wrapped_request.uri,
+        procedure: wrapped_request.method
+      )
 
       begin
         response = nil
@@ -31,7 +34,7 @@ module ::Excon
 
         response
       ensure
-        segment.finish
+        segment.finish if segment
       end
     end
 

data/lib/new_relic/agent/instrumentation/excon/middleware.rb

@@ -20,7 +20,10 @@ module ::Excon
           if datum[:connection] && !datum[:connection].instance_variable_get(TRACE_DATA_IVAR)
             wrapped_request = ::NewRelic::Agent::HTTPClients::ExconHTTPRequest.new(datum)
             segment = NewRelic::Agent::Transaction.start_external_request_segment(
-                        wrapped_request.type, wrapped_request.uri, wrapped_request.method)
+              library: wrapped_request.type,
+              uri: wrapped_request.uri,
+              procedure: wrapped_request.method
+            )
 
             segment.add_request_headers wrapped_request
 
@@ -53,7 +56,7 @@ module ::Excon
               segment.read_response_headers wrapped_response
             end
           ensure
-            segment.finish
+            segment.finish if segment
           end
         end
       end

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

@@ -22,7 +22,10 @@ DependencyDetection.defer do
 
         begin
           segment = NewRelic::Agent::Transaction.start_external_request_segment(
-            wrapped_request.type, wrapped_request.uri, wrapped_request.method)
+            library: wrapped_request.type,
+            uri: wrapped_request.uri,
+            procedure: wrapped_request.method
+          )
 
           segment.add_request_headers wrapped_request
 

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

@@ -29,7 +29,10 @@ DependencyDetection.defer do
       def do_get_block_with_newrelic(req, proxy, conn, &block)
         wrapped_request = NewRelic::Agent::HTTPClients::HTTPClientRequest.new(req)
         segment = NewRelic::Agent::Transaction.start_external_request_segment(
-            wrapped_request.type, wrapped_request.uri, wrapped_request.method)
+          library: wrapped_request.type,
+          uri: wrapped_request.uri,
+          procedure: wrapped_request.method
+        )
 
         begin
           response = nil
@@ -44,7 +47,7 @@ DependencyDetection.defer do
 
           response
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
 

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb

@@ -59,7 +59,10 @@ module NewRelic
               alias_method :send_multiget_without_newrelic_trace, :send_multiget
 
               def send_multiget(keys)
-                segment = ::NewRelic::Agent::Transaction.start_datastore_segment(MEMCACHED, SEND_MULTIGET_METRIC_NAME)
+                segment = ::NewRelic::Agent::Transaction.start_datastore_segment(
+                  product: MEMCACHED,
+                  operation: SEND_MULTIGET_METRIC_NAME
+                )
                 ::NewRelic::Agent::Instrumentation::Memcache::Dalli.assign_instance_to(segment, self)
 
                 begin
@@ -68,7 +71,7 @@ module NewRelic
                   if ::NewRelic::Agent.config[:capture_memcache_keys]
                     segment.notice_nosql_statement "#{SEND_MULTIGET_METRIC_NAME} #{keys.inspect}"
                   end
-                  segment.finish
+                  segment.finish if segment
                 end
               end
             end
@@ -82,11 +85,11 @@ module NewRelic
               alias_method method_name_without, method_name
 
               define_method method_name do |*args, &block|
-                segment = NewRelic::Agent::Transaction.start_segment "Ruby/Memcached/Dalli/#{method_name}"
+                segment = NewRelic::Agent::Transaction.start_segment name: "Ruby/Memcached/Dalli/#{method_name}"
                 begin
                   __send__ method_name_without, *args, &block
                 ensure
-                  segment.finish
+                  segment.finish if segment
                 end
               end
 

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

@@ -41,14 +41,17 @@ module NewRelic
               alias_method method_name_without, method_name
 
               define_method method_name do |*args, &block|
-                segment = NewRelic::Agent::Transaction.start_datastore_segment "Memcached", method_name
+                segment = NewRelic::Agent::Transaction.start_datastore_segment(
+                  product: "Memcached",
+                  operation: method_name
+                )
                 begin
                   send method_name_without, *args, &block
                 ensure
                   if NewRelic::Agent.config[:capture_memcache_keys]
                     segment.notice_nosql_statement "#{method_name} #{args.first.inspect}"
                   end
-                  segment.finish
+                  segment.finish if segment
                 end
               end
 

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

@@ -56,10 +56,10 @@ DependencyDetection.defer do
 
       # It's key that this method eats all exceptions, as it rests between the
       # Mongo operation the user called and us returning them the data. Be safe!
-      def new_relic_notice_statement(t0, payload, name)
+      def new_relic_notice_statement(segment, payload, name)
         statement = NewRelic::Agent::Datastores::Mongo::StatementFormatter.format(payload, name)
         if statement
-          NewRelic::Agent.instance.transaction_sampler.notice_nosql_statement(statement, (Time.now - t0).to_f)
+          segment.notice_nosql_statement statement
         end
       rescue => e
         NewRelic::Agent.logger.debug("Exception during Mongo statement gathering", e)
@@ -73,7 +73,12 @@ DependencyDetection.defer do
         product = NewRelic::Agent::Datastores::Mongo::MetricTranslator::MONGO_PRODUCT_NAME
         op_and_col = NewRelic::Agent::Datastores::Mongo::MetricTranslator.operation_and_collection_for name, payload
         if op_and_col
-          NewRelic::Agent::Transaction.start_datastore_segment product, *op_and_col
+          operation, collection = op_and_col
+          NewRelic::Agent::Transaction.start_datastore_segment(
+            product: product,
+            operation: operation,
+            collection: collection
+          )
         end
       end
 
@@ -85,7 +90,7 @@ DependencyDetection.defer do
             instrument_without_new_relic_trace(name, payload, &block)
           end
 
-          new_relic_notice_statement(segment.start_time, payload, name) if segment
+          new_relic_notice_statement(segment, payload, name) if segment
           result
         ensure
           segment.finish if segment
@@ -107,7 +112,7 @@ DependencyDetection.defer do
             save_without_new_relic_trace(doc, opts, &block)
           end
 
-          new_relic_notice_statement(segment.start_time, doc, :save) if segment
+          new_relic_notice_statement(segment, doc, :save) if segment
           result
         ensure
           segment.finish if segment
@@ -138,7 +143,7 @@ DependencyDetection.defer do
                    spec.dup
                  end
 
-          new_relic_notice_statement(segment.start_time, spec, :ensureIndex) if segment
+          new_relic_notice_statement(segment, spec, :ensureIndex) if segment
           result
         ensure
           segment.finish if segment

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

@@ -24,7 +24,7 @@ module NewRelic
             state = NewRelic::Agent::TransactionState.tl_get
             return unless state.is_execution_traced?
             segment = segments.delete(event.operation_id)
-            segment.finish
+            segment.finish if segment
           rescue Exception => e
             log_notification_error('completed', e)
           end
@@ -39,7 +39,12 @@ module NewRelic
           host = host_from_address event.address
           port_path_or_id = port_path_or_id_from_address event.address
           segment = NewRelic::Agent::Transaction.start_datastore_segment(
-            MONGODB, event.command_name, collection(event), host, port_path_or_id, event.database_name
+            product: MONGODB,
+            operation: event.command_name,
+            collection: collection(event),
+            host: host,
+            port_path_or_id: port_path_or_id,
+            database_name: event.database_name
           )
           segment.notice_nosql_statement(generate_statement(event))
           segment

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

@@ -21,7 +21,10 @@ DependencyDetection.defer do
         wrapped_request = NewRelic::Agent::HTTPClients::NetHTTPRequest.new(self, request)
 
         segment = NewRelic::Agent::Transaction.start_external_request_segment(
-          wrapped_request.type, wrapped_request.uri, wrapped_request.method)
+          library: wrapped_request.type,
+          uri: wrapped_request.uri,
+          procedure: wrapped_request.method
+        )
 
         begin
           response = nil

data/lib/new_relic/agent/instrumentation/rails/action_controller.rb

@@ -86,7 +86,7 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 2
+    defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 2
   end
 
   executes do

data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb

@@ -66,7 +66,7 @@ DependencyDetection.defer do
   @name = :rails3_controller
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 3
   end
 
   depends_on do
@@ -88,7 +88,8 @@ DependencyDetection.defer do
   @name = :rails30_view
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i == 0
+    defined?(::Rails::VERSION::MAJOR) && defined?(::Rails::VERSION::MINOR) &&
+      ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i == 0
   end
 
   depends_on do
@@ -127,7 +128,8 @@ DependencyDetection.defer do
   # We can't be sure that this will work with future versions of Rails 3.
   # Currently enabled for Rails 3.1 and 3.2
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ([1,2].member?(::Rails::VERSION::MINOR.to_i))
+    defined?(::Rails::VERSION::MAJOR) && defined?(::Rails::VERSION::MINOR) &&
+      ::Rails::VERSION::MAJOR.to_i == 3 && ([1,2].member?(::Rails::VERSION::MINOR.to_i))
   end
 
   depends_on do

data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb

@@ -2,13 +2,14 @@
 # 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/instrumentation/action_controller_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 
 DependencyDetection.defer do
   @name = :rails4_controller
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 4
   end
 
   depends_on do
@@ -25,5 +26,7 @@ DependencyDetection.defer do
     end
     NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
       .subscribe(/^process_action.action_controller$/)
+
+    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionController::Base)
   end
 end

data/lib/new_relic/agent/instrumentation/rails4/action_view.rb

@@ -2,12 +2,13 @@
 # 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/instrumentation/action_view_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
   @name = :rails4_view
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 4
   end
 
   depends_on do
@@ -21,5 +22,6 @@ DependencyDetection.defer do
 
   executes do
     NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
+    NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionView::Base, ::ActionView::Template, ::ActionView::Renderer)
   end
 end

data/lib/new_relic/agent/instrumentation/rails5/action_cable.rb

@@ -2,12 +2,13 @@
 # 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/instrumentation/action_cable_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
   @name = :rails5_action_cable
 
   depends_on do
-    defined?(::Rails) &&
+    defined?(::Rails::VERSION::MAJOR) &&
      ::Rails::VERSION::MAJOR.to_i == 5 &&
        defined?(::ActionCable)
   end
@@ -25,5 +26,7 @@ DependencyDetection.defer do
     # enumerate the specific events we want so that we do not get unexpected additions in the future
     ActiveSupport::Notifications.subscribe(/(perform_action|transmit)\.action_cable/,
       NewRelic::Agent::Instrumentation::ActionCableSubscriber.new)
+
+    ::NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionCable::Engine, ::ActionCable::RemoteConnections)
   end
 end

data/lib/new_relic/agent/instrumentation/rails5/action_controller.rb

@@ -2,13 +2,14 @@
 # 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/instrumentation/action_controller_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 
 DependencyDetection.defer do
   @name = :rails5_controller
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 5
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 5
   end
 
   depends_on do
@@ -20,8 +21,10 @@ DependencyDetection.defer do
   end
 
   executes do
-    ActiveSupport.on_load(:action_controller) do |c|
-      c.include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    ActiveSupport.on_load(:action_controller) do
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+      NewRelic::Agent::PrependSupportability.record_metrics_for(self)
     end
 
     NewRelic::Agent::Instrumentation::ActionControllerSubscriber \

data/lib/new_relic/agent/instrumentation/rails5/action_view.rb

@@ -2,12 +2,13 @@
 # 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/instrumentation/action_view_subscriber'
+require 'new_relic/agent/prepend_supportability'
 
 DependencyDetection.defer do
   @name = :rails5_view
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 5
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i == 5
   end
 
   depends_on do
@@ -16,10 +17,11 @@ DependencyDetection.defer do
   end
 
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 5 view instrumentation'
+    NewRelic::Agent.logger.info 'Installing Rails 5 view instrumentation'
   end
 
   executes do
     NewRelic::Agent::Instrumentation::ActionViewSubscriber.subscribe(/render_.+\.action_view$/)
+    NewRelic::Agent::PrependSupportability.record_metrics_for(::ActionView::Base, ::ActionView::Template, ::ActionView::Renderer)
   end
 end

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

@@ -12,7 +12,7 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 3
+    defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR.to_i >= 3
   end
 
   executes do

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

@@ -102,7 +102,9 @@ module NewRelic
             def invoke_prerequisites_concurrently(*_)
               NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/multitask") do
                 prereqs = self.prerequisite_tasks.map(&:name).join(", ")
-                NewRelic::Agent::Datastores.notice_statement("Couldn't trace concurrent prereq tasks: #{prereqs}", 0)
+                if txn = ::NewRelic::Agent::TransactionState.tl_get.current_transaction
+                  txn.current_segment.params[:statement] = NewRelic::Agent::Database.truncate_query("Couldn't trace concurrent prereq tasks: #{prereqs}")
+                end
                 super
               end
             end

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

@@ -62,13 +62,18 @@ DependencyDetection.defer do
         hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
         port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
 
-        segment = NewRelic::Agent::Transaction.start_datastore_segment(NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
-          operation, nil, hostname, port_path_or_id, db)
+        segment = NewRelic::Agent::Transaction.start_datastore_segment(
+          product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+          operation: operation,
+          host: hostname,
+          port_path_or_id: port_path_or_id,
+          database_name: db
+        )
         begin
           segment.notice_nosql_statement(statement) if statement
           call_without_new_relic(*args, &block)
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
 
@@ -82,13 +87,18 @@ DependencyDetection.defer do
         hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
         port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
 
-        segment = NewRelic::Agent::Transaction.start_datastore_segment(NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
-          operation, nil, hostname, port_path_or_id, db)
+        segment = NewRelic::Agent::Transaction.start_datastore_segment(
+          product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+          operation: operation,
+          host: hostname,
+          port_path_or_id: port_path_or_id,
+          database_name: db
+        )
         begin
           segment.notice_nosql_statement(statement)
           call_pipeline_without_new_relic(*args, &block)
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
 
@@ -98,13 +108,18 @@ DependencyDetection.defer do
         hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
         port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
 
-        segment = NewRelic::Agent::Transaction.start_datastore_segment(NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
-          NewRelic::Agent::Datastores::Redis::CONNECT, nil, hostname, port_path_or_id, db)
+        segment = NewRelic::Agent::Transaction.start_datastore_segment(
+          product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
+          operation: NewRelic::Agent::Datastores::Redis::CONNECT,
+          host: hostname,
+          port_path_or_id: port_path_or_id,
+          database_name: db
+        )
 
         begin
           connect_without_new_relic(*args, &block)
         ensure
-          segment.finish
+          segment.finish if segment
         end
       end
     end

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

@@ -33,11 +33,18 @@ DependencyDetection.defer do
   # Apply single TT node for Hydra requests until async support
   executes do
     class Typhoeus::Hydra
-      include NewRelic::Agent::MethodTracer
 
       def run_with_newrelic(*args)
-        trace_execution_scoped("External/Multiple/Typhoeus::Hydra/run") do
+        segment = NewRelic::Agent::Transaction.start_segment(
+          name: NewRelic::Agent::Instrumentation::TyphoeusTracing::HYDRA_SEGMENT_NAME
+        )
+
+        instance_variable_set :@__newrelic_hydra_segment, segment
+
+        begin
           run_without_newrelic(*args)
+        ensure
+          segment.finish if segment
         end
       end
 
@@ -48,36 +55,53 @@ DependencyDetection.defer do
 end
 
 
-module NewRelic::Agent::Instrumentation::TyphoeusTracing
+module NewRelic
+  module Agent
+    module Instrumentation
+      module TyphoeusTracing
 
-  EARLIEST_VERSION = Gem::Version.new("0.5.3")
+        HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
 
-  def self.is_supported_version?
-    Gem::Version.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
-  end
+        EARLIEST_VERSION = Gem::Version.new("0.5.3")
 
-  def self.request_is_hydra_enabled?(request)
-    request.respond_to?(:hydra) && request.hydra
-  end
+        def self.is_supported_version?
+          Gem::Version.new(Typhoeus::VERSION) >= NewRelic::Agent::Instrumentation::TyphoeusTracing::EARLIEST_VERSION
+        end
 
-  def self.trace(request)
-    state = NewRelic::Agent::TransactionState.tl_get
-    if state.is_execution_traced? && !request_is_hydra_enabled?(request)
-      wrapped_request = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(request)
+        def self.request_is_hydra_enabled?(request)
+          request.respond_to?(:hydra) && request.hydra
+        end
 
-      segment = NewRelic::Agent::Transaction.start_external_request_segment(
-          wrapped_request.type, wrapped_request.uri, wrapped_request.method)
+        def self.trace(request)
+          state = NewRelic::Agent::TransactionState.tl_get
+          return unless state.is_execution_traced?
 
-      segment.add_request_headers wrapped_request
+          wrapped_request = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPRequest.new(request)
 
-      callback = Proc.new do
-        wrapped_response = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPResponse.new(request.response)
-        segment.read_response_headers wrapped_response
-        segment.finish
+          parent = if request_is_hydra_enabled?(request)
+            request.hydra.instance_variable_get(:@__newrelic_hydra_segment)
+          end
+
+          segment = NewRelic::Agent::Transaction.start_external_request_segment(
+            library: wrapped_request.type,
+            uri: wrapped_request.uri,
+            procedure: wrapped_request.method,
+            parent: parent
+          )
+
+          segment.add_request_headers wrapped_request
+
+          callback = Proc.new do
+            wrapped_response = ::NewRelic::Agent::HTTPClients::TyphoeusHTTPResponse.new(request.response)
+            segment.read_response_headers wrapped_response
+            segment.finish if segment
+          end
+          request.on_complete.unshift(callback)
+
+        rescue => e
+          NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
+        end
       end
-      request.on_complete.unshift(callback)
     end
-  rescue => e
-    NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
   end
 end