oneapm_rpm 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2549e99a228ebc5192a1fa035a985afc7bac2ace
-  data.tar.gz: d52a272c4e52693f21c973c51f8fa3cdd72081c3
+  metadata.gz: 9637faf70e8254363cc5ef872cff5be2107b0e18
+  data.tar.gz: ce1569b659d17bb3cb59b050f5c764ad30a8b4ce
 SHA512:
-  metadata.gz: 786db6b474c198e117000456a33c46538d7a0cf343082556361b04a2b1db2f442f65e2e5f4cbaa7d88772741ee10989f9193bb90ad5c7e2a4493a01a571c380e
-  data.tar.gz: 1d3c27a588fa01c9606cb79ac4120b862b1e453be7e1422eda17fef366fe84362c4f8e92a05312be7e40a9d0cd90bfb05c717303d708c688f89c313ff6653126
+  metadata.gz: a082645eea917ba25880dabec86c54b7576b42d9b04c7479eada3af10cc4c0853154dc54376eb01eee36b0aa9732287ff1428d7e64244d70e82de5d258069305
+  data.tar.gz: 7bd556b3e93f61b72485b36d6bd4a56489662738fc42b4878da3884814d7e26ad65f0f8ae71d429b5d603cdcb1be6b1543ea3d4ff23a5d01a1ff843b3eebee5c

data/lib/one_apm/agent.rb

@@ -8,7 +8,6 @@ require 'zlib'
 require 'stringio'
 
 require 'one_apm/support/event_buffer/sampled_buffer'
-require 'one_apm/configuration/autostart'
 require 'one_apm/agent/harvester'
 
 require 'one_apm/support/hostname'
@@ -22,13 +21,14 @@ require 'one_apm/collector/containers/transaction_event_aggregator'
 require 'one_apm/collector/containers/custom_event_aggregator'
 require 'one_apm/collector/containers/utilization_data'
 
-require 'one_apm/collector/forked_process_service'
+require 'one_apm/collector/support/forked_process_service'
+require 'one_apm/collector/support/sampler_collection'
+
 require 'one_apm/agent/database'
 require 'one_apm/support/event/event_listener'
 require 'one_apm/agent/cross_app/cross_app_monitor'
 require 'one_apm/agent/synthetics_monitor'
 require 'one_apm/support/event_buffer/synthetics_event_buffer'
-require 'one_apm/agent/sampler_collection'
 require 'one_apm/agent/javascript_instrumentor'
 require 'one_apm/support/vm/monotonic_gc_profiler'
 
@@ -86,7 +86,7 @@ module OneApm
 
         @cross_app_monitor       = OneApm::Agent::CrossAppMonitor.new(@events)
         @transaction_rules       = OneApm::Support::RulesEngine.new
-        @harvest_samplers        = OneApm::Agent::SamplerCollection.new(@events)
+        @harvest_samplers        = OneApm::Collector::SamplerCollection.new(@events)
         @monotonic_gc_profiler   = OneApm::Support::VM::MonotonicGCProfiler.new
         @javascript_instrumentor = OneApm::Agent::JavascriptInstrumentor.new(@events)
 

data/lib/one_apm/agent/agent/connect.rb

@@ -1,15 +1,12 @@
+# encoding: utf-8
+
 module OneApm
   module Agent
     class Agent
-      # This module is an artifact of a refactoring of the connect
-      # method - all of its methods are used in that context, so it
-      # can be refactored at will. It should be fully tested
       module Connect
-        # number of attempts we've made to contact the server
+
         attr_accessor :connect_attempts
 
-        # Disconnect just sets connected to false, which prevents
-        # the agent from trying to connect again
         def disconnect
           @connect_state = :disconnected
           true
@@ -23,17 +20,10 @@ module OneApm
           @connect_state == :disconnected
         end
 
-        # Don't connect if we're already connected, or if we tried to connect
-        # and were rejected with prejudice because of a license issue, unless
-        # we're forced to by force_reconnect.
         def should_connect?(force = false)
           force || (!connected? && !disconnected?)
         end
 
-        # Retry period is a minute for each failed attempt that
-        # we've made. This should probably do some sort of sane TCP
-        # backoff to prevent hammering the server, but a minute for
-        # each attempt seems to work reasonably well.
         def connect_retry_period
           [600, connect_attempts * 60].min
         end
