scout_apm 3.0.0.pre13 → 3.0.0.pre14

data/lib/scout_apm/instruments/elasticsearch.rb

@@ -1,25 +1,29 @@
 module ScoutApm
   module Instruments
     class Elasticsearch
-      attr_reader :logger
+      attr_reader :context
 
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(::Elasticsearch) &&
             defined?(::Elasticsearch::Transport) &&
             defined?(::Elasticsearch::Transport::Client)
 
-          ScoutApm::Agent.instance.logger.info "Instrumenting Elasticsearch"
+          @installed = true
+
+          logger.info "Instrumenting Elasticsearch"
 
           ::Elasticsearch::Transport::Client.class_eval do
             include ScoutApm::Tracer

data/lib/scout_apm/instruments/grape.rb

@@ -1,22 +1,26 @@
 module ScoutApm
   module Instruments
     class Grape
-      attr_reader :logger
+      attr_reader :context
 
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(::Grape) && defined?(::Grape::Endpoint)
-          ScoutApm::Agent.instance.logger.info "Instrumenting Grape::Endpoint"
+          @installed = true
+
+          logger.info "Instrumenting Grape::Endpoint"
 
           ::Grape::Endpoint.class_eval do
             include ScoutApm::Instruments::GrapeEndpointInstruments
@@ -33,7 +37,7 @@ module ScoutApm
         request = ::Grape::Request.new(env || args.first)
         req = ScoutApm::RequestManager.lookup
 
-        path = ScoutApm::Agent.instance.config.value("uri_reporting") == 'path' ? request.path : request.fullpath
+        path = ScoutApm::Agent.instance.context.config.value("uri_reporting") == 'path' ? request.path : request.fullpath
         req.annotate_request(:uri => path)
 
         # IP Spoofing Protection can throw an exception, just move on w/o remote ip
@@ -50,7 +54,7 @@ module ScoutApm
                   self.options[:path].first,
           ].compact.map{ |n| n.to_s }.join("/")
         rescue => e
-          ScoutApm::Agent.instance.logger.info("Error getting Grape Endpoint Name. Error: #{e.message}. Options: #{self.options.inspect}")
+          logger.info("Error getting Grape Endpoint Name. Error: #{e.message}. Options: #{self.options.inspect}")
           name = "Grape/Unknown"
         end
 

data/lib/scout_apm/instruments/http_client.rb

@@ -1,22 +1,26 @@
 module ScoutApm
   module Instruments
     class HttpClient
-      attr_reader :logger
+      attr_reader :context
 
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(::HTTPClient)
-          ScoutApm::Agent.instance.logger.info "Instrumenting HTTPClient"
+          @installed = true
+
+          logger.info "Instrumenting HTTPClient"
 
           ::HTTPClient.class_eval do
             include ScoutApm::Tracer

data/lib/scout_apm/instruments/influxdb.rb

@@ -1,22 +1,26 @@
 module ScoutApm
   module Instruments
     class InfluxDB
-      attr_reader :logger
+      attr_reader :context
 
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(::InfluxDB)
-          ScoutApm::Agent.instance.logger.debug "Instrumenting InfluxDB"
+          @installed = true
+
+          logger.debug "Instrumenting InfluxDB"
 
           ::InfluxDB::Client.class_eval do
             include ScoutApm::Tracer

data/lib/scout_apm/instruments/middleware_detailed.rb

@@ -9,22 +9,28 @@
 module ScoutApm
   module Instruments
     class MiddlewareDetailed
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      attr_reader :context
+
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(ActionDispatch) && defined?(ActionDispatch::MiddlewareStack) && defined?(ActionDispatch::MiddlewareStack::Middleware)
+          @installed = true
+
           ActionDispatch::MiddlewareStack::Middleware.class_eval do
             def build(app)
-              ScoutApm::Agent.instance.logger.info("Building Middleware #{klass.name}")
+              logger.info("Building Middleware #{klass.name}")
               new_mw = klass.new(app, *args, &block)
               MiddlewareWrapper.new(new_mw, klass.name)
             end

data/lib/scout_apm/instruments/middleware_summary.rb

@@ -6,20 +6,26 @@
 module ScoutApm
   module Instruments
     class MiddlewareSummary
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      attr_reader :context
+
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(ActionDispatch) && defined?(ActionDispatch::MiddlewareStack)
-          ScoutApm::Agent.instance.logger.info("Instrumenting Middleware")
+          @installed = true
+
+          logger.info("Instrumenting Middleware")
           ActionDispatch::MiddlewareStack.class_eval do
             def build_with_scout_instruments(app = nil, &block)
               mw_stack = build_without_scout_instruments(app) { block.call if block }

data/lib/scout_apm/instruments/mongoid.rb

@@ -1,13 +1,17 @@
 module ScoutApm
   module Instruments
     class Mongoid
-      attr_reader :logger
+      attr_reader :context
 
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
@@ -17,7 +21,8 @@ module ScoutApm
 
         # Mongoid versions that use Moped should instrument Moped.
         if defined?(::Mongoid) and !defined?(::Moped)
-          ScoutApm::Agent.instance.logger.info "Instrumenting Mongoid 2.x"
+          logger.info "Instrumenting Mongoid 2.x"
+          @installed = true
 
           ### OLD (2.x) mongoids
           if defined?(::Mongoid::Collection)
