newrelic_rpm 5.7.0.350 → 6.0.0.351

data/test/agent_helper.rb

@@ -334,10 +334,10 @@ def in_transaction(*args, &blk)
   name = opts.key?(:transaction_name) ? opts.delete(:transaction_name) :
                                         args.first || 'dummy'
 
-  state = NewRelic::Agent::TransactionState.tl_get
+  state = NewRelic::Agent::Tracer.state
   txn = nil
 
-  NewRelic::Agent::Transaction.wrap(state, name, category, opts) do
+  NewRelic::Agent::Tracer.in_transaction(name: name, category: category, options: opts) do
     txn = state.current_transaction
     yield state.current_transaction
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 5.7.0.350
+  version: 6.0.0.351
 platform: ruby
 authors:
 - Matthew Wear
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -371,6 +371,7 @@ files:
 - lib/new_relic/agent/threading/backtrace_service.rb
 - lib/new_relic/agent/threading/thread_profile.rb
 - lib/new_relic/agent/timestamp_sampled_buffer.rb
+- lib/new_relic/agent/tracer.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/abstract_segment.rb
 - lib/new_relic/agent/transaction/attributes.rb
@@ -394,7 +395,6 @@ files:
 - lib/new_relic/agent/transaction_event_recorder.rb
 - lib/new_relic/agent/transaction_metrics.rb
 - lib/new_relic/agent/transaction_sampler.rb
-- lib/new_relic/agent/transaction_state.rb
 - lib/new_relic/agent/transaction_time_aggregator.rb
 - lib/new_relic/agent/utilization/aws.rb
 - lib/new_relic/agent/utilization/azure.rb
@@ -423,6 +423,7 @@ files:
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/rails4.rb
 - lib/new_relic/control/frameworks/rails5.rb
+- lib/new_relic/control/frameworks/rails6.rb
 - lib/new_relic/control/frameworks/ruby.rb
 - lib/new_relic/control/frameworks/sinatra.rb
 - lib/new_relic/control/instance_methods.rb

data/lib/new_relic/agent/transaction_state.rb

@@ -1,186 +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
-
-    # This is THE location to store thread local information during a transaction
-    # Need a new piece of data? Add a method here, NOT a new thread local variable.
-    class TransactionState
-      class << self
-        def tl_get
-          tl_state_for(Thread.current)
-        end
-
-        alias_method :trace_state, :tl_get
-
-        def tracing_enabled?
-          trace_state.tracing_enabled?
-        end
-
-        def current_transaction
-          trace_state.current_transaction
-        end
-
-        # A more ergonomic API would be to have transaction derive the
-        # category from the transaction name and we should explore this as an
-        # option.
-        def start_transaction(name: nil, category: nil, **options)
-          raise ArgumentError, 'missing required argument: name' if name.nil?
-          raise ArgumentError, 'missing required argument: category' if category.nil?
-
-          state = trace_state
-          return state.current_transaction if state.current_transaction
-
-          options[:transaction_name] = name
-
-          Transaction.start_new_transaction(trace_state,
-                                            category,
-                                            options)
-        end
-
-        def create_distributed_trace_payload
-          if txn = current_transaction
-            txn.create_distributed_trace_payload
-          end
-        end
-
-        def accept_distributed_trace_payload(payload)
-          if txn = current_transaction
-            txn.accept_distributed_trace_payload(payload)
-          end
-        end
-
-        def start_segment(name:nil,
-                          unscoped_metrics:nil,
-                          start_time: nil,
-                          parent: nil)
-
-          Transaction.start_segment(name: name,
-                                    unscoped_metrics: unscoped_metrics,
-                                    start_time: start_time,
-                                    parent: parent)
-        end
-
-        def start_datastore_segment(product: nil,
-                                    operation: nil,
-                                    collection: nil,
-                                    host: nil,
-                                    port_path_or_id: nil,
-                                    database_name: nil,
-                                    start_time: nil,
-                                    parent: nil)
-
-          Transaction.start_datastore_segment(product: product,
-                                              operation: operation,
-                                              collection: collection,
-                                              host: host,
-                                              port_path_or_id: port_path_or_id,
-                                              database_name: database_name,
-                                              start_time: start_time,
-                                              parent: parent)
-        end
-
-        def start_external_request_segment(library: nil,
-                                           uri: nil,
-                                           procedure: nil,
-                                           start_time: nil,
-                                           parent: nil)
-
-          Transaction.start_external_request_segment(library: library,
-                                                     uri: uri,
-                                                     procedure: procedure,
-                                                     start_time: start_time,
-                                                     parent: parent)
-        end
-
-        def start_message_broker_segment(action: nil,
-                                         library: nil,
-                                         destination_type: nil,
-                                         destination_name: nil,
-                                         headers: nil,
-                                         parameters: nil,
-                                         start_time: nil,
-                                         parent: nil)
-
-          Transaction.start_message_broker_segment(action: action,
-                                                   library: library,
-                                                   destination_type: destination_type,
-                                                   destination_name: destination_name,
-                                                   headers: headers,
-                                                   parameters: parameters,
-                                                   start_time: start_time,
-                                                   parent: parent)
-        end
-
-        # This method should only be used by TransactionState for access to the
-        # current thread's state or to provide read-only accessors for other threads
-        #
-        # If ever exposed, this requires additional synchronization
-        def tl_state_for(thread)
-          state = thread[:newrelic_transaction_state]
-
-          if state.nil?
-            state = TransactionState.new
-            thread[:newrelic_transaction_state] = state
-          end
-
-          state
-        end
-
-        def tl_clear
-          Thread.current[:newrelic_transaction_state] = nil
-        end
-      end
-
-      def initialize
-        @untraced = []
-        @current_transaction = nil
-        @record_sql = nil
-      end
-
-      # This starts the timer for the transaction.
-      def reset(transaction=nil)
-        # We purposefully don't reset @untraced or @record_sql
-        # since those are managed by NewRelic::Agent.disable_* calls explicitly
-        # and (more importantly) outside the scope of a transaction
-
-        @current_transaction = transaction
-        @sql_sampler_transaction_data = nil
-      end
-
-      # Current transaction stack
-      attr_reader :current_transaction
-
-      # Execution tracing on current thread
-      attr_accessor :untraced
-
-      def push_traced(should_trace)
-        @untraced << should_trace
-      end
-
-      def pop_traced
-        @untraced.pop if @untraced
-      end
-
-      def is_execution_traced?
-        @untraced.nil? || @untraced.last != false
-      end
-
-      alias_method :tracing_enabled?, :is_execution_traced?
-
-      # TT's and SQL
-      attr_accessor :record_sql
-
-      def is_sql_recorded?
-        @record_sql != false
-      end
-
-      # Sql Sampler Transaction Data
-      attr_accessor :sql_sampler_transaction_data
-    end
-
-    Tracer = TransactionState
-  end
-end