oneapm_rpm 1.1.2 → 1.1.3

data/lib/one_apm/transaction/transaction_sample.rb

@@ -179,7 +179,7 @@ module OneApm
 
     def collect_explain_plans!
       return unless Agent::Database.should_collect_explain_plans?
-      threshold = Agent.config[:'transaction_tracer.explain_threshold']
+      threshold = OneApm::Manager.config[:'transaction_tracer.explain_threshold']
       each_segment do |segment|
         if segment[:sql] && segment.duration > threshold
           segment[:explain_plan] = segment.explain_sql

data/lib/one_apm/transaction/transaction_sample_builder.rb

@@ -62,7 +62,7 @@ module OneApm
     end
 
     def segment_limit
-      Agent.config[:'transaction_tracer.limit_segments']
+      OneApm::Manager.config[:'transaction_tracer.limit_segments']
     end
 
     def trace_entry(time)
@@ -71,7 +71,7 @@ module OneApm
         @current_segment.add_called_segment(segment)
         @current_segment = segment
         if @sample.count_segments == segment_limit()
-          ::OneApm::Agent.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
+          OneApm::Manager.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
         end
       else
         if @current_segment.is_a?(PlaceholderSegment)
@@ -100,7 +100,7 @@ module OneApm
       # Should never get called twice, but in a rare case that we can't
       # reproduce in house it does.  log forensics and return gracefully
       if @sample.finished
-        ::OneApm::Agent.logger.error "Unexpected double-finish_trace of Transaction Trace Object: \n#{@sample.to_s}"
+        OneApm::Manager.logger.error "Unexpected double-finish_trace of Transaction Trace Object: \n#{@sample.to_s}"
         return
       end
       @sample.root_segment.end_trace(time.to_f - @sample_start)
@@ -117,13 +117,13 @@ module OneApm
 
     TT_THRESHOLD_KEY = :'transaction_tracer.transaction_threshold'
 
-    def transaction_trace_threshold #THREAD_LOCAL_ACCESS
+    def transaction_trace_threshold
       state = TransactionState.tl_get
-      source_class = Agent.config.source(TT_THRESHOLD_KEY).class
+      source_class = OneApm::Manager.config.source(TT_THRESHOLD_KEY).class
       if source_class == Configuration::DefaultSource && state.current_transaction
         state.current_transaction.apdex_t * 4
       else
-        Agent.config[TT_THRESHOLD_KEY]
+        OneApm::Manager.config[TT_THRESHOLD_KEY]
       end
     end
 
@@ -144,7 +144,7 @@ module OneApm
     end
 
     def set_request_params(params)
-      if Agent.config[:capture_params]
+      if OneApm::Manager.config[:capture_params]
         params = normalize_params(params)
         @sample.params[:request_params].merge!(params)
         @sample.params[:request_params].delete :controller

data/lib/one_apm/transaction/transaction_state.rb

@@ -39,7 +39,7 @@ module OneApm
     # This starts the timer for the transaction.
     def reset(transaction=nil)
       # We purposefully don't reset @untraced, @record_tt and @record_sql
-      # since those are managed by OneApm::Agent.disable_* calls explicitly
+      # since those are managed by OneApm::Manager.disable_* calls explicitly
       # and (more importantly) outside the scope of a transaction
 
       @timings = nil

data/lib/one_apm/version.rb

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

data/lib/sequel/extensions/oneapm_instrumentation.rb

@@ -10,7 +10,7 @@ module Sequel
             OneApm::Agent::Instrumentation::ActiveRecordHelper
 
     # Instrument all queries that go through #execute_query.
-    def log_yield(sql, args=nil) #THREAD_LOCAL_ACCESS
+    def log_yield(sql, args=nil)
       state = OneApm::TransactionState.tl_get
       return super unless state.is_execution_traced?
 
@@ -23,7 +23,7 @@ module Sequel
         record_metrics(sql, args, duration)
         notice_sql(state, sql, args, t0, t1)
       rescue => err