@@ -33,7 +38,7 @@ module ScoutApm
 
           ### 5.x Mongoid
           if (mongoid_v5? || mongoid_v6?) && defined?(::Mongoid::Contextual::Mongo)
-            ScoutApm::Agent.instance.logger.info "Instrumenting Mongoid 5.x/6.x"
+            logger.info "Instrumenting Mongoid 5.x/6.x"
             # All the public methods from Mongoid::Contextual::Mongo.
             # TODO: Geo and MapReduce support (?). They are in other Contextual::* classes
             methods = [

data/lib/scout_apm/instruments/moped.rb

@@ -1,22 +1,27 @@
 module ScoutApm
   module Instruments
     class Moped
-      attr_reader :logger
+      attr_reader :context
 
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(::Moped)
-          ScoutApm::Agent.instance.logger.info "Instrumenting Moped"
+          @installed = true
+
+          logger.info "Instrumenting Moped"
+
           ::Moped::Node.class_eval do
             include ScoutApm::Tracer
 

data/lib/scout_apm/instruments/net_http.rb

@@ -1,22 +1,26 @@
 module ScoutApm
   module Instruments
     class NetHttp
-      attr_reader :logger
+      attr_reader :context
 
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(::Net) && defined?(::Net::HTTP)
-          ScoutApm::Agent.instance.logger.info "Instrumenting Net::HTTP"
+          @installed = true
+
+          logger.info "Instrumenting Net::HTTP"
 
           ::Net::HTTP.class_eval do
             include ScoutApm::Tracer

data/lib/scout_apm/instruments/percentile_sampler.rb

@@ -18,14 +18,16 @@ module ScoutApm
     end
 
     class PercentileSampler
-      attr_reader :logger
+      def initialize(context)
+        @context = context
+      end
 
-      # A hash of { time => RequestHistograms }
-      attr_reader :histograms
+      def histograms
+        @context.request_histograms_by_time
+      end
 
-      def initialize(logger, histograms)
-        @logger = logger
-        @histograms = histograms
+      def logger
+        @context.logger
       end
 
       def human_name

data/lib/scout_apm/instruments/process/process_cpu.rb

@@ -2,14 +2,14 @@ module ScoutApm
   module Instruments
     module Process
       class ProcessCpu
-        attr_reader :logger
         attr_reader :num_processors
         attr_accessor :last_run, :last_utime, :last_stime
+        attr_reader :context
 
+        def initialize(context)
+          @context = context
 
-        def initialize(num_processors, logger)
-          @num_processors = [num_processors, 1].compact.max
-          @logger = logger
+          @num_processors = [context.environment.processors, 1].compact.max
 
           t = ::Process.times
           @last_run = Time.now
@@ -98,6 +98,10 @@ module ScoutApm
           self.last_utime = utime
           self.last_stime = stime
         end
+
+        def logger
+          context.logger
+        end
       end
     end
   end

data/lib/scout_apm/instruments/process/process_memory.rb

@@ -2,23 +2,24 @@ module ScoutApm
   module Instruments
     module Process
       class ProcessMemory
-        attr_reader :logger
-
-        # Account for Darwin returning maxrss in bytes and Linux in KB. Used by the slow converters. Doesn't feel like this should go here though...more of a utility.
-        def self.rss_to_mb(rss)
-          rss.to_f/1024/(ScoutApm::Agent.instance.environment.os == 'darwin' ? 1024 : 1)
+        # Account for Darwin returning maxrss in bytes and Linux in KB. Used by
+        # the slow converters. Doesn't feel like this should go here
+        # though...more of a utility.
+        def rss_to_mb(rss)
+          kilobyte_adjust = @context.environment.os == 'darwin' ? 1024 : 1
+          rss.to_f / 1024 / kilobyte_adjust
         end
 
-        def self.rss
+        def rss
           ::Process.rusage.maxrss
         end
 
-        def self.rss_in_mb
+        def rss_in_mb
           rss_to_mb(rss)
         end
 
-        def initialize(logger)
-          @logger = logger
+        def initialize(context)
+          @context = context
         end
 
         def metric_type
@@ -46,7 +47,11 @@ module ScoutApm
         end
 
         def run
-          self.class.rss_in_mb.tap { |res| logger.debug "#{human_name}: #{res.inspect}" }
+          rss_in_mb.tap { |res| logger.debug "#{human_name}: #{res.inspect}" }
+        end
+
+        def logger
+          @context.logger
         end
       end
     end

data/lib/scout_apm/instruments/rails_router.rb

@@ -1,19 +1,25 @@
 module ScoutApm
   module Instruments
     class RailsRouter
-      def initalize(logger=ScoutApm::Agent.instance.logger)
-        @logger = logger
+      attr_reader :context
+
+      def initialize(context)
+        @context = context
         @installed = false
       end
 
+      def logger
+        context.logger
+      end
+
       def installed?
         @installed
       end
 
       def install
-        @installed = true
-
         if defined?(ActionDispatch) && defined?(ActionDispatch::Routing) && defined?(ActionDispatch::Routing::RouteSet)
+          @installed = true
+
           ActionDispatch::Routing::RouteSet.class_eval do
             def call_with_scout_instruments(*args)
               req = ScoutApm::RequestManager.lookup
@@ -26,8 +32,8 @@ module ScoutApm
               end
             end
 
-            alias call_without_scout_instruments call
-            alias call call_with_scout_instruments
+            alias_method :call_without_scout_instruments, :call
+            alias_method :call, :call_with_scout_instruments
           end
         end
       end