oneapm_rpm 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e32427fd3917392d098a61043e2e8ba109be38f
-  data.tar.gz: 146849355bbd8791205fafccca1cd14a42d93eaa
+  metadata.gz: 4759f9e2a49b073a72ef050065da0b3169782a50
+  data.tar.gz: e06c21dc7767a5c5ee0b2371eb367cb3286b1231
 SHA512:
-  metadata.gz: 75c0d8b2b385925693074ea3c369cf2ec062a7708369f704c8890d7f1d1c549502848bddbb5d8f8ba0503a19056d974baf74427c64e15a436b237876df3bdaab
-  data.tar.gz: 1e84cb7ff83b77382c7b854b87473dc426a1baff93ccc9c1612d7febbd96aeefa0ab59090160d6090fd90e6fbbce29b0b78a06d28b5661cc27242adf5c203f43
+  metadata.gz: 523b7b03147cb529a70bf76da7bdd1761621460169d4eeb74d972db31134eae5ab7d0430d693cd7e51d4699d66b71615de5b9a42b81ca45c8d7d4a23a3d2ddc1
+  data.tar.gz: 60387048069ae8167d4f237070131090558fb44104b47af2e5e86597f44eb2dcbef8223da1516fc37c13684e2da1e8a827a86a26765c2ee4ed8c0b9656c39d44

data/lib/one_apm/agent/database/active_record_helper.rb

@@ -12,20 +12,18 @@ module OneApm
             model = parts.first
             operation = parts.last.downcase
             case operation
-            when 'load', 'count', 'exists'
-              op_name = 'find'
-            when 'indexes', 'columns'
-              op_name = nil # fall back to DirectSQL
-            when 'destroy', 'find', 'save', 'create'
-              op_name = operation
-            when 'update'
-              op_name = 'save'
+            when 'find', 'load', 'count', 'exists'
+              op_name = 'select'
+            when 'destroy'
+              op_name = 'delete'
+            when 'create'
+              op_name = 'insert'
+            when 'update', 'save'
+              op_name = 'update'
             else
-              if model == 'Join'
-                op_name = operation
-              end
+              op_name = nil
             end
-            "ActiveRecord/#{model}/#{op_name}" if op_name
+            "Database/#{model}/#{op_name}" if op_name
           end
         end
 
@@ -44,11 +42,11 @@ module OneApm
           metric
         end
 
-        # Given a metric name such as "ActiveRecord/model/action" this
+        # Given a metric name such as "Database/model/action" this
         # returns an array of rollup metrics:
-        # [ "Database/all", "ActiveRecord/all", "ActiveRecord/action" ]
-        # If the metric name is in the form of "ActiveRecord/action"
-        # this returns merely: [ "Database/all", "ActiveRecord/all" ]
+        # [ "Database/all", "Database/all", "Database/action" ]
+        # If the metric name is in the form of "Database/action"
+        # this returns merely: [ "Database/all", "Database/all" ]
         def rollup_metrics_for(metric)
           metrics = ["Database/all"]
 
@@ -56,11 +54,11 @@ module OneApm
           # database metrics. This is to prevent metrics from background tasks
           # from polluting the metrics used to drive overview graphs.
           if OneApm::Transaction.recording_web_transaction?
-            metrics << "ActiveRecord/all"
+            metrics << "Database/allWeb"
           else
             metrics << "Database/allOther"
           end
-          metrics << "ActiveRecord/#{$1}" if metric =~ /ActiveRecord\/[\w|\:]+\/(\w+)/
+          metrics << "Database/#{$1}" if metric =~ /Database\/[\w|\:]+\/(\w+)/
 
           metrics
         end

data/lib/one_apm/agent/event/event_loop.rb

@@ -1,58 +1,11 @@
 # encoding: utf-8
 
 require 'thread'
+require 'one_apm/agent/event/timer'
 
 module OneApm
   module Agent
     class EventLoop
-      class Timer
-
-        attr_reader :next_fire_time, :event, :interval, :last_fired_at
-
-        def initialize(interval, event, repeat=false)
-          @interval      = interval
-          @event         = event
-          @repeat        = repeat
-          @started_at    = Time.now
-          @last_fired_at = nil
-          reschedule
-        end
-
-        def reschedule
-          @next_fire_time = calculate_next_fire_time
-        end
-
-        def advance(amount)
-          @next_fire_time -= amount
-        end
-
-        def last_interval_start
-          @last_fired_at || @started_at
-        end
-
-        def calculate_next_fire_time
-          now = Time.now
-          return now if @interval == 0
-          fire_time = @last_fired_at || now
-          while fire_time <= now
-            fire_time += @interval
-          end
-          fire_time
-        end
-
-        def set_fired_time
-          @last_fired_at = Time.now
-        end
-
-        def due?(now=Time.now)
-          now >= @next_fire_time
-        end
-
-        def finished?
-          !@repeat && @last_fired_at
-        end
-
-      end
 
       def initialize
         @self_pipe_rd, @self_pipe_wr = IO.pipe