-        OneApm::Agent.logger.debug "while recording metrics for Sequel", err
+        OneApm::Manager.logger.debug "while recording metrics for Sequel", err
       end
 
       return rval
@@ -31,9 +31,9 @@ module Sequel
 
     # Record metrics for the specified +sql+ and +args+ using the specified
     # +duration+.
-    def record_metrics(sql, args, duration) #THREAD_LOCAL_ACCESS
+    def record_metrics(sql, args, duration)
       primary_metric = primary_metric_for(sql, args)
-      engine         = OneApm::Agent.instance.stats_engine
+      engine         = OneApm::Manager.agent.stats_engine
 
       metrics = rollup_metrics_for(primary_metric)
       metrics << remote_service_metric(*self.opts.values_at(:adapter, :host)) if self.opts.key?(:adapter)
@@ -49,7 +49,7 @@ module Sequel
     # +finish+ times.
     def notice_sql(state, sql, args, start, finish)
       metric   = primary_metric_for(sql, args)
-      agent    = OneApm::Agent.instance
+      agent    = OneApm::Manager.agent
       duration = finish - start
       stack    = state.traced_method_stack
 
@@ -59,7 +59,7 @@ module Sequel
           if THREAD_SAFE_CONNECTION_POOL_CLASSES.include?(self.pool.class)
             self[ sql ].explain
           else
-            OneApm::Agent.logger.log_once(:info, :sequel_explain_skipped, "Not running SQL explains because Sequel is not in recognized multi-threaded mode")
+            OneApm::Manager.logger.log_once(:info, :sequel_explain_skipped, "Not running SQL explains because Sequel is not in recognized multi-threaded mode")
             nil
           end
         end
@@ -78,7 +78,7 @@ module Sequel
 
   end # module OneApmInstrumentation
 
-  OneApm::Agent.logger.debug "Registering the :oneapm_instrumentation extension."
+  OneApm::Manager.logger.debug "Registering the :oneapm_instrumentation extension."
   Database.register_extension(:oneapm_instrumentation, OneApmInstrumentation)
 
 end # module Sequel

data/oneapm.yml

@@ -1,20 +1,20 @@
 #
-# OneApm RubyAgent Configuration
+# OneApm Ruby探针配置
 #
 
 common: &default_settings
 
   license_key: 'please-paste-your-license-key-here'
 
-  # This app_name will be the application name in oneapm.com in your account.
+  # 您在这里填写的app_name会显示在OneAPM的管理后台界面中。
   #
-  # 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，一个新的应用会出现在后台，
+  # 数据会上传到这个新应用，并停止向旧的应用上传数据。
   #
   app_name: My Application
 
 #
-# Environment-specific settings
+# 环境相关配置
 #
 
 production:
@@ -23,7 +23,7 @@ production:
 
 development:
   <<: *default_settings
-  # Turn on communication to OneApm service in development mode
+  # development模式下，探针开启并上传性能数据
   monitor_mode: true
   app_name: My Application (Development)
 
@@ -31,7 +31,6 @@ test:
   <<: *default_settings
   monitor_mode: false
 
-# Staging environment which behaves identically to production.
 staging:
   <<: *default_settings
   monitor_mode: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -224,7 +224,6 @@ files:
 - lib/initializers/other.rb
 - lib/initializers/rails.rb
 - lib/one_apm/agent.rb
-- lib/one_apm/agent/agent.rb
 - lib/one_apm/agent/agent/connect.rb
 - lib/one_apm/agent/agent/container_data_manager.rb
 - lib/one_apm/agent/agent/forkable_dispatcher_functions.rb
@@ -245,15 +244,9 @@ files:
 - lib/one_apm/agent/datastores/mongo/metric_translator.rb
 - lib/one_apm/agent/datastores/mongo/obfuscator.rb
 - 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
 - lib/one_apm/agent/javascript_instrumentor.rb
