RubyGems - newrelic_rpm - Versions diffs - 2.12.3 → 2.13.0.beta3 - Mend

newrelic_rpm 2.12.3 → 2.13.0.beta3

Potentially problematic release.

This version of newrelic_rpm might be problematic. Click here for more details.

Files changed (118) hide show

data/CHANGELOG +24 -2
data/README.rdoc +172 -0
data/bin/newrelic +13 -0
data/bin/newrelic_cmd +2 -1
data/install.rb +8 -45
data/lib/new_relic/agent.rb +43 -30
data/lib/new_relic/agent/agent.rb +699 -631
data/lib/new_relic/agent/busy_calculator.rb +81 -81
data/lib/new_relic/agent/error_collector.rb +9 -6
data/lib/new_relic/agent/instrumentation/active_record_instrumentation.rb +2 -2
data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +10 -5
data/lib/new_relic/agent/instrumentation/data_mapper.rb +13 -45
data/lib/new_relic/agent/instrumentation/memcache.rb +15 -4
data/lib/new_relic/agent/instrumentation/metric_frame.rb +37 -29
data/lib/new_relic/agent/instrumentation/rack.rb +20 -34
data/lib/new_relic/agent/method_tracer.rb +9 -9
data/lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb +31 -31
data/lib/new_relic/agent/stats_engine/metric_stats.rb +5 -5
data/lib/new_relic/agent/stats_engine/samplers.rb +3 -0
data/lib/new_relic/agent/transaction_sampler.rb +31 -15
data/lib/new_relic/agent/worker_loop.rb +29 -28
data/lib/new_relic/collection_helper.rb +4 -2
data/lib/new_relic/command.rb +85 -0
data/lib/new_relic/commands/deployments.rb +74 -114
data/lib/new_relic/commands/install.rb +81 -0
data/lib/new_relic/control.rb +54 -379
data/lib/new_relic/control/configuration.rb +149 -0
data/lib/new_relic/control/{external.rb → frameworks/external.rb} +2 -2
data/lib/new_relic/control/{merb.rb → frameworks/merb.rb} +1 -1
data/lib/new_relic/control/frameworks/rails.rb +126 -0
data/lib/new_relic/control/{rails3.rb → frameworks/rails3.rb} +11 -10
data/lib/new_relic/control/{ruby.rb → frameworks/ruby.rb} +1 -1
data/lib/new_relic/control/{sinatra.rb → frameworks/sinatra.rb} +2 -2
data/lib/new_relic/control/instrumentation.rb +84 -0
data/lib/new_relic/control/logging_methods.rb +74 -0
data/lib/new_relic/control/profiling.rb +24 -0
data/lib/new_relic/control/server_methods.rb +88 -0
data/lib/new_relic/local_environment.rb +3 -3
data/lib/new_relic/metric_parser.rb +13 -2
data/lib/new_relic/metric_parser/active_record.rb +4 -1
data/lib/new_relic/metric_parser/apdex.rb +53 -0
data/lib/new_relic/metric_parser/controller.rb +13 -5
data/lib/new_relic/metric_parser/mem_cache.rb +1 -1
data/lib/new_relic/metric_parser/other_transaction.rb +21 -0
data/lib/new_relic/metric_spec.rb +3 -3
data/lib/new_relic/noticed_error.rb +1 -1
data/lib/new_relic/rack/developer_mode.rb +257 -0
data/lib/new_relic/rack/metric_app.rb +56 -50
data/lib/new_relic/rack/mongrel_rpm.ru +7 -6
data/lib/new_relic/rack/newrelic.yml +4 -3
data/lib/new_relic/rack_app.rb +2 -1
data/lib/new_relic/recipes.rb +7 -7
data/lib/new_relic/stats.rb +6 -14
data/lib/new_relic/timer_lib.rb +27 -0
data/lib/new_relic/transaction_analysis.rb +2 -7
data/lib/new_relic/transaction_sample.rb +17 -85
data/lib/new_relic/url_rule.rb +14 -0
data/lib/new_relic/version.rb +3 -3
data/lib/newrelic_rpm.rb +5 -9
data/newrelic.yml +26 -9
data/newrelic_rpm.gemspec +67 -32
data/test/config/newrelic.yml +5 -0
data/test/config/test_control.rb +6 -8
data/test/new_relic/agent/active_record_instrumentation_test.rb +5 -6
data/test/new_relic/agent/agent_controller_test.rb +18 -4
data/test/new_relic/agent/agent_test_controller.rb +1 -6
data/test/new_relic/agent/busy_calculator_test.rb +2 -0
data/test/new_relic/agent/collection_helper_test.rb +6 -6
data/test/new_relic/agent/error_collector_test.rb +13 -21
data/test/new_relic/agent/metric_data_test.rb +3 -6
data/test/new_relic/agent/rpm_agent_test.rb +121 -117
data/test/new_relic/agent/task_instrumentation_test.rb +128 -133
data/test/new_relic/agent/transaction_sample_test.rb +176 -170
data/test/new_relic/agent/worker_loop_test.rb +24 -18
data/test/new_relic/control_test.rb +13 -3
data/test/new_relic/deployments_api_test.rb +7 -7
data/test/new_relic/environment_test.rb +1 -1
data/test/new_relic/metric_parser_test.rb +58 -4
data/test/new_relic/rack/episodes_test.rb +317 -0
data/test/new_relic/stats_test.rb +3 -2
data/test/test_contexts.rb +28 -0
data/test/test_helper.rb +24 -5
data/ui/helpers/{newrelic_helper.rb → developer_mode_helper.rb} +63 -23
data/ui/views/layouts/newrelic_default.rhtml +6 -6
data/ui/views/newrelic/_explain_plans.rhtml +4 -4
data/ui/views/newrelic/_sample.rhtml +18 -17
data/ui/views/newrelic/_segment.rhtml +1 -0
data/ui/views/newrelic/_segment_row.rhtml +8 -8
data/ui/views/newrelic/_show_sample_detail.rhtml +1 -1
data/ui/views/newrelic/_show_sample_sql.rhtml +2 -2
data/ui/views/newrelic/_sql_row.rhtml +8 -3
data/ui/views/newrelic/_stack_trace.rhtml +9 -24
data/ui/views/newrelic/_table.rhtml +1 -1
data/ui/views/newrelic/explain_sql.rhtml +3 -2
data/ui/views/newrelic/{images → file/images}/arrow-close.png +0 -0
data/ui/views/newrelic/{images → file/images}/arrow-open.png +0 -0
data/ui/views/newrelic/{images → file/images}/blue_bar.gif +0 -0
data/ui/views/newrelic/{images → file/images}/file_icon.png +0 -0
data/ui/views/newrelic/{images → file/images}/gray_bar.gif +0 -0
data/ui/views/newrelic/{images → file/images}/new-relic-rpm-desktop.gif +0 -0
data/ui/views/newrelic/{images → file/images}/new_relic_rpm_desktop.gif +0 -0
data/ui/views/newrelic/{images → file/images}/textmate.png +0 -0
data/ui/views/newrelic/file/javascript/jquery-1.4.2.js +6240 -0
data/ui/views/newrelic/file/javascript/transaction_sample.js +120 -0
data/ui/views/newrelic/{stylesheets → file/stylesheets}/style.css +0 -0
data/ui/views/newrelic/index.rhtml +7 -5
data/ui/views/newrelic/sample_not_found.rhtml +1 -1
data/ui/views/newrelic/show_sample.rhtml +5 -6
metadata +92 -34
data/README.md +0 -138
data/lib/new_relic/commands/new_relic_commands.rb +0 -30
data/lib/new_relic/control/rails.rb +0 -151
data/test/new_relic/agent/mock_ar_connection.rb +0 -40
data/test/ui/newrelic_controller_test.rb +0 -14
data/test/ui/newrelic_helper_test.rb +0 -53
data/ui/controllers/newrelic_controller.rb +0 -220
data/ui/views/newrelic/javascript/prototype-scriptaculous.js +0 -7288
data/ui/views/newrelic/javascript/transaction_sample.js +0 -107