data/lib/one_apm/agent/event/timer.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+
+module OneApm
+  module Agent
+    class EventLoop
+      class Timer
+
+        attr_reader :next_fire_time, :event, :interval, :last_fired_at
+
+        def initialize(interval, event, repeat=false)
+          @interval      = interval
+          @event         = event
+          @repeat        = repeat
+          @started_at    = Time.now
+          @last_fired_at = nil
+          reschedule
+        end
+
+        def reschedule
+          @next_fire_time = calculate_next_fire_time
+        end
+
+        def advance(amount)
+          @next_fire_time -= amount
+        end
+
+        def last_interval_start
+          @last_fired_at || @started_at
+        end
+
+        def calculate_next_fire_time
+          now = Time.now
+          return now if @interval == 0
+          fire_time = @last_fired_at || now
+          while fire_time <= now
+            fire_time += @interval
+          end
+          fire_time
+        end
+
+        def set_fired_time
+          @last_fired_at = Time.now
+        end
+
+        def due?(now=Time.now)
+          now >= @next_fire_time
+        end
+
+        def finished?
+          !@repeat && @last_fired_at
+        end
+
+      end
+    end
+  end
+end

data/lib/one_apm/agent/javascript_instrumentor.rb

@@ -164,13 +164,8 @@ module OneApm
         data[USER_ATTRIBUTES_KEY] = obfuscator.obfuscate(json)
       end
 
-      # Still support deprecated capture_attributes.page_view_events for
-      # clients that use it. Could potentially be removed if we don't have
-      # anymore users with it set according to zeitgeist.
       def include_custom_parameters?(txn)
-        has_custom_parameters?(txn) &&
-          (OneApm::Agent.config[:'browser_monitoring.capture_attributes'] ||
-           OneApm::Agent.config[:'capture_attributes.page_view_events'])
+        has_custom_parameters?(txn) && OneApm::Agent.config[:'browser_monitoring.capture_attributes']
       end
 
       def has_custom_parameters?(txn)

data/lib/one_apm/agent/pipe/pipe_service.rb

@@ -13,7 +13,7 @@ module OneApm
         if @pipe && @pipe.parent_pid != $$
           @pipe.after_fork_in_child
         else
-          OneApm::Agent.logger.error("No communication channel to parent process, please see https://oneapm.com/docs/ruby/resque-instrumentation for more information.")
+          OneApm::Agent.logger.error("No communication channel to parent process.")
         end
       end
 

data/lib/one_apm/agent.rb

@@ -222,14 +222,6 @@ module OneApm
       end
     end
 
-    def with_database_metric_name(model, method, &block) #THREAD_LOCAL_ACCESS
-      if txn = Transaction.tl_current
-        txn.with_database_metric_name(model, method, &block)
-      else
-        yield
-      end
-    end
-
     def subscribe(event_type, &handler)
       instance.events.subscribe( event_type, &handler )
     end

data/lib/one_apm/configuration/default_source.rb

@@ -235,7 +235,7 @@ module OneApm
         :default => value_of(:enabled),
         :public => true,
         :type => Boolean,
-        :description => 'Enable or disable the transmission of data to the OneApm collector).'
+        :description => 'Enable or disable the transmission of data to the OneApm collector.'
       },
       :log_level => {
         :default => 'info',
@@ -296,7 +296,7 @@ module OneApm
         :default => DefaultSource.config_path,
         :public => true,
         :type => String,
-        :description => 'Path to <b>oneapm.yml</b>. When omitted the agent will check (in order) <b>config/oneapm.yml</b>, <b>oneapm.yml</b>, <b>$HOME/.oneapm/oneapm.yml</b> and <b>$HOME/oneapm.yml</b>.'
+        :description => 'Path to <b>oneapm.yml</b>. When omitted the agent will check (in order) <b>config/oneapm.yml</b>.'
       },
       :config_search_paths => {
         :default => DefaultSource.config_search_paths,
@@ -761,13 +761,6 @@ module OneApm
         :type => Boolean,
         :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
       },
-      :'capture_attributes.page_view_events' => {
-        :default => false,
-        :public => false,
-        :type => Boolean,
-        :deprecated => true,
-        :description => 'Correct setting is browser_monitoring.capture_attributes.'
-      },
       :js_agent_loader => {
         :default => '',
         :public => false,
@@ -1020,6 +1013,12 @@ module OneApm
         :public       => true,
         :type         => Boolean,
         :description  => 'Disables installation of Grape instrumentation.'
+      },
+      :event_machine_standalone => {
+        :default      => false,
+        :public       => true,
+        :type         => Boolean,
+        :description  => 'enable standalone mode of event_machine'
       }
     }.freeze
   end

data/lib/one_apm/configuration/environment_source.rb

@@ -4,10 +4,10 @@ module OneApm
   module Configuration
     class EnvironmentSource < OneApm::Support::DottedHash
 