-- lib/one_apm/agent/pipe/pipe_channel_manager.rb
-- lib/one_apm/agent/pipe/pipe_service.rb
 - lib/one_apm/agent/sampler.rb
 - lib/one_apm/agent/sampler_collection.rb
 - lib/one_apm/agent/samplers/cpu_sampler.rb
@@ -282,6 +275,7 @@ files:
 - lib/one_apm/collector/containers/transaction_event_aggregator.rb
 - lib/one_apm/collector/containers/transaction_sampler.rb
 - lib/one_apm/collector/containers/utilization_data.rb
+- lib/one_apm/collector/forked_process_service.rb
 - lib/one_apm/collector/stats_engine/gc_profiler.rb
 - lib/one_apm/collector/stats_engine/metric_stats.rb
 - lib/one_apm/collector/stats_engine/stats_hash.rb
@@ -313,6 +307,7 @@ files:
 - lib/one_apm/inst/background_job/resque.rb
 - lib/one_apm/inst/background_job/sidekiq.rb
 - lib/one_apm/inst/dispatcher/passenger.rb
+- lib/one_apm/inst/dispatcher/puma.rb
 - lib/one_apm/inst/dispatcher/rainbows.rb
 - lib/one_apm/inst/framework/grape.rb
 - lib/one_apm/inst/framework/padrino.rb
@@ -356,6 +351,7 @@ files:
 - lib/one_apm/logger/audit_logger.rb
 - lib/one_apm/logger/memory_logger.rb
 - lib/one_apm/logger/null_logger.rb
+- lib/one_apm/manager.rb
 - lib/one_apm/metrics/metric_data.rb
 - lib/one_apm/metrics/metric_spec.rb
 - lib/one_apm/metrics/stats.rb
@@ -374,10 +370,15 @@ files:
 - lib/one_apm/support/dotted_hash.rb
 - lib/one_apm/support/encoders.rb
 - lib/one_apm/support/environment_report.rb
+- lib/one_apm/support/event/event_listener.rb
+- lib/one_apm/support/event/event_loop.rb
+- lib/one_apm/support/event/timer.rb
+- lib/one_apm/support/event/worker_loop.rb
 - lib/one_apm/support/event_buffer.rb
 - lib/one_apm/support/event_buffer/sampled_buffer.rb
 - lib/one_apm/support/event_buffer/sized_buffer.rb
 - lib/one_apm/support/event_buffer/synthetics_event_buffer.rb
+- lib/one_apm/support/forked_process_channel.rb
 - lib/one_apm/support/helper.rb
 - lib/one_apm/support/hostname.rb
 - lib/one_apm/support/http_clients/curb_wrappers.rb

data/lib/one_apm/agent/agent.rb