data/lib/new_relic/rack/metric_app.rb CHANGED Viewed

@@ -1,58 +1,64 @@
 require 'fileutils'
 module NewRelic
-module Rack
-  class MetricApp
-    def initialize(options)
-      if options[:install]
-        FileUtils.copy File.join(File.dirname(__FILE__), "newrelic.yml"), "."
-        NewRelic::Agent.logger.info "==============================="
-        NewRelic::Agent.logger.info "A newrelic.yml template was copied to #{File.expand_path('.')}."
-        NewRelic::Agent.logger.info "Please add a license key to the file and restart #{$0}"
-        exit 0
+  module Rack
+    class MetricApp
+      def initialize(options)
+        if options[:install]
+          src = File.join(File.dirname(__FILE__), "newrelic.yml")
+          require 'new_relic/command'
+          begin
+            NewRelic::Command::Install.new(:quiet => true, :src_file => src).run
+            NewRelic::Agent.logger.info "A newrelic.yml template was copied to #{File.expand_path('.')}."
+            NewRelic::Agent.logger.info "Please add a license key to the file and restart #{$0}"
+            exit 0
+          rescue NewRelic::Command::CommandFailure => e
+            NewRelic::Agent.logger.error e.message
+            exit 1
+          end
+        end
+        options[:app_name] ||= 'EPM Monitor'
+        options[:disable_samplers] = true
+        NewRelic::Agent.manual_start options
+        unless NewRelic::Control.instance.license_key
+          raise "Please add a valid license key to newrelic.yml."
+        end
       end