-      SUPPORTED_PREFIXES = /^one_apm_|^oneapm_/i
+      SUPPORTED_PREFIXES = /^oneapm_/i
       SPECIAL_CASE_KEYS  = [
-        'ONE_APM_ENV', # read by OneApm::Probe::Frameworks::Ruby
-        'ONE_APM_LOG'  # read by set_log_file
+        'ONEAPM_ENV', # read by OneApm::Probe::Frameworks::Ruby
+        'ONEAPM_LOG'  # read by set_log_file
       ]
 
       attr_accessor :alias_map, :type_map
@@ -46,24 +46,24 @@ module OneApm
       end
 
       def set_log_file
-        if ENV['ONE_APM_LOG']
-          if ENV['ONE_APM_LOG'].upcase == 'STDOUT'
+        if ENV['ONEAPM_LOG']
+          if ENV['ONEAPM_LOG'].upcase == 'STDOUT'
             self[:log_file_path] = self[:log_file_name] = 'STDOUT'
           else
-            self[:log_file_path] = File.dirname(ENV['ONE_APM_LOG'])
-            self[:log_file_name] = File.basename(ENV['ONE_APM_LOG'])
+            self[:log_file_path] = File.dirname(ENV['ONEAPM_LOG'])
+            self[:log_file_name] = File.basename(ENV['ONEAPM_LOG'])
           end
         end
       end
 
       def set_config_file
-        self[:config_path] = ENV['OACONFIG'] if ENV['OACONFIG']
+        self[:config_path] = ENV['ONEAPM_CONFIG'] if ENV['ONEAPM_CONFIG']
       end
 
       def set_values_from_one_apm_environment_variables
-        nr_env_var_keys = collect_one_apm_environment_variable_keys
+        env_var_keys = collect_one_apm_environment_variable_keys
 
-        nr_env_var_keys.each do |key|
+        env_var_keys.each do |key|
           next if SPECIAL_CASE_KEYS.include?(key.upcase)
           set_value_from_environment_variable(key)
         end
@@ -93,8 +93,7 @@ module OneApm
             self[config_key] = true
           end
         else
-          ::OneApm::Agent.logger.info("#{environment_key} does not have a corresponding configuration setting (#{config_key} does not exist).")
-          ::OneApm::Agent.logger.info("Run `rake oneapm:config:docs` or visit https://oneapm.com/docs/ruby/ruby-agent-configuration to see a list of available configuration settings.")
+          OneApm::Agent.logger.info("#{environment_key} does not have a corresponding configuration setting (#{config_key} does not exist).")
           self[config_key] = value
         end
       end

data/lib/one_apm/frameworks/ruby.rb

@@ -5,7 +5,7 @@ module OneApm
     module Frameworks
       class Ruby < OneApm::Probe
         def env
-          @env ||= ENV['ONE_APM_ENV'] || ENV['RUBY_ENV'] ||
+          @env ||= ENV['ONEAPM_ENV'] || ENV['RUBY_ENV'] ||
                    ENV['RAILS_ENV']   || ENV['RACK_ENV'] || 'development'
         end
 

data/lib/one_apm/inst/background_job/delayed_job.rb

@@ -12,7 +12,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    ::OneApm::Agent.logger.info 'Installing DelayedJob instrumentation [part 1/2]'
+    ::OneApm::Agent.logger.info 'Installing DelayedJob instrumentation'
   end
 
   executes do
@@ -26,7 +26,6 @@ LibraryDetection.defer do
         OneApm::DelayedJobInjection.worker_name = worker_name
 
         if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job)
-          ::OneApm::Agent.logger.info 'Installing DelayedJob instrumentation [part 2/2]'
           install_oneapm_job_tracer
           OneApm::Probe.instance.init_plugin :dispatcher => :delayed_job
         else

data/lib/one_apm/inst/background_job/event_machine_standalone.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+LibraryDetection.defer do
+  named :event_machine_standalone
+
+  depends_on do
+    OneApm::Agent.config[:event_machine_standalone] && defined?(::EventMachine)
+  end
+
+  executes do
+    OneApm::Agent.logger.info 'Installing EventMachine Standalone Mode instrumentation'
+
+    module EventMachine
+
+      PeriodicTimer.class_eval do
+        include OneApm::Agent::Instrumentation::TransactionBase
+
+        add_transaction_tracer "fire", :category => 'OtherTransaction/Background'
+      end
+
+    end
+
+  end
+end

data/lib/one_apm/inst/orm/sequel.rb

@@ -25,9 +25,7 @@ LibraryDetection.defer do
       if Sequel::Database.respond_to?(:extension)
         Sequel::Database.extension :oneapm_instrumentation
       else
-        OneApm::Agent.logger.info "Detected Sequel version %s." % [ Sequel::VERSION ]
-        OneApm::Agent.logger.info "Please see additional documentation: " +
-          "https://oneapm.com/docs/ruby/sequel-instrumentation"
+        OneApm::Agent.logger.warn("Detected Sequel version #{Sequel::VERSION}.")
       end
 
       Sequel.synchronize{Sequel::DATABASES.dup}.each do |db|

