oneapm_rpm 1.1.3 → 1.2.0

data/lib/one_apm/agent/threading/thread_profile.rb

@@ -1,10 +1,7 @@
 # encoding: utf-8
 
 require 'set'
-require 'one_apm/support/event/worker_loop'
-require 'one_apm/agent/threading/backtrace_node'
-
-# Data structure for representing a thread profile
+require 'one_apm/support/backtrace/backtrace_node'
 
 module OneApm
   module Agent

data/lib/one_apm/collector/commands/thread_profiler_session.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'one_apm/agent/threading/agent_thread'
-require 'one_apm/agent/threading/backtrace_service'
+require 'one_apm/support/backtrace/backtrace_service'
 require 'one_apm/agent/threading/thread_profile'
 
 module OneApm

data/lib/one_apm/collector/containers/agent_command_router.rb

@@ -3,7 +3,7 @@
 require 'one_apm/collector/commands/agent_command'
 require 'one_apm/collector/commands/xray_session_collection'
 require 'one_apm/collector/commands/thread_profiler_session'
-require 'one_apm/agent/threading/backtrace_service'
+require 'one_apm/support/backtrace/backtrace_service'
 
 module OneApm
   module Collector

data/lib/one_apm/collector/containers/transaction_sampler.rb

@@ -5,6 +5,7 @@ require 'one_apm/transaction/sample_buffer/force_persist_sample_buffer'
 require 'one_apm/transaction/sample_buffer/slowest_sample_buffer'
 require 'one_apm/transaction/sample_buffer/synthetics_sample_buffer'
 require 'one_apm/transaction/sample_buffer/xray_sample_buffer'
+require 'one_apm/transaction/sample_buffer/developer_mode_sample_buffer'
 
 module OneApm
   module Collector
@@ -27,13 +28,15 @@ module OneApm
         def on_finishing_transaction(*args); end
       end
 
-      attr_reader :last_sample, :xray_sample_buffer
+      attr_reader :last_sample, :xray_sample_buffer, :dev_mode_sample_buffer
 
       def initialize
         @xray_sample_buffer = OneApm::Transaction::XraySampleBuffer.new
+        @dev_mode_sample_buffer = OneApm::Transaction::DeveloperModeSampleBuffer.new
 
         @sample_buffers = []
         @sample_buffers << @xray_sample_buffer
+        @sample_buffers << @dev_mode_sample_buffer
         @sample_buffers << OneApm::Transaction::SlowestSampleBuffer.new
         @sample_buffers << OneApm::Transaction::SyntheticsSampleBuffer.new
         @sample_buffers << OneApm::Transaction::ForcePersistSampleBuffer.new
@@ -81,6 +84,9 @@ module OneApm
         return unless builder
 
         segment = builder.trace_entry(time.to_f)
+        if @dev_mode_sample_buffer
+          @dev_mode_sample_buffer.visit_segment(segment)
+        end
         segment
       end
 

data/lib/one_apm/collector/containers/utilization_data.rb

@@ -10,7 +10,6 @@ module OneApm
         [hostname, container_id, cpu_count, instance_type]
       end
 
-      # No persistent data, so no need for merging or resetting
       def merge!(*_); end
       def reset!(*_); end
 
@@ -19,12 +18,12 @@ module OneApm
       end
 
       def container_id
-        ::OneApm::Agent::SystemInfo.docker_container_id
+        ::OneApm::Support::SystemInfo.docker_container_id
       end
 
       def cpu_count
-        ::OneApm::Agent::SystemInfo.clear_processor_info
-        ::OneApm::Agent::SystemInfo.num_logical_processors
+        ::OneApm::Support::SystemInfo.clear_processor_info
+        ::OneApm::Support::SystemInfo.num_logical_processors
       end
 
       def instance_type

data/lib/one_apm/{agent → collector}/sampler.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module OneApm
-  module Agent
+  module Collector
     class Sampler
 
       attr_reader :id

data/lib/one_apm/{agent → collector}/samplers/cpu_sampler.rb