-      options[:app_name] ||= 'EPM Monitor'
-      options[:disable_samplers] = true
-      NewRelic::Agent.manual_start options
-      unless NewRelic::Control.instance.license_key
-        NewRelic::Agent.logger.error "Please add a valid license key to newrelic.yml."
-        exit 1
+      def call(env)
+        request = ::Rack::Request.new env
+        params = request.params
+        if !(params['uri'] || params['metric'])
+          [400, { 'Content-Type' => 'text/plain' },  "Missing 'uri' or 'metric' parameter: #{params.inspect}" ]
+        elsif !params['value']
+          [400, { 'Content-Type' => 'text/plain' },  "Missing 'value' parameter: #{params.inspect}" ]
+        else
+          NewRelic::Agent.record_transaction( params['value'].to_f, params )
+          ::Rack::Response.new(params.collect { |k, v| "#{k}=#{v} " }.join).finish
+        end
       end
     end
-    def call(env)
-      request = ::Rack::Request.new env
-      segments = request.url.gsub(/^.*?\/metrics\//, '').split("?")[0].split("/")
-      metric = "Custom/" + segments.join("/")
-      raise "Expected value parameter!" unless request['value']
-      data = request['value'].to_f
-      stats = NewRelic::Agent.get_stats(metric, false)
-      stats.record_data_point data
-      response = ::Rack::Response.new "#{metric}=#{data}"
-      response.finish
-    end
-  end
-  class Status
-    def call(env)
-      request = ::Rack::Request.new env
-      data_url = "http://#{env['HTTP_HOST']}/metrics/path?value=nnn"
-      body = StringIO.new
-      body.puts "<html><body>"
-      body.puts "<h1>New Relic Actively Monitoring #{NewRelic::Control.instance.app_names.join(' and ')}</h1>"
-      body.puts "<p>To submit a metric value, use <a href='#{data_url}'>#{data_url}</a></p>"
-      body.puts "<h2>Request Details</h2>"
-      body.puts "<dl>"
-      body.puts "<dt>ip<dd>#{request.ip}"
-      body.puts "<dt>host<dd>#{request.host}"
-      body.puts "<dt>path<dd>#{request.url}"
-      body.puts "<dt>query<dd>#{request.query_string}"
-      body.puts "<dt>params<dd>#{request.params.inspect}"
-      body.puts "</dl>"
-      body.puts "<h2>Complete ENV</h2>"
-      body.puts "<ul>"
-      body.puts env.to_a.map{|k,v| "<li>#{k} = #{v}</li>" }.join("\n")
-      body.puts "</ul></body></html>"
-      response = ::Rack::Response.new body.string
-      response.finish
+    class Status
+      def call(env)
+        request = ::Rack::Request.new env
+        data_url = "http://#{env['HTTP_HOST']}/metrics/path?value=nnn"
+        body = StringIO.new
+        body.puts "<html><body>"
+        body.puts "<h1>New Relic Actively Monitoring #{NewRelic::Control.instance.app_names.join(' and ')}</h1>"
+        body.puts "<p>To submit a metric value, use <a href='#{data_url}'>#{data_url}</a></p>"
+        body.puts "<h2>Request Details</h2>"
+        body.puts "<dl>"
+        body.puts "<dt>ip<dd>#{request.ip}"
+        body.puts "<dt>host<dd>#{request.host}"
+        body.puts "<dt>path<dd>#{request.url}"
+        body.puts "<dt>query<dd>#{request.query_string}"
+        body.puts "<dt>params<dd>#{request.params.inspect}"
+        body.puts "</dl>"
+        body.puts "<h2>Complete ENV</h2>"
+        body.puts "<ul>"
+        body.puts env.to_a.map{|k,v| "<li>#{k} = #{v}</li>" }.join("\n")
+        body.puts "</ul></body></html>"
+        response = ::Rack::Response.new body.string
+        response.finish
+      end
     end
   end
 end
-end

data/lib/new_relic/rack/mongrel_rpm.ru CHANGED Viewed

@@ -11,15 +11,16 @@ require 'new_relic/rack_app'
 # :app_name      optional name of app
 # :logging       optional, false to omit request logging to stdout
-options ||= {}
+# use Rack::CommonLogger unless options[:logging] == false
+# use Rack::ShowExceptions
+# use Rack::Reloader if ENV['RACK_ENV'] == 'development'
+map "/newrelic/record_value" do
+  run NewRelic::Rack::MetricApp.new(options)
+end
-use Rack::CommonLogger unless options[:logging] == false
-use Rack::ShowExceptions
 map "/" do
   run NewRelic::Rack::Status.new
 end
-map "/metrics" do
-  run NewRelic::Rack::MetricApp.new(options)
-end

data/lib/new_relic/rack/newrelic.yml CHANGED Viewed

@@ -2,19 +2,20 @@
 # This file configures the Rack NewRelic Metric Application.  Place a copy of this file
 # in the directory where you start the mongrel_rpm process.
 #
+# <%= generated_for_user %>
+#
 common: &default_settings
   log_level: info
   enabled: true
   # This is the key generated by script/create_admin
-  license_key: 'your_license_key_here'
+  license_key: '<%= license_key %>'
   # Replace this with the name of the application feeding
   # metrics into the Metric application;
   app_name: Application Monitor
-# If RAILS_ENV or RUBY_ENV is defined to be one of the following
-# these values will be overrides
+# Set RACK_ENV to one of the following:
 production:
   <<: *default_settings

data/lib/new_relic/rack_app.rb CHANGED Viewed

@@ -2,4 +2,5 @@ require 'rack/response'
 require 'newrelic_rpm'
 # Rack middlewares and applications used by New Relic
-require 'new_relic/rack/metric_app'
+require 'new_relic/rack/metric_app'
+require 'new_relic/rack/developer_mode'

data/lib/new_relic/recipes.rb CHANGED Viewed

@@ -16,7 +16,7 @@ make_notify_task = lambda do
     desc "Record a deployment in New Relic RPM (rpm.newrelic.com)"
     task :notice_deployment, :roles => :app, :except => {:no_release => true } do
       rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
-      require File.join(File.dirname(__FILE__), 'commands', 'deployments.rb')
+      require File.join(File.dirname(__FILE__), 'command.rb')
       begin
         # Try getting the changelog from the server.  Then fall back to local changelog
         # if it doesn't work.  Problem is that I don't know what directory the .git is
@@ -52,15 +52,15 @@ make_notify_task = lambda do
           :description => description,
           :appname => appname }
         logger.debug "Uploading deployment to New Relic"