data/lib/one_apm/inst/support/queue_time.rb

@@ -3,9 +3,6 @@
 module OneApm
   module Agent
     module Instrumentation
-      # https://oneapm.com/docs/features/tracking-front-end-time
-      # Record queue time metrics based on any of three headers
-      # which can be set on the request.
       module QueueTime
         unless defined?(REQUEST_START_HEADER)
           REQUEST_START_HEADER    = 'HTTP_X_REQUEST_START'.freeze

data/lib/one_apm/support/local_environment.rb

@@ -17,7 +17,7 @@ module OneApm
   #    into the same log, it's useful to be able to identify what kind of
   #    process a given PID mapped to.
   #
-  # Overriding the dispatcher is possible via the ONE_APM_DISPATCHER
+  # Overriding the dispatcher is possible via the ONEAPM_DISPATCHER
   # environment variable, but this should not generally be necessary unless
   # you're on a dispatcher that falls into category 1 above, and our detection
   # logic isn't working correctly.
@@ -72,6 +72,7 @@ module OneApm
         unicorn
         goliath
         webrick
+        event_machine
       ]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_'+(dispatchers.shift)
@@ -180,6 +181,12 @@ module OneApm
       end
     end
 
+    def check_for_event_machine
+      if defined?(::EventMachine)
+        @discovered_dispatcher = :event_machine
+      end
+    end
+
     public
     # outputs a human-readable description
     def to_s

data/lib/one_apm/support/method_tracer/helpers.rb

@@ -8,8 +8,17 @@ module OneApm
 
         extend self
 
-        # helper for logging errors to the oneapm_agent.log
-        # properly. Logs the error at error level
+        def record_metrics(state, first_name, other_names, duration, exclusive, options)
+          record_scoped_metric = options.has_key?(:scoped_metric) ? options[:scoped_metric] : true
+          stats_engine = OneApm::Agent.instance.stats_engine
+          if record_scoped_metric
+            stats_engine.record_scoped_and_unscoped_metrics(state, first_name, other_names, duration, exclusive)
+          else
+            metrics = [first_name].concat(other_names)
+            stats_engine.record_unscoped_metrics(state, metrics, duration, exclusive)
+          end
+        end
+
         def log_errors(code_area)
           yield
         rescue => e
@@ -23,45 +32,35 @@ module OneApm
           end
         end
 
-        def record_metrics(state, first_name, other_names, duration, exclusive, options)
-          record_scoped_metric = options.has_key?(:scoped_metric) ? options[:scoped_metric] : true
-          stat_engine = OneApm::Agent.instance.stats_engine
-          if record_scoped_metric
-            stat_engine.record_scoped_and_unscoped_metrics(state, first_name, other_names, duration, exclusive)
-          else
-            metrics = [first_name].concat(other_names)
-            stat_engine.record_unscoped_metrics(state, metrics, duration, exclusive)
-          end
-        end
-
-        def trace_execution_scoped_footer(state, t0, first_name, metric_names, expected_frame, options, t1=Time.now.to_f)
+        def trace_execution_scoped_footer(state, t0, first_name, metric_names, expected_frame, options, t1 = Time.now.to_f)
           log_errors(:trace_method_execution_footer) do
-            if expected_frame
-              stack = state.traced_method_stack
-              create_metrics = options.has_key?(:metric) ? options[:metric] : true
-              frame = stack.pop_frame(state, expected_frame, first_name, t1, create_metrics)
-              if create_metrics
-                duration = t1 - t0
-                exclusive = duration - frame.children_time
-
-                if duration < MAX_ALLOWED_METRIC_DURATION
-                  if duration < 0
-                    ::OneApm::Agent.logger.log_once(:warn, "metric_duration_negative:#{first_name}",
-                      "Metric #{first_name} has negative duration: #{duration} s")
-                  end
-
-                  if exclusive < 0
-                    ::OneApm::Agent.logger.log_once(:warn, "metric_exclusive_negative:#{first_name}",
-                      "Metric #{first_name} has negative exclusive time: duration = #{duration} s, child_time = #{frame.children_time}")
-                  end
-
-                  record_metrics(state, first_name, metric_names, duration, exclusive, options)
-                else
-                  ::OneApm::Agent.logger.log_once(:warn, "too_huge_metric:#{first_name}",
-                    "Ignoring metric #{first_name} with unacceptably large duration: #{duration} s")
-                end
-              end
+            return unless expected_frame
+
+            stack = state.traced_method_stack
+            create_metrics = options.has_key?(:metric) ? options[:metric] : true
+            frame = stack.pop_frame(state, expected_frame, first_name, t1, create_metrics)
+            return unless create_metrics
+
+            duration = t1 - t0
+            exclusive = duration - frame.children_time
+
+            if duration >= MAX_ALLOWED_METRIC_DURATION
+              ::OneApm::Agent.logger.log_once(:warn, "too_huge_metric:#{first_name}",
+                "Ignoring metric #{first_name} with unacceptably large duration: #{duration} s")
+              return
+            end
+
+            if duration < 0
+              ::OneApm::Agent.logger.log_once(:warn, "metric_duration_negative:#{first_name}",
+                "Metric #{first_name} has negative duration: #{duration} s")
             end