@@ -1,17 +1,17 @@
 # encoding: utf-8
 
-require 'one_apm/agent/sampler'
+require 'one_apm/collector/sampler'
 
 module OneApm
-  module Agent
+  module Collector
     module Samplers
-      class CpuSampler < OneApm::Agent::Sampler
+      class CpuSampler < OneApm::Collector::Sampler
         attr_reader :last_time
 
         named :cpu
 
         def initialize
-          @processor_count = OneApm::Agent::SystemInfo.num_logical_processors
+          @processor_count = OneApm::Support::SystemInfo.num_logical_processors
           poll
         end
 

data/lib/one_apm/{agent → collector}/samplers/delayed_job_sampler.rb

@@ -1,23 +1,14 @@
 # encoding: utf-8
 
-require 'one_apm/agent/sampler'
+require 'one_apm/collector/sampler'
 require 'one_apm/inst/background_job/delayed_job_injection'
 
 module OneApm
-  module Agent
+  module Collector
     module Samplers
-      # This sampler records the status of your delayed job table once a minute.
-      # It assumes jobs are cleared after being run, and failed jobs are not (otherwise
-      # the failed job metric is useless).
-      #
-      # In earlier versions it will break out the queue length by priority.  In later
-      # versions of DJ where distinct queues are supported, it breaks it out by queue name.
-      #
-      class DelayedJobSampler < OneApm::Agent::Sampler
+      class DelayedJobSampler < OneApm::Collector::Sampler
         named :delayed_job
 
-        # DelayedJob supports multiple backends, only some of which we can
-        # handle. Check whether we think we've got what we need here.
         def self.supported_backend?
           ::Delayed::Worker.backend.to_s == "Delayed::Backend::ActiveRecord::Job"
         end
@@ -91,8 +82,6 @@ module OneApm
 
         def queue_counts(column_name)
           now = ::Delayed::Job.db_time_now
-          # There is not an ActiveRecord syntax for what we're trying to do
-          # here that's valid on 2.x through 4.1, so split it up.
           result = if ::ActiveRecord::VERSION::MAJOR.to_i < 4
             ::Delayed::Job.count(:group => column_name,
                                  :conditions => [QUEUE_QUERY_CONDITION, now])

data/lib/one_apm/{agent → collector}/samplers/memory_sampler.rb

@@ -1,18 +1,17 @@
 # encoding: utf-8
 
-require 'one_apm/agent/sampler'
+require 'one_apm/collector/sampler'
 
 module OneApm
-  module Agent
+  module Collector
     module Samplers
 
-      class MemorySampler < OneApm::Agent::Sampler
+      class MemorySampler < OneApm::Collector::Sampler
         named :memory
 
         attr_accessor :sampler
 
         def initialize
-          # macos, linux, solaris
           if defined? JRuby
             @sampler = JavaHeapSampler.new
           elsif platform =~ /linux/
@@ -49,7 +48,7 @@ module OneApm
           end
         end
         def platform
-          OneApm::Agent::Samplers::MemorySampler.platform
+          OneApm::Collector::Samplers::MemorySampler.platform
         end
 
         def poll
@@ -60,6 +59,7 @@ module OneApm
         end
 
         class Base
+
           def can_run?
             return false if @broken
             m = get_memory rescue nil
@@ -81,6 +81,7 @@ module OneApm
               return nil
             end
           end
+
         end
 
         class JavaHeapSampler < Base
@@ -89,39 +90,35 @@ module OneApm
             raise "Can't sample Java heap unless running in JRuby" unless defined? JRuby
             java.lang.Runtime.getRuntime.totalMemory / (1024 * 1024).to_f rescue nil
           end
+
           def to_s
             "JRuby Java heap sampler"
           end
+
         end
 
         class ShellPS < Base
+
           def initialize(command)
             super()
             @command = command
           end
-          # Returns the amount of resident memory this process is using in MB
-          #
+
           def get_memory
             process = $$
             memory = `#{@command} #{process}`.split("\n")[1].to_f / 1024.0 rescue nil