-        deployment = NewRelic::Commands::Deployments.new deploy_options
+        deployment = NewRelic::Command::Deployments.new deploy_options
         deployment.run
         logger.info "Uploaded deployment information to New Relic"
-      rescue ScriptError => e
-        logger.info "error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
-      rescue NewRelic::Commands::CommandFailure => e
-        logger.info "unable to notify New Relic of the deployment (#{e})... skipping"
+      rescue NewRelic::Command::CommandFailure => e
+        logger.info e.message
       rescue Capistrano::CommandError
-        logger.info "unable to notify New Relic of the deployment... skipping"
+        logger.info "Unable to notify New Relic of the deployment... skipping"
+      rescue Exception => e
+        logger.info "Error creating New Relic deployment (#{e})\n#{e.backtrace.join("\n")}"
       end
       # WIP: For rollbacks, let's update the deployment we created with an indication of the failure:
       # on_rollback do

data/lib/new_relic/stats.rb CHANGED Viewed

@@ -44,7 +44,7 @@ module NewRelic
       self
     end
-    def merge! (other_stats)
+    def merge!(other_stats)
       Array(other_stats).each do |s|
         self.total_call_time += s.total_call_time
         self.total_exclusive_time += s.total_exclusive_time
@@ -59,7 +59,7 @@ module NewRelic
       self
     end
-    def merge (other_stats)
+    def merge(other_stats)
       stats = self.clone
       stats.merge! other_stats
     end