+
+            if exclusive < 0
+              ::OneApm::Agent.logger.log_once(:warn, "metric_exclusive_negative:#{first_name}",
+                "Metric #{first_name} has negative exclusive time: duration = #{duration} s, child_time = #{frame.children_time}")
+            end
+
+            record_metrics(state, first_name, metric_names, duration, exclusive, options)
           end
         end
 

data/lib/one_apm/support/method_tracer.rb

@@ -241,25 +241,33 @@ module OneApm
         #
         # If not provided, the metric name will be <tt>Custom/ClassName/method_name</tt>.
         #
-        # @param [Symbol] method_name the name of the method to trace
-        # @param [String] metric_name_code the metric name to record calls to
-        #   the traced method under. This may be either a static string, or Ruby
-        #   code to be evaluated at call-time in order to determine the metric
-        #   name dynamically.
-        # @param [Hash] options additional options controlling how the method is
-        #   traced.
-        # @option options [Boolean] :push_scope (true) If false, the traced method will
-        #   not appear in transaction traces or breakdown charts, and it will
-        #   only be visible in custom dashboards.
-        # @option options [Boolean] :metric (true) If false, the traced method will
-        #   only appear in transaction traces, but no metrics will be recorded
-        #   for it.
-        # @option options [String] :code_header ('') Ruby code to be inserted and run
-        #   before the tracer begins timing.
-        # @option options [String] :code_footer ('') Ruby code to be inserted and run
-        #   after the tracer stops timing.
+        # @param [Symbol] method_name
+        #   the name of the method to trace
+        #
+        # @param [String] metric_name_code
+        #   the metric name to record calls to the traced method under. This may
+        #   be either a static string, or Ruby code to be evaluated at call-time
+        #   in order to determine the metric name dynamically.
+        #
+        # @param [Hash] options
+        #   additional options controlling how the method is traced.
+        #
+        #   @option options [Boolean] :push_scope (true)
+        #     If false, the traced method will not appear in transaction traces or
+        #     breakdown charts, and it will only be visible in custom dashboards.
+        #
+        #   @option options [Boolean] :metric (true)
+        #     If false, the traced method will only appear in transaction traces,
+        #     but no metrics will be recorded for it.
+        #
+        #   @option options [String] :code_header ('')
+        #     Ruby code to be inserted and run before the tracer begins timing.
+        #
+        #   @option options [String] :code_footer ('')
+        #     Ruby code to be inserted and run after the tracer stops timing.
         #
         # @example
+        #
         #   add_method_tracer :foo
         #
         #   # With a custom metric name
@@ -274,7 +282,7 @@ module OneApm
         #
         # @api public
         #
-        def add_method_tracer(method_name, metric_name_code=nil, options = {})
+        def add_method_tracer(method_name, metric_name_code = nil, options = {})
           return unless oneapm_method_exists?(method_name)
           metric_name_code ||= default_metric_name_code(method_name)
           return if traced_method_exists?(method_name, metric_name_code)

data/lib/one_apm/support/rules_engine.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'forwardable'
 require 'one_apm/support/rules_engine/replacement_rule'
 require 'one_apm/support/rules_engine/segment_terms_rule'
 

data/lib/one_apm/support/supported_versions.rb

@@ -209,9 +209,7 @@ module OneApm
       {
         :type        => :http,
         :name        => "Net::HTTP",
-        :notes       => [
-          "Supported for all agent-supported versions of Ruby.",
-          "For more information on supported HTTP clients see http://docs.oneapm.com/docs/ruby/ruby-http-clients."]
+        :notes       => [ "Supported for all agent-supported versions of Ruby." ]
       },
 
       # Other

data/lib/one_apm/transaction/transaction_state.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'one_apm/support/method_tracer/traced_method_stack'
+require 'one_apm/support/traced_method_stack'
 
 module OneApm
 

data/lib/one_apm/transaction.rb

@@ -222,22 +222,6 @@ module OneApm
       @instrumentation_state ||= {}
     end
 
-    def with_database_metric_name(model, method)
-      previous = self.instrumentation_state[:datastore_override]
-      model_name = case model
-                   when Class
-                     model.name
-                   when String
-                     model
-                   else
-                     model.to_s
-                   end
-      self.instrumentation_state[:datastore_override] = [method, model_name]
-      yield
-    ensure
-      self.instrumentation_state[:datastore_override] = previous
-    end
-
     def noticed_error_ids
       @noticed_error_ids ||= []
     end
@@ -310,27 +294,5 @@ module OneApm
       end
     end
 