@@ -1,283 +0,0 @@
-# encoding: utf-8
-
-require 'socket'
-require 'net/https'
-require 'net/http'
-require 'logger'
-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'
-require 'one_apm/support/environment_report'
-
-require 'one_apm/configuration'
-
-require 'one_apm/collector/collector_service'
-require 'one_apm/collector/containers/agent_command_router'
-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/agent/pipe/pipe_service'
-require 'one_apm/agent/database'
-require 'one_apm/agent/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'
-
-require 'one_apm/agent/agent/start'
-require 'one_apm/agent/agent/start_worker_thread'
-require 'one_apm/agent/agent/connect'
-require 'one_apm/agent/agent/helpers'
-require 'one_apm/agent/agent/container_data_manager'
-require 'one_apm/agent/agent/forkable_dispatcher_functions'
-
-module OneApm
-  module Agent
-    class Agent
-      include OneApm::Agent::Agent::Start
-      include OneApm::Agent::Agent::StartWorkerThread
-      include OneApm::Agent::Agent::Connect
-      include OneApm::Agent::Agent::Helpers
-      include OneApm::Agent::Agent::ContainerDataManager
-      include OneApm::Agent::Agent::ForkableDispatcherFunctions
-
-      # whether we should record raw, obfuscated, or no sql
-      attr_reader :record_sql
-      # builder for JS agent scripts to inject
-      attr_reader :javascript_instrumentor
-      # cross application tracing ids and encoding
-      attr_reader :cross_process_id
-      attr_reader :cross_app_encoding_bytes
-      attr_reader :cross_app_monitor
-      # service for communicating with collector
-      attr_accessor :service
-      # Global events dispatcher. This will provides our primary mechanism
-      # for agent-wide events, such as finishing configuration, error notification
-      # and request before/after from Rack.
-      attr_reader :events
-      # Transaction and metric renaming rules as provided by the
-      # collector on connect.  The former are applied during txns,
-      # the latter during harvest.
-      attr_reader :transaction_rules
-      # Responsbile for restarting the harvest thread
-      attr_reader :harvester
-      attr_reader :harvest_samplers
-      attr_reader :harvest_lock
-      # GC::Profiler.total_time is not monotonic so we wrap it.
-      attr_reader :monotonic_gc_profiler
-
-      def self.instance
-        @instance ||= self.new
-      end
-
-      def self.config
-        OneApm::Agent.config
-      end
-
-      def initialize
-        # This should be handled with a configuration callback
-        start_service_if_needed
-
-        @events = OneApm::Agent::EventListener.new
-
-        init_containers @events
-        OneApm::Agent::SyntheticsMonitor.new @events
-
-        @cross_app_monitor       = OneApm::Agent::CrossAppMonitor.new(@events)
-        @transaction_rules       = OneApm::Support::RulesEngine.new
-        @harvest_samplers        = OneApm::Agent::SamplerCollection.new(@events)
-        @monotonic_gc_profiler   = OneApm::Support::VM::MonotonicGCProfiler.new
-        @javascript_instrumentor = OneApm::Agent::JavascriptInstrumentor.new(@events)
-
-        @harvester       = OneApm::Agent::Harvester.new(@events)
-        @after_fork_lock = Mutex.new
-
-        @connect_state      = :pending
-        @connect_attempts   = 0
-        @environment_report = nil
-
-        @harvest_lock = Mutex.new
-      end
-
-      def probe
-        OneApm::Probe.instance
-      end
-
-      def start_service_if_needed
-        if Agent.config[:monitor_mode] && !@service
-          @service = OneApm::Collector::CollectorService.new
-        end
-      end
-
-      def start
-        return unless agent_should_start?
-
-        log_startup
-        check_config_and_start_agent
-        log_version_and_pid
-
-        events.subscribe(:finished_configuring) do
-          log_ignore_url_regexes
-        end
-      end
-
-      # Attempt a graceful shutdown of the agent, running the worker
-      # loop if it exists and is running.
-      #
-      # Options:
-      # :force_send  => (true/false) # force the agent to send data
-      def shutdown(options={})
-        return if not started?
-        ::OneApm::Agent.logger.info "Starting Agent shutdown"
-
-        stop_event_loop
-        untraced_graceful_disconnect
-        OneApm::Agent.revert_to_default_configuration
-
-        @started = nil
-        OneApm::Probe.reset
-      end
-
-      # Check to see if the agent should start, returning +true+ if it should.
-      def agent_should_start?
-        return false if already_started? || disabled? || defer_for_background_jobs?
-
-        unless app_name_configured?
-          OneApm::Agent.logger.error "No application name configured.",
-            "The Agent cannot start without at least one. Please check your ",
-            "oneapm.yml and ensure that it is valid and has at least one ",
-            "value set for app_name in the #{probe.env} ",
-            "environment."
-          return false
-        end
-
-        true
-      end
-
-      # Connect to the server and validate the license.  If successful,
-      # connected? returns true when finished.  If not successful, you can
-      # keep calling this.  Return false if we could not establish a
-      # connection with the server and we should not retry, such as if
-      # there's a bad license key.
-      #
-      # Set keep_retrying=false to disable retrying and return asap, such as when
-      # invoked in the foreground.  Otherwise this runs until a successful
-      # connection is made, or the server rejects us.
-      #
-      # * <tt>:keep_retrying => false</tt> to only try to connect once, and
-      #   return with the connection set to nil.  This ensures we may try again
-      #   later (default true).
-      # * <tt>force_reconnect => true</tt> if you want to establish a new connection
-      #   to the server before running the worker loop.  This means you get a separate
-      #   agent run and OneApm sees it as a separate instance (default is false).
-      def connect(options={})
-        begin
-          defaults = {
-            :keep_retrying => Agent.config[:keep_retrying],
-            :force_reconnect => Agent.config[:force_reconnect]
-          }
-          opts = defaults.merge(options)
-
-          return unless should_connect?(opts[:force_reconnect])
-
-          ::OneApm::Agent.logger.debug "Connecting Process to OneApm: #$0"
-          query_server_for_configuration
-          @connected_pid = Process.pid
-          @connect_state = :connected
-        rescue OneApm::ForceDisconnectException => e
-          handle_force_disconnect(e)
-        rescue OneApm::LicenseException => e
-          handle_license_error(e)
-        rescue OneApm::UnrecoverableAgentException => e
-          handle_unrecoverable_agent_error(e)
-        rescue StandardError, Timeout::Error, OneApm::ServerConnectionException => e
-          log_error(e)
-          if opts[:keep_retrying]
-            note_connect_failure
-            ::OneApm::Agent.logger.info "Will re-attempt in #{connect_retry_period} seconds"
-            sleep connect_retry_period
-            retry
-          else
-            disconnect
-          end
-        rescue Exception => e
-          ::OneApm::Agent.logger.error "Exception of unexpected type during Agent#connect():", e
-
-          raise
-        end
-      end
-
-      # This method contacts the server to send remaining data and
-      # let the server know that the agent is shutting down - this
-      # allows us to do things like accurately set the end of the
-      # lifetime of the process
-      #
-      # If this process comes from a parent process, it will not
-      # disconnect, so that the parent process can continue to send data
-      def graceful_disconnect
-        if connected?
-          begin
-            @service.request_timeout = 10
-
-            @events.notify(:before_shutdown)
-            transmit_data
-            transmit_event_data
-            transmit_utilization_data if OneApm::Agent.config[:collect_utilization]
-
-            if @connected_pid == $$ && !@service.kind_of?(OneApm::Collector::CollectorService)
-              ::OneApm::Agent.logger.debug "Sending OneApm service agent run shutdown message"
-              @service.shutdown(Time.now.to_f)
-            else
-              ::OneApm::Agent.logger.debug "This agent connected from parent process #{@connected_pid}--not sending shutdown"
-            end
-            ::OneApm::Agent.logger.debug "Graceful disconnect complete"
-          rescue Timeout::Error, StandardError => e
-            ::OneApm::Agent.logger.debug "Error when disconnecting #{e.class.name}: #{e.message}"
-          end
-        else
-          ::OneApm::Agent.logger.debug "Bypassing graceful disconnect - agent not connected"
-        end
-      end
-
-      def untraced_graceful_disconnect
-        begin
-          OneApm::Agent.disable_all_tracing do
-            graceful_disconnect
-          end
-        rescue => e
-          ::OneApm::Agent.logger.error e
-        end
-      end
-    end
-
-    class ShimAgent < OneApm::Agent::Agent
-      def self.instance
-        @instance ||= self.new
-      end
-
-      def initialize
-        super
-        @stats_engine.extend OneApm::Collector::StatsEngine::Shim
-        @transaction_sampler.extend OneApm::Collector::TransactionSampler::Shim
-        @sql_sampler.extend OneApm::Collector::SqlSampler::Shim
-        @error_collector.extend OneApm::Collector::ErrorCollector::Shim
-      end
-
-      def after_fork *args; end
-      def start *args; end
-      def shutdown *args; end
-      def merge_data_for_endpoint *args; end
-      def push_trace_execution_flag *args; end
-      def pop_trace_execution_flag *args; end
-      def browser_timing_header; "" end
-    end
-  end
-end