@@ -175,21 +175,13 @@ module NewRelic
     alias requests_per_minute calls_per_minute
     def to_s
-      s = "Begin=#{begin_time}, "
-      s << "Duration=#{duration} s, "
-      s << "Count=#{call_count}, "
-      s << "Total=#{to_ms(total_call_time)}, "
-      s << "Total Exclusive=#{to_ms(total_exclusive_time)}, "
-      s << "Avg=#{to_ms(average_call_time)}, "
-      s << "Min=#{to_ms(min_call_time)}, "
-      s << "Max=#{to_ms(max_call_time)}, "
-      s << "StdDev=#{to_ms(standard_deviation)}"
+      summary
     end
     # Summary string to facilitate testing
     def summary
-      format = "%m/%d %I:%M%p"
-      "[#{Time.at(begin_time).strftime(format)}, #{'%2.3fs' % duration}; #{'%4i' % call_count} calls #{'%4i' % to_ms(average_call_time)} ms]"
+      format = "%m/%d/%y %I:%M%p"
+      "[#{Time.at(begin_time).utc.strftime(format)} UTC, #{'%2.3fs' % duration}; #{'%2i' % call_count} calls #{'%4i' % to_ms(average_call_time)} ms]"
     end
     # round all of the values to n decimal points

data/lib/new_relic/timer_lib.rb ADDED Viewed

@@ -0,0 +1,27 @@
+# Copyright:  (C) 2008 David Vollbracht & Philippe Hanrigou
+# This code was borrowed from the system_timer gem under the terms
+# of the Ruby license.  It has been slightly modified.
+# Defines the constant TimerLib to the appropriate timeout library
+module NewRelic #:nodoc:
+  begin
+    # Try to use the SystemTimer gem instead of Ruby's timeout library
+    # when running on Ruby 1.8.x. See:
+    #   http://ph7spot.com/articles/system_timer
+    # We don't want to bother trying to load SystemTimer on jruby,
+    # ruby 1.9+ and rbx.
+    if !defined?(RUBY_ENGINE) || (RUBY_ENGINE == 'ruby' && RUBY_VERSION < '1.9.0')
+      require 'system_timer'
+      TimerLib = SystemTimer
+    else
+      require 'timeout'
+      TimerLib = Timeout
+    end
+  rescue LoadError => e
+    require 'timeout'
+    TimerLib = Timeout
+  end
+end

data/lib/new_relic/transaction_analysis.rb CHANGED Viewed

@@ -94,15 +94,10 @@ module TransactionAnalysis
   # return an array of sql statements executed by this transaction
   # each element in the array contains [sql, parent_segment_metric_name, duration]
-  def sql_segments
+  def sql_segments(show_non_sql_segments = true)
     segments = []
     each_segment do |segment|
-      if segment[:sql]
-        segments << segment
-      end
-      if segment[:sql_obfuscated]
-        segments << segment
-      end
+      segments << segment if segment[:sql] || segment[:sql_obfuscated] || (show_non_sql_segments && segment[:key])
     end
     segments
   end

data/lib/new_relic/transaction_sample.rb CHANGED Viewed

@@ -16,14 +16,14 @@ module NewRelic
       ].freeze
   class TransactionSample
+    attr_accessor :params, :root_segment
     EMPTY_ARRAY = [].freeze
     @@start_time = Time.now
     include TransactionAnalysis
     class Segment
       attr_reader :entry_timestamp
       # The exit timestamp will be relative except for the outermost sample which will
       # have a timestamp.
@@ -66,35 +66,6 @@ module NewRelic
         map.to_json
       end
-      def self.from_json(json, id_generator)
-        json = ActiveSupport::JSON.decode(json) if json.is_a?(String)
-        if json.is_a?(Array)
-          entry_timestamp = json[0].to_f / 1000
-          exit_timestamp = json[1].to_f / 1000
-          metric_name = json[2]
-          params = json[3]
-          called_segments = json[4]
-        else
-          entry_timestamp = json["entry_timestamp"].to_f
-          exit_timestamp = json["exit_timestamp"].to_f
-          metric_name =  json["metric_name"]
-          params = json["params"]
-          called_segments = json["called_segments"]
-        end
-        segment = Segment.new(entry_timestamp, metric_name, id_generator.next_id)
-        segment.end_trace exit_timestamp
-        if params
-          segment.send :params=, HashWithIndifferentAccess.new(params)
-        end
-        if called_segments
-          called_segments.each do |child|
-            segment.add_called_segment(self.from_json(child, id_generator))
-          end
-        end
-        segment
-      end
       def path_string
         "#{metric_name}[#{called_segments.collect {|segment| segment.path_string }.join('')}]"
       end