-            # if for some reason the ps command doesn't work on the resident os,
-            # then don't execute it any more.
             raise "Faulty command: `#{@command} #{process}`" if memory.nil? || memory <= 0
             memory
           end
+
           def to_s
             "shell command sampler: #{@command}"
           end
+
         end
 
-        # ProcStatus
-        #
-        # A class that samples memory by reading the file /proc/$$/status, which is specific to linux
-        #
         class ProcStatus < Base
 
-          # Returns the amount of resident memory this process is using in MB
-          #
           def get_memory
             proc_status = File.open(proc_status_file, "r") {|f| f.read_nonblock(4096).strip }
             if proc_status =~ /RSS:\s*(\d+) kB/i
@@ -137,6 +134,7 @@ module OneApm
           def to_s
             "proc status file sampler: #{proc_status_file}"
           end
+
         end
       end
     end

data/lib/one_apm/{agent → collector}/samplers/object_sampler.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
-require 'one_apm/agent/sampler'
+require 'one_apm/collector/sampler'
 
 module OneApm
-  module Agent
+  module Collector
     module Samplers
-      class ObjectSampler < OneApm::Agent::Sampler
+      class ObjectSampler < OneApm::Collector::Sampler
         named :object
 
         def self.supported_on_this_platform?

data/lib/one_apm/{agent → collector}/samplers/vm_sampler.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'one_apm/agent/sampler'
+require 'one_apm/collector/sampler'
 require 'one_apm/support/vm'
 
 module OneApm
-  module Agent
+  module Collector
     module Samplers
       class VMSampler < Sampler
         GC_RUNS_METRIC                = 'RubyVM/GC/runs'.freeze

data/lib/one_apm/collector/{forked_process_service.rb → support/forked_process_service.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module OneApm
-  module Agent
+  module Collector
     class ForkedProcessService
       attr_reader :channel_id, :buffer, :pipe
       attr_accessor :request_timeout, :agent_id, :collector

data/lib/one_apm/{agent → collector/support}/sampler_collection.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module OneApm
-  module Agent
+  module Collector
     class SamplerCollection
       include Enumerable
 
@@ -52,7 +52,7 @@ module OneApm
         else
           OneApm::Manager.logger.debug("#{sampler_class.name} not supported on this platform.")
         end
-      rescue OneApm::Agent::Sampler::Unsupported => e
+      rescue OneApm::Collector::Sampler::Unsupported => e
         OneApm::Manager.logger.info("#{sampler_class.name} not available: #{e}")
       rescue => e
         OneApm::Manager.logger.error("Error registering sampler:", e)

data/lib/one_apm/configuration/default_source.rb

@@ -3,7 +3,6 @@
 module OneApm
   module Configuration
 
-    # Helper since default Procs are evaluated in the context of this module
     def self.value_of(key)
       Proc.new do
         OneApm::Manager.config[key]
@@ -84,7 +83,7 @@ module OneApm
         Proc.new {
           OneApm::Manager.config[:enabled] &&
           OneApm::Manager.config[:monitor_mode] &&
-          OneApm::Configuration::Autostart.agent_should_start?
+          OneApm::Manager.agent_should_start?
         }
       end
 
@@ -401,6 +400,12 @@ module OneApm
         :type => Boolean,
         :description => 'Enable or disable transmission of application environment information to the OneApm data collection service.'
       },