-    # Yield to a block that is run with a database metric name context.  This means
-    # the Database instrumentation will use this for the metric name if it does not
-    # otherwise know about a model.  This is re-entrant.
-    #
-    # * <tt>model</tt> is the DB model class
-    # * <tt>method</tt> is the name of the finder method or other method to identify the operation with.
-    #
-    def with_database_metric_name(model, method)
-      previous = @database_metric_name
-      model_name = case model
-                   when Class
-                     model.name
-                   when String
-                     model
-                   else
-                     model.to_s
-                   end
-      @database_metric_name = "ActiveRecord/#{model_name}/#{method}"
-      yield
-    ensure
-      @database_metric_name = previous
-    end
   end
 end

data/lib/one_apm/version.rb

@@ -5,7 +5,7 @@ module OneApm
 
     MAJOR = 1
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

data/lib/sequel/plugins/oneapm_instrumentation.rb

@@ -12,7 +12,7 @@ module Sequel
         def make_tracer_method( opname, options )
           body = Proc.new do |*args, &block|
             classname = self.is_a?( Class ) ? self.name : self.class.name
-            metric = "ActiveRecord/%s/%s" % [ classname, opname ]
+            metric = "Database/%s/%s" % [ classname, opname ]
             trace_execution_scoped( metric, options ) do
               super( *args, &block )
             end
@@ -41,13 +41,13 @@ module Sequel
         extend Sequel::Plugins::OneapmInstrumentation::MethodTracer
 
         add_method_tracer :delete
-        add_method_tracer :destroy
+        add_method_tracer :destroy, :delete
         add_method_tracer :update
-        add_method_tracer :update_all
-        add_method_tracer :update_except
-        add_method_tracer :update_fields
-        add_method_tracer :update_only
-        add_method_tracer :save
+        add_method_tracer :update_all, :update
+        add_method_tracer :update_except, :update
+        add_method_tracer :update_fields, :update
+        add_method_tracer :update_only, :update
+        add_method_tracer :save, :insert
 
       end
 

data/oneapm.yml

@@ -2,116 +2,24 @@
 # OneApm RubyAgent Configuration
 #
 
-# Here are the settings that are common to all environments
 common: &default_settings
-  # ============================== LICENSE KEY ===============================
 
-  #
-  # Get your license key from oneapm.com
-  #
   license_key: 'please-paste-your-license-key-here'
 
-  # Agent Enabled (Ruby/Rails Only)
-  # Valid values are true, false and auto.
-  #
-  # agent_enabled: auto
-
   # This app_name will be the application name in oneapm.com in your account.
   #
-  # Caution: If you change this name, a new application will appear in the OneApm
-  # user interface with the new name, and data will stop reporting to the
-  # app with the old name.
+  # If you change this name, a new application will appear in your account with
+  # the new name. and data will stop reporting to the app with the old name.
   #
   app_name: My Application
 
-  # When "true", the agent collects performance data about your
-  # application and reports this data to the OneApm service at
-  # oneapm.com. This global switch is normally overridden for each
-  # environment below. (formerly called 'enabled')
-  monitor_mode: true
-
-  # Specify its log level here.
-  log_level: info
-
-  # log_file_path: 'log'
-  # log_file_name: 'oneapm_agent.log'
-
-  # The oneapm agent communicates with the service via https by default.
-  # ssl: true
-
-  # ======================== Browser Monitoring =============================
-  browser_monitoring:
-    # By default the agent automatically injects the monitoring JavaScript
-    # into web pages. Set this attribute to false to turn off this behavior.
-    auto_instrument: true
-
-  # Proxy settings for connecting to the OneApm server.
-  #
-  # proxy_host: hostname
-  # proxy_port: 8080
-  # proxy_user:
-  # proxy_pass:
-
-  # Tells transaction tracer and error collector (when enabled)
-  # whether or not to capture HTTP params.  When true, frameworks can
-  # exclude HTTP parameters from being captured.
-  # Rails: the RoR filter_parameter_logging excludes parameters
-  capture_params: false
-
-  # Transaction tracer captures deep information about slow
-  # transactions and sends this to the OneApm service once a
-  # minute. Included in the transaction is the exact call sequence of
-  # the transactions including any SQL statements issued.
-  transaction_tracer:
-
-    # Transaction tracer is enabled by default.
-    enabled: true
-
-    # Threshold in seconds for when to collect a transaction
-    # trace. When the response time of a controller action exceeds
-    # this threshold, a transaction trace will be recorded and sent to
-    # OneApm. Valid values are any float value, or (default) "apdex_f",
-    # which will use the threshold for an dissatisfying Apdex
-    # controller action - four times the Apdex T value.
-    transaction_threshold: apdex_f
-
-    # When transaction tracer is on, SQL statements can optionally be
-    # recorded. The recorder has three modes, "off" which sends no
-    # SQL, "raw" which sends the SQL statement in its original form,
-    # and "obfuscated", which strips out numeric and string literals.
-    record_sql: obfuscated
-
-    # Threshold in seconds for when to collect stack trace for a SQL
-    # call. In other words, when SQL statements exceed this threshold,
-    # then capture and send to OneApm the current stack trace. This is
-    # helpful for pinpointing where long SQL calls originate from.
-    stack_trace_threshold: 0.500
-
-    # Determines whether the agent will capture query plans for slow
-    # SQL queries.  Only supported in mysql and postgres.  Should be
-    # set to false when using other adapters.
-    # explain_enabled: true
-
-    # Threshold for query execution time below which query plans will
-    # not be captured.  Relevant only when `explain_enabled` is true.
-    # explain_threshold: 0.5
-
-  # Error collector captures information about uncaught exceptions and
-  # sends them to OneApm for viewing
-  error_collector:
-
-    # Error collector is enabled by default.
-    enabled: true
-
-    # Ignore the following errors, add your own.
-    ignore_errors: "ActionController::RoutingError,Sinatra::NotFound"
-
-# ===================== Application Environments ========================
-# Environment-specific settings are in this section.
-# For Rails applications, RAILS_ENV is used to determine the environment.
+#
+# Environment-specific settings
+#
 