@@ -250,6 +221,11 @@ module NewRelic
         explanations
       end
+      def params=(p)
+        @params = p
+      end
       def handle_exception_in_explain(e)
         x = 1 # this is here so that code coverage knows we've entered this block
         # swallow failed attempts to run an explain.  One example of a failure is the
@@ -268,9 +244,6 @@ module NewRelic
         def parent_segment=(s)
           @parent_segment = s
         end
-        def params=(p)
-          @params = p
-        end
     end
     class FakeSegment < Segment
@@ -322,7 +295,6 @@ module NewRelic
         NewRelic::Agent.instance.obfuscator.call(sql)
       end
       def get_connection(config)
         @@connections ||= {}
@@ -399,36 +371,7 @@ module NewRelic
       map.to_json
     end
-    # Used in the Server only
-    def self.from_json(json) #:nodoc:
-      json = ActiveSupport::JSON.decode(json) if json.is_a?(String)
-      if json.is_a?(Array)
-        start_time = json[0].to_f / 1000
-        custom_params = HashWithIndifferentAccess.new(json[2])
-        params = {:request_params => HashWithIndifferentAccess.new(json[1]),
-              :custom_params => custom_params}
-        cpu_time = custom_params.delete(:cpu_time)
-        sample_id = nil
-        params[:cpu_time] = cpu_time.to_f / 1000 if cpu_time
-        root = json[3]
-      else
-        start_time = json["start_time"].to_f
-        sample_id = json["sample_id"].to_i
-        params = json["params"]
-        root = json["root_segment"]
-      end
-      sample = TransactionSample.new(start_time, sample_id)
-      if params
-        sample.send :params=, HashWithIndifferentAccess.new(params)
-      end
-      if root
-        sample.send :root_segment=, Segment.from_json(root, IDGenerator.new)
-      end
-      sample
-    end
     def start_time
       Time.at(@start_time)
@@ -499,11 +442,12 @@ module NewRelic
     end
     # return a new transaction sample that can be sent to the RPM service.
-    # this involves potentially one or more of the following options
+    # this involves potentially one or more of the following options
+    #
     #   :explain_sql : run EXPLAIN on all queries whose response times equal the value for this key
     #       (for example :explain_sql => 2.0 would explain everything over 2 seconds.  0.0 would explain everything.)
     #   :keep_backtraces : keep backtraces, significantly increasing size of trace (off by default)
-    #   :obfuscate_sql : clear sql fields of potentially sensitive values (higher overhead, better security)
+    #   :record_sql => [ :raw | :obfuscated] : copy over the sql, obfuscating if necessary
     def prepare_to_send(options={})
       sample = TransactionSample.new(@start_time, sample_id)
@@ -533,10 +477,6 @@ module NewRelic
     end
-  protected
-    def root_segment=(segment)
-      @root_segment = segment
-    end
     def params=(params)
       @params = params
     end
@@ -620,15 +560,16 @@ module NewRelic
           when :backtrace
             target_called_segment[k]=v if options[:keep_backtraces]
           when :sql
-            sql = v
             # run an EXPLAIN on this sql if specified.
-            if options[:explain_enabled] && options[:explain_sql] && source_called_segment.duration > options[:explain_sql].to_f
+            if options[:record_sql] && options[:record_sql] && options[:explain_sql] && source_called_segment.duration > options[:explain_sql].to_f
               target_called_segment[:explanation] = source_called_segment.explain_sql
             end
-            target_called_segment[:sql]=sql if options[:record_sql] == :raw
-            target_called_segment[:sql_obfuscated] = TransactionSample.obfuscate_sql(sql) if options[:record_sql] == :obfuscated
+            target_called_segment[:sql] = case options[:record_sql]
+              when :raw then v
+              when :obfuscated then TransactionSample.obfuscate_sql(v)
+              else raise "Invalid value for record_sql: #{options[:record_sql]}"
+            end if options[:record_sql]
           when :connection_config
             # don't copy it
           else
@@ -641,14 +582,5 @@ module NewRelic
       end
     end
-    # Generates segment ids for json transaction segments
-    class IDGenerator
-      def initialize
-        @next_id = 0
-      end
-      def next_id
-        @next_id += 1
-      end
-    end
   end
 end