+      :developer_mode => {
+        :default => false,
+        :public  => true,
+        :type    => Boolean,
+        :description => "developer mode for profiling in development, should be disable in production"
+      },
       :'resque.use_harvest_lock' => {
         :default => false,
         :public => true,

data/lib/one_apm/frameworks/rails.rb

@@ -44,6 +44,7 @@ module OneApm
           if !Manager.config[:agent_enabled]
             OneApm::Manager.logger.info("OneApm Agent not running.")
           else
+            install_developer_mode(rails_config) if Manager.config[:developer_mode]
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
@@ -76,6 +77,23 @@ module OneApm
           end
         end
 
+        def install_developer_mode(rails_config)
+          return if env != "development"
+          return if @installed
+          @installed = true
+          if rails_config && rails_config.respond_to?(:middleware)
+            begin
+              require 'one_apm/rack/developer_mode'
+              rails_config.middleware.use OneApm::Rack::DeveloperMode
+              OneApm::Manager.logger.info("Developer Mode enabled.")
+            rescue => e
+              ::OneApm::Manager.logger.warn("Error installing OneAPM Developer Mode", e)
+            end
+          elsif rails_config
+            ::OneApm::Manager.logger.warn("Developer mode not available for Rails versions prior to 2.2")
+          end
+        end
+
         protected
 
         def install_shim

data/lib/one_apm/inst/nosql/memcache.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'one_apm/agent/datastores/metric_helper'
+require 'one_apm/agent/datastore/metric_helper'
 
 module OneApm
   module Agent
@@ -31,7 +31,7 @@ module OneApm
               alias_method method_name_without, method_name
 
               define_method method_name do |*args, &block|
-                metrics = Datastores::MetricHelper.metrics_for("Memcached", method_name)
+                metrics = Datastore::MetricHelper.metrics_for("Memcached", method_name)
 
                 OneApm::Support::MethodTracer.trace_execution_scoped(metrics) do
                   t0 = Time.now

data/lib/one_apm/inst/nosql/mongo.rb

@@ -8,8 +8,8 @@ LibraryDetection.defer do
   end
 
   depends_on do
-    require 'one_apm/agent/datastores/mongo'
-    OneApm::Agent::Datastores::Mongo.is_supported_version?
+    require 'one_apm/agent/datastore/mongo'
+    OneApm::Agent::Datastore::Mongo.is_supported_version?
   end
 
   executes do
@@ -18,8 +18,8 @@ LibraryDetection.defer do
   end
 
   def install_mongo_instrumentation
-    require 'one_apm/agent/datastores/mongo/metric_translator'
-    require 'one_apm/agent/datastores/mongo/statement_formatter'
+    require 'one_apm/agent/datastore/mongo/metric_translator'
+    require 'one_apm/agent/datastore/mongo/statement_formatter'
 
     hook_instrument_methods
     instrument_save
@@ -40,7 +40,7 @@ LibraryDetection.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 one_apm_notice_statement(t0, payload, name)
-        statement = OneApm::Agent::Datastores::Mongo::StatementFormatter.format(payload, name)
+        statement = OneApm::Agent::Datastore::Mongo::StatementFormatter.format(payload, name)
         if statement
           OneApm::Manager.agent.transaction_sampler.notice_nosql_statement(statement, (Time.now - t0).to_f)
         end
@@ -50,7 +50,7 @@ LibraryDetection.defer do
 
       def one_apm_generate_metrics(operation, payload = nil)
         payload ||= { :collection => self.name, :database => self.db.name }
-        OneApm::Agent::Datastores::Mongo::MetricTranslator.metrics_for(operation, payload)
+        OneApm::Agent::Datastore::Mongo::MetricTranslator.metrics_for(operation, payload)
       end
 
       def instrument_with_one_apm_trace(name, payload = {}, &block)

data/lib/one_apm/inst/nosql/mongo_moped.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'one_apm/support/method_tracer'
-require 'one_apm/agent/datastores'
+require 'one_apm/agent/datastore'
 
 LibraryDetection.defer do
   @name = :mongo_moped
@@ -44,10 +44,10 @@ module OneApm
 
           if operation
             callback = Proc.new do |result, metric, elapsed|
-              OneApm::Agent::Datastores.notice_statement(log_statement, elapsed)
+              OneApm::Agent::Datastore.notice_statement(log_statement, elapsed)
             end
 
-            OneApm::Agent::Datastores.wrap('MongoDB', operation, collection, callback) do
+            OneApm::Agent::Datastore.wrap('MongoDB', operation, collection, callback) do
               res = command.call
             end
           else