-# NOTE if your application has other named environments, you should
-# provide oneapm configuration settings for these environments here.
+production:
+  <<: *default_settings
+  monitor_mode: true
 
 development:
   <<: *default_settings
@@ -123,11 +31,6 @@ test:
   <<: *default_settings
   monitor_mode: false
 
-# Turn on the agent in production for 24x7 monitoring.
-production:
-  <<: *default_settings
-  monitor_mode: true
-
 # Staging environment which behaves identically to production.
 staging:
   <<: *default_settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -247,6 +247,7 @@ files:
 - lib/one_apm/agent/datastores/mongo/statement_formatter.rb
 - lib/one_apm/agent/event/event_listener.rb
 - lib/one_apm/agent/event/event_loop.rb
+- lib/one_apm/agent/event/timer.rb
 - lib/one_apm/agent/event/worker_loop.rb
 - lib/one_apm/agent/harvester.rb
 - lib/one_apm/agent/inbound_request_monitor.rb
@@ -308,6 +309,7 @@ files:
 - lib/one_apm/inst/background_job/active_job.rb
 - lib/one_apm/inst/background_job/delayed_job.rb
 - lib/one_apm/inst/background_job/delayed_job_injection.rb
+- lib/one_apm/inst/background_job/event_machine_standalone.rb
 - lib/one_apm/inst/background_job/resque.rb
 - lib/one_apm/inst/background_job/sidekiq.rb
 - lib/one_apm/inst/dispatcher/passenger.rb
@@ -330,7 +332,6 @@ files:
 - lib/one_apm/inst/nosql/redis.rb
 - lib/one_apm/inst/orm/active_record.rb
 - lib/one_apm/inst/orm/active_record_4.rb
-- lib/one_apm/inst/orm/data_mapper.rb
 - lib/one_apm/inst/orm/sequel.rb
 - lib/one_apm/inst/rack.rb
 - lib/one_apm/inst/rack/rack.rb
@@ -393,7 +394,6 @@ files:
 - lib/one_apm/support/marshaller.rb
 - lib/one_apm/support/method_tracer.rb
 - lib/one_apm/support/method_tracer/helpers.rb
-- lib/one_apm/support/method_tracer/traced_method_stack.rb
 - lib/one_apm/support/obfuscator.rb
 - lib/one_apm/support/okjson.rb
 - lib/one_apm/support/parameter_filtering.rb
@@ -404,6 +404,7 @@ files:
 - lib/one_apm/support/supported_versions.rb
 - lib/one_apm/support/system_info.rb
 - lib/one_apm/support/timer_lib.rb
+- lib/one_apm/support/traced_method_stack.rb
 - lib/one_apm/support/version_number.rb
 - lib/one_apm/support/vm.rb
 - lib/one_apm/support/vm/jruby_vm.rb

data/lib/one_apm/inst/orm/data_mapper.rb