@@ -42,20 +32,10 @@ module OneApm
           self.connect_attempts += 1
         end
 
-        # When we have a problem connecting to the server, we need
-        # to tell the user what happened, since this is not an error
-        # we can handle gracefully.
         def log_error(error)
           OneApm::Manager.logger.error "Error establishing connection with OneApm Service at #{@service.server}:", error
         end
 
-        # When the server sends us an error with the license key, we
-        # want to tell the user that something went wrong, and let
-        # them know where to go to get a valid license key
-        #
-        # After this runs, it disconnects the agent so that it will
-        # no longer try to connect to the server, saving the
-        # application and the server load
         def handle_license_error(error)
           OneApm::Manager.logger.error( \
             error.message, \
@@ -73,26 +53,16 @@ module OneApm
           @environment_report = environment_for_connect
         end
 
-        # Checks whether we should send environment info, and if so,
-        # returns the snapshot from the local environment.
-        # Generating the EnvironmentReport has the potential to trigger
-        # require calls in Rails environments, so this method should only
-        # be called synchronously from on the main thread.
         def environment_for_connect
           OneApm::Manager.config[:send_environment_info] ? Array(EnvironmentReport.new) : []
         end
 
-        # We've seen objects in the environment report (Rails.env in
-        # particular) that can't seralize to JSON. Cope with that here and
-        # clear out so downstream code doesn't have to check again.
         def sanitize_environment_report
           if !@service.valid_to_marshal?(@environment_report)
             @environment_report = []
           end
         end
 
-        # Initializes the hash of settings that we send to the
-        # server. Returns a literal hash containing the options
         def connect_settings
           sanitize_environment_report
           {
@@ -109,29 +79,18 @@ module OneApm
           }
         end
 
-        # apdex_f is always 4 times the apdex_t
         def apdex_f
           (4 * OneApm::Manager.config[:apdex_t]).to_f
         end
 
-        # Sets the collector host and connects to the server, then
-        # invokes the final configuration with the returned data
         def query_server_for_configuration
           finish_setup(connect_to_server)
         end
 
-        # Returns connect data passed back from the server
         def connect_to_server
           @service.connect(connect_settings)
         end
 
-        # Takes a hash of configuration data returned from the
-        # server and uses it to set local variables and to
-        # initialize various parts of the agent that are configured
-        # separately.
-        #
-        # Can accommodate most arbitrary data - anything extra is
-        # ignored unless we say to do something with it here.
         def finish_setup(config_data)
           return if config_data == nil
 
@@ -144,17 +103,12 @@ module OneApm
 
           @transaction_rules = OneApm::Support::RulesEngine.create_transaction_rules(config_data)
           @stats_engine.metric_rules = OneApm::Support::RulesEngine.create_metric_rules(config_data)
-
-          # If you're adding something else here to respond to the server-side config,
-          # use OneApm::Manager.agent.events.subscribe(:finished_configuring) callback instead!
         end
 
         def local_host
           @local_host ||= OneApm::Agent::Hostname.get
         end
 
-        # Logs when we connect to the server, for debugging purposes
-        # - makes sure we know if an agent has not connected
         def log_connection!(config_data)
           OneApm::Manager.logger.debug "Connected to OneApm Service at #{@service.collector.name}"
           OneApm::Manager.logger.debug "Agent Run       = #{@service.agent_id}."

data/lib/one_apm/agent/agent/container_data_manager.rb

@@ -1,16 +1,14 @@
+# encoding: utf-8
+
 module OneApm
   module Agent
     class Agent
       module ContainerDataManager
 
-        # the statistics engine that holds all the timeslice data
         attr_reader :stats_engine
-        # the transaction sampler that handles recording transactions
         attr_reader :transaction_sampler
         attr_reader :sql_sampler
-        # manages agent commands we receive from the collector, and the handlers
         attr_reader :agent_command_router
-        # error collector is a simple collection of recorded errors
         attr_reader :error_collector
         attr_reader :custom_event_aggregator
 
@@ -22,7 +20,6 @@ module OneApm
           OneApm::Manager.logger.error("Error while merging #{endpoint} data from child: ", e)
         end
 
-        # Clear out the metric data, errors, and transaction traces, etc.
         def drop_buffered_data
           @stats_engine.reset!
           @error_collector.reset!
@@ -117,11 +114,6 @@ module OneApm
           harvest_and_send_from_container(@sql_sampler, :sql_trace_data)
         end
 
-        # This handles getting the transaction traces and then sending
-        # them across the wire.  This includes gathering SQL
-        # explanations, stripping out stack traces, and normalizing
-        # SQL.  note that we explain only the sql statements whose
-        # segments' execution times exceed our threshold.
         def harvest_and_send_transaction_traces
           harvest_and_send_from_container(@transaction_sampler, :transaction_sample_data)
         end

data/lib/one_apm/agent/agent/forkable_dispatcher_functions.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OneApm
   module Agent
     class Agent
@@ -27,7 +29,7 @@ module OneApm
         end
 
         def install_pipe_service(channel_id)
-          @service = OneApm::Agent::ForkedProcessService.new(channel_id)
+          @service = OneApm::Collector::ForkedProcessService.new(channel_id)
           if connected?
             @connected_pid = Process.pid
           else
@@ -55,7 +57,7 @@ module OneApm
         end
 
         def flush_pipe_data
-          if connected? && @service.is_a?(::OneApm::Agent::ForkedProcessService)
+          if connected? && @service.is_a?(::OneApm::Collector::ForkedProcessService)
             transmit_data
             transmit_event_data
           end

data/lib/one_apm/agent/agent/helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OneApm
   module Agent
     class Agent

data/lib/one_apm/agent/agent/start.rb

@@ -1,8 +1,8 @@
+# encoding: utf-8
+
 module OneApm
   module Agent
     class Agent
-      # Herein lies the corpse of the former 'start' method. May
-      # its unmatched flog score rest in pieces.
       module Start
 
         # Sanity-check the agent configuration and start the agent,
@@ -173,7 +173,7 @@ module OneApm
         end
 
         def in_resque_child_process?
-          @service.is_a?(OneApm::Agent::ForkedProcessService)
+          @service.is_a?(OneApm::Collector::ForkedProcessService)
         end
 
         # Log startup information that we almost always want to know

data/lib/one_apm/agent/agent/start_worker_thread.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module OneApm
   module Agent
     class Agent

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module OneApm
   module Agent
     module Instrumentation

data/lib/one_apm/agent/{datastores.rb → datastore.rb}

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'one_apm/agent/datastores/metric_helper'
+require 'one_apm/agent/datastore/metric_helper'
 
 module OneApm
   module Agent
-    module Datastores
+    module Datastore
 
       def self.trace(clazz, method_name, product, operation = method_name)
         clazz.class_eval do

data/lib/one_apm/agent/{datastores → datastore}/metric_helper.rb

@@ -2,7 +2,7 @@
 
 module OneApm
   module Agent
-    module Datastores
+    module Datastore
       module MetricHelper
         ROLLUP_METRIC        = "Datastore/all".freeze
         WEB_ROLLUP_METRIC    = "Datastore/allWeb".freeze

data/lib/one_apm/agent/{datastores → datastore}/mongo.rb

@@ -2,7 +2,7 @@
 
 module OneApm
   module Agent
-    module Datastores
+    module Datastore
       module Mongo
         def self.is_supported_version?
           # No version constant in < 2.0 versions of Mongo :(

data/lib/one_apm/agent/{datastores → datastore}/mongo/metric_translator.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
-require 'one_apm/agent/datastores/mongo/obfuscator'
-require 'one_apm/agent/datastores/metric_helper'
+require 'one_apm/agent/datastore/mongo/obfuscator'
+require 'one_apm/agent/datastore/metric_helper'
 
 module OneApm
   module Agent
-    module Datastores
+    module Datastore
       module Mongo
         module MetricTranslator
           def self.metrics_for(name, payload)
@@ -58,7 +58,7 @@ module OneApm
           MONGO_PRODUCT_NAME = "MongoDB".freeze
 
           def self.build_metrics(name, collection)
-            OneApm::Agent::Datastores::MetricHelper.metrics_for(MONGO_PRODUCT_NAME,
+            OneApm::Agent::Datastore::MetricHelper.metrics_for(MONGO_PRODUCT_NAME,
                                                                   name,
                                                                   collection)
           end

data/lib/one_apm/agent/{datastores → datastore}/mongo/obfuscator.rb

@@ -2,7 +2,7 @@
 
 module OneApm
   module Agent
-    module Datastores
+    module Datastore
       module Mongo
         module Obfuscator
 

data/lib/one_apm/agent/{datastores → datastore}/mongo/statement_formatter.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-require 'one_apm/agent/datastores/mongo/obfuscator'
+require 'one_apm/agent/datastore/mongo/obfuscator'
 
 module OneApm
   module Agent
-    module Datastores
+    module Datastore
       module Mongo
         module StatementFormatter
 

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

@@ -5,68 +5,68 @@ module OneApm
     module Threading
       class AgentThread
 
-        def self.create(label, &blk)
-          OneApm::Manager.logger.debug("Creating OneApm thread: #{label}")
-          wrapped_blk = Proc.new do
-            begin
-              blk.call
-            rescue => e
-              OneApm::Manager.logger.error("Thread #{label} exited with error", e)
-            rescue Exception => e
-              OneApm::Manager.logger.error("Thread #{label} exited with exception. Re-raising in case of interupt.", e)
-              raise
-            ensure
-              OneApm::Manager.logger.debug("Exiting OneApm thread: #{label}")
+        @backing_thread_class = ::Thread
+
+        class << self
+
+          def create(label, &blk)
+            OneApm::Manager.logger.debug("Creating OneApm thread: #{label}")
+            wrapped_blk = Proc.new do
+              begin
+                blk.call
+              rescue => e
+                OneApm::Manager.logger.error("Thread #{label} exited with error", e)
+              rescue Exception => e
+                OneApm::Manager.logger.error("Thread #{label} exited with exception. Re-raising in case of interupt.", e)
+                raise
+              ensure
+                OneApm::Manager.logger.debug("Exiting OneApm thread: #{label}")
+              end
             end
-          end
 
-          thread = backing_thread_class.new(&wrapped_blk)
-          thread[:oneapm_label] = label
-          thread
-        end
+            thread = backing_thread_class.new(&wrapped_blk)
+            thread[:oneapm_label] = label
+            thread
+          end
 
-        # Simplifies testing if we don't directly use ::Thread.list, so keep
-        # the accessor for it here on AgentThread to use and stub.
-        def self.list
-          backing_thread_class.list
-        end
+          def list
+            backing_thread_class.list
+          end
 
-        def self.bucket_thread(thread, profile_agent_code)
-          if thread.key?(:oneapm_label)
-            profile_agent_code ? :agent : :ignore
-          else
-            state = TransactionState.tl_state_for(thread)
-            if state.in_background_transaction?
-              :background
-            elsif state.in_web_transaction?
-              :request
+          def bucket_thread(thread, profile_agent_code)
+            if thread.key?(:oneapm_label)
+              profile_agent_code ? :agent : :ignore
             else
-              :other
+              state = TransactionState.tl_state_for(thread)
+              if state.in_background_transaction?
+                :background
+              elsif state.in_web_transaction?
+                :request
+              else
+                :other
+              end
             end
           end
-        end
 
-        def self.scrub_backtrace(thread, profile_agent_code)
-          begin
-            bt = thread.backtrace
-          rescue Exception => e
-            OneApm::Manager.logger.debug("Failed to backtrace #{thread.inspect}: #{e.class.name}: #{e.to_s}")
+          def scrub_backtrace(thread, profile_agent_code)
+            begin
+              bt = thread.backtrace
+            rescue Exception => e
+              OneApm::Manager.logger.debug("Failed to backtrace #{thread.inspect}: #{e.class.name}: #{e.to_s}")
+            end
+            return nil unless bt
+            bt.reject! { |t| t.include?('one_apm') } unless profile_agent_code
+            bt
           end
-          return nil unless bt
-          bt.reject! { |t| t.include?('one_apm') } unless profile_agent_code
-          bt
-        end
 
-        # To allow tests to swap out Thread for a synchronous alternative,
-        # surface the backing class we'll use from the class level.
-        @backing_thread_class = ::Thread
+          def backing_thread_class
+            @backing_thread_class
+          end
 
-        def self.backing_thread_class
-          @backing_thread_class
-        end
+          def backing_thread_class=(clazz)
+            @backing_thread_class = clazz
+          end
 
-        def self.backing_thread_class=(clazz)
-          @backing_thread_class = clazz
         end
       end
     end