@@ -1,180 +0,0 @@
-# encoding: utf-8
-
-LibraryDetection.defer do
-  @name = :data_mapper
-
-  depends_on do
-    defined?(::DataMapper)
-  end
-
-  depends_on do
-    defined?(DataMapper::Model)
-  end
-
-  depends_on do
-    defined?(DataMapper::Resource)
-  end
-
-  depends_on do
-    defined?(DataMapper::Collection)
-  end
-
-  executes do
-    ::OneApm::Agent.logger.info 'Installing DataMapper instrumentation'
-  end
-
-  executes do
-    DataMapper::Model.class_eval do
-      add_method_tracer :get,      'ActiveRecord/#{self.name}/get'
-      add_method_tracer :first,    'ActiveRecord/#{self.name}/first'
-      add_method_tracer :last,     'ActiveRecord/#{self.name}/last'
-      add_method_tracer :all,      'ActiveRecord/#{self.name}/all'
-
-      add_method_tracer :create,   'ActiveRecord/#{self.name}/create'
-      add_method_tracer :create!,  'ActiveRecord/#{self.name}/create'
-      add_method_tracer :update,   'ActiveRecord/#{self.name}/update'
-      add_method_tracer :update!,  'ActiveRecord/#{self.name}/update'
-      add_method_tracer :destroy,  'ActiveRecord/#{self.name}/destroy'
-      add_method_tracer :destroy!, 'ActiveRecord/#{self.name}/destroy'
-
-      # For dm-aggregates and partial dm-ar-finders support:
-      for method in [ :aggregate, :find, :find_by_sql ] do
-        next unless method_defined? method
-        add_method_tracer(method, 'ActiveRecord/#{self.name}/' + method.to_s)
-      end
-
-    end
-  end
-
-  executes do
-    DataMapper::Resource.class_eval do
-      add_method_tracer :update,   'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
-      add_method_tracer :update!,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
-      add_method_tracer :save,     'ActiveRecord/#{self.class.name[/[^:]*$/]}/save'
-      add_method_tracer :save!,    'ActiveRecord/#{self.class.name[/[^:]*$/]}/save'
-      add_method_tracer :destroy,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
-      add_method_tracer :destroy!, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
-
-    end
-  end
-
-  executes do
-    DataMapper::Collection.class_eval do
-      # DM's Collection instance methods
-      add_method_tracer :get,       'ActiveRecord/#{self.name}/get'
-      add_method_tracer :first,     'ActiveRecord/#{self.name}/first'
-      add_method_tracer :last,      'ActiveRecord/#{self.name}/last'
-      add_method_tracer :all,       'ActiveRecord/#{self.name}/all'
-
-      add_method_tracer :lazy_load, 'ActiveRecord/#{self.name}/lazy_load'
-
-      add_method_tracer :create,    'ActiveRecord/#{self.name}/create'
-      add_method_tracer :create!,   'ActiveRecord/#{self.name}/create'
-      add_method_tracer :update,    'ActiveRecord/#{self.name}/update'
-      add_method_tracer :update!,   'ActiveRecord/#{self.name}/update'
-      add_method_tracer :destroy,   'ActiveRecord/#{self.name}/destroy'
-      add_method_tracer :destroy!,  'ActiveRecord/#{self.name}/destroy'
-
-      # For dm-aggregates support:
-      for method in [ :aggregate ] do
-        next unless method_defined? method
-        add_method_tracer(method, 'ActiveRecord/#{self.name}/' + method.to_s)
-      end
-
-    end
-  end
-end
-
-LibraryDetection.defer do
-
-  depends_on do
-    defined?(DataMapper) && defined?(DataMapper::Adapters) && defined?(DataMapper::Adapters::DataObjectsAdapter)
-  end
-
-  executes do
-
-    DataMapper::Adapters::DataObjectsAdapter.class_eval do
-
-      add_method_tracer :select,  'ActiveRecord/#{self.class.name[/[^:]*$/]}/select'
-      add_method_tracer :execute, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/execute'
-
-    end
-  end
-end
-
-LibraryDetection.defer do
-
-  depends_on do
-    defined?(DataMapper) && defined?(DataMapper::Validations) && defined?(DataMapper::Validations::ClassMethods)
-  end
-
-  executes do
-    DataMapper::Validations::ClassMethods.class_eval do
-      next unless method_defined? :create
-      add_method_tracer :create,   'ActiveRecord/#{self.name}/create'
-    end
-  end
-end
-
-LibraryDetection.defer do
-
-  depends_on do
-    defined?(DataMapper) && defined?(DataMapper::Transaction)
-  end
-
-  executes do
-    DataMapper::Transaction.module_eval do
-      add_method_tracer :commit, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/commit'
-    end
-  end
-
-end
-
-module OneApm
-  module Agent
-    module Instrumentation
-      module DataMapperInstrumentation
-
-        def log(msg) #THREAD_LOCAL_ACCESS
-          state = OneApm::TransactionState.tl_get
-          return unless state.is_execution_traced?
-          return unless operation = case OneApm::Helper.correctly_encoded(msg.query)
-                                    when /^\s*select/i          then 'find'
-                                    when /^\s*(update|insert)/i then 'save'
-                                    when /^\s*delete/i          then 'destroy'
-                                    else nil
-                                    end
-
-          # FYI: self.to_s will yield connection URI string.
-          duration = msg.duration / 1000000.0
-
-          # Attach SQL to current segment/scope.
-          OneApm::Agent.instance.transaction_sampler.notice_sql(msg.query, nil, duration, state)
-
-          # Record query duration associated with each of the desired metrics.
-          metric = "ActiveRecord/#{operation}"
-          rollup_metrics = ActiveRecordHelper.rollup_metrics_for(metric)
-          metrics = [metric] + rollup_metrics
-          OneApm::Agent.instance.stats_engine.tl_record_unscoped_metrics(metrics, duration)
-        ensure
-          super
-        end
-
-      end
-    end
-  end
-end
-
-LibraryDetection.defer do
-
-  depends_on do
-    defined?(DataObjects) && defined?(DataObjects::Connection)
-  end
-
-  executes do
-    DataObjects::Connection.class_eval do
-      include ::OneApm::Agent::Instrumentation::DataMapperInstrumentation
-    end
-  end
-
-end