oneapm_rpm 1.2.2 → 1.2.3.rc2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFmNjc4Yjk5MzM5ZjI0YmVmYmM3ZmMxNDg3YWMwZjk4OTBlNWQ2Mg==
+    NzA4OTY1M2MxYjA2NTc0OGMwYzg1NzVjN2ZlYjUxMzBiYTVmZjI0NA==
   data.tar.gz: !binary |-
-    NWI5Y2M3Mzg5ZDJkZTI1MWFmZTk3MTRjYTRkNWIyMjU2YjM2NDBlYQ==
+    MzcyNjE0NGI5OGJkNDE3ODEzZGEyODFhNTM5MTgxNjNkMWI2Y2JlMw==
 SHA512:
   metadata.gz: !binary |-
-    NjI3MzM2ZTJhMzQ1NzUyNTg5OTk3ZGQ3MmI5MWQwMmFmN2EzZGQxMjI5NjUy
-    Yzc2MzIxN2YxYmMyZGNmMDA0ZjQwNGJmY2JhNWRmYTgwMTYxYWQ2MjRkZGRl
-    NDg0M2I2Y2VhODg5OWE4MDcwMWQ3ZTViZThjMjBiZGIxOGQ1ZWQ=
+    YzlkN2IwZDFmZDJmMGY1MGNkM2IxNDk1ZjE2Y2VkNGUxODk4MzBiYmNjNjkz
+    MjgzMWZjNTVmYWQ4ZDg3Y2E4M2MyODBmMDZkYmFiMjYxMmRhZjhkYjJhM2Q1
+    ZjgxMmI5MTljYzUyMzM0NTQ5MmM0NGM2NzEyYzYxM2YwYjk4ZjE=
   data.tar.gz: !binary |-
-    MjA5Y2FlM2FmNmFmYjk3NjFmZDk2MTUyZTJkZTFkN2E0MGU4Yzc0ZTQzNTZl
-    OGUxNDdhMTE2M2E2YzNmODA2Mjg0OGQ3YjYyOWRjYWVmZjBlOGQ3YmZlMjE2
-    OTEzNTQ1NTQxODhkNmNjNzA0ZjEzNTBjNWU4ODY3YjU1NGZkYjM=
+    MDU5MmUzYjRjYjVjZjhlMzRmMTNmZTI4MjVlODEzOTkzZDYzZDE1YzhjNDg3
+    Y2M5NDljYjAzN2I0ZTVlZGZjZTQ2MDA1YTdkOTc0NzEwMDdlMzIzNzYyNmIw
+    NGQ0ZDc3ODliZDg5NzQ5ODg2ZWIyNTM3ZDM3MGRlYWE0ZDU3MDM=

data/lib/one_apm/agent.rb

@@ -38,6 +38,8 @@ 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'
+require 'one_apm/agent/agent/restart_monitor'
+require 'one_apm/agent/agent/restart'
 
 module OneApm
   module Agent
@@ -83,12 +85,14 @@ module OneApm
 
         init_containers @events
         OneApm::Agent::SyntheticsMonitor.new @events
+        OneApm::Agent::RestartMonitor.new
 
         @cross_app_monitor       = OneApm::Agent::CrossAppMonitor.new(@events)
         @transaction_rules       = OneApm::Support::RulesEngine.new
         @harvest_samplers        = OneApm::Collector::SamplerCollection.new(@events)
         @monotonic_gc_profiler   = OneApm::Support::VM::MonotonicGCProfiler.new
         @javascript_instrumentor = OneApm::Agent::JavascriptInstrumentor.new(@events)
+        @restart                 = OneApm::Agent::Restart.new(@events)
 
         @harvester       = OneApm::Agent::Harvester.new(@events)
         @after_fork_lock = Mutex.new

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

@@ -141,6 +141,10 @@ module OneApm
           end
         end
 
+        def detect_config
+          @events.notify(:agent_restart) if OneApm::Agent::RestartMonitor.need_restart?
+        end
+
         def transmit_event_data
           transmit_single_data_type(:harvest_and_send_analytic_event_data, "TransactionEvent")
         end

data/lib/one_apm/agent/agent/restart.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module OneApm
+  module Agent
+    class Restart
+
+      def initialize(events)
+        events.subscribe(:agent_restart, &method(:restart))
+      end
+
+      def restart
+        OneApm::Manager.logger.info "Restarting Agent..."
+        OneApm::Manager.restart
+        OneApm::Manager.logger.info "Restarted Agent done."
+      end
+    end
+  end
+end

data/lib/one_apm/agent/agent/restart_monitor.rb

@@ -0,0 +1,75 @@
+# encoding: utf-8
+
+module OneApm
+  module Agent
+    class RestartMonitor
+
+      def initialize
+        @lock = Mutex.new
+        create_restart_file
+      end
+
+      def create_restart_file
+        @lock.synchronize do
+          begin
+            file_path = OneApm::Agent::RestartMonitor.file_path
+            return if file_path.nil?
+            if !File.exist?(file_path) && system("touch #{file_path}")
+              OneApm::Manager.logger.info "create #{file_path} successful."
+            else
+              OneApm::Manager.logger.debug "#{file_path} has exist."  
+            end
+             OneApm::Agent::RestartMonitor.timestamp = File.mtime(file_path).to_i
+          rescue => e
+            OneApm::Manager.logger.warn("create #{file_path} fail.", e)
+          end
+        end
+      end
+      
+      def self.need_restart?
+        @result = timestamp == restart_file_timestamp
+        self.timestamp = restart_file_timestamp unless @result
+        !@result
+      end
+
+      def self.touch
+        !file_path.nil? && system("touch #{file_path}")
+      end
+
+      private
+
+      def self.timestamp
+        @timestamp || 0
+      end
+
+      def self.timestamp= timestamp
+        @timestamp = timestamp
+      end
+
+      def self.restart_file_timestamp
+        return 0 unless File.exist?(file_path)
+        File.mtime(file_path).to_i
+      end
+
+      def self.file_path
+        return nil if path.nil?
+        @file_path ||= "#{path}/#{OneApm::Manager.config[:agent_restart_file_name]}"
+      end
+
+      def self.path 
+        @path ||= find_or_create_path(OneApm::Manager.config[:agent_restart_file_path], OneApm::Probe.instance.root)
+      end
+
+      def self.find_or_create_path(path_setting, root)
+        for abs_path in [ File.expand_path(path_setting),
+                          File.expand_path(File.join(root, path_setting)) ] do
+          if File.directory?(abs_path) || (Dir.mkdir(abs_path) rescue nil)
+            return abs_path[%r{^(.*?)/?$}]
+          end
+        end
+        nil
+      end
+
+    end
+  end
+end

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

@@ -40,10 +40,12 @@ module OneApm
           @event_loop.on(:report_data)          { transmit_data }
           @event_loop.on(:report_event_data)    { transmit_event_data }
           @event_loop.on(:reset_log_once_keys)  { OneApm::Manager.logger.clear_already_logged }
+          @event_loop.on(:detect_config)        { detect_config }
 
           @event_loop.fire_every(Manager.config[:data_report_period],       :report_data)
           @event_loop.fire_every(report_period_for(:analytic_event_data), :report_event_data)
           @event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD,              :reset_log_once_keys)
+          @event_loop.fire_every(Manager.config[:data_report_period],       :detect_config)
 
           if OneApm::Manager.config[:collect_utilization] && !in_resque_child_process?
             @event_loop.on(:report_utilization_data) { transmit_utilization_data }

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

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'one_apm/agent/agent/restart_monitor'
+
+module OneApm
+  module Collector
+    module Commands
+      class RestartAgent
+
+        def initialize
+          OneApm::Agent::RestartMonitor.touch
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,6 +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/collector/commands/restart_agent'
 require 'one_apm/support/backtrace/backtrace_service'
 
 module OneApm
@@ -22,7 +23,7 @@ module OneApm
         @thread_profiler_session = OneApm::Collector::Commands::ThreadProfilerSession.new(@backtrace_service)
         @xray_session_collection = OneApm::Collector::Commands::XraySessionCollection.new(@backtrace_service, event_listener)
 
-        @handlers['restart'] = Proc.new { OneApm::Manager.restart }
+        @handlers['restart'] = Proc.new { OneApm::Collector::Commands::RestartAgent.new }
         @handlers['start_profiler'] = Proc.new { |cmd| thread_profiler_session.handle_start_command(cmd) }
         @handlers['stop_profiler']  = Proc.new { |cmd| thread_profiler_session.handle_stop_command(cmd) }
         @handlers['active_xray_sessions'] = Proc.new { |cmd| xray_session_collection.handle_active_xray_sessions(cmd) }

data/lib/one_apm/configuration/default_source.rb

@@ -1050,6 +1050,18 @@ module OneApm
         :public       => true,
         :type         => Boolean,
         :description  => 'Defines whether the agent will wrap middlewares which are installed Rails.'
+      },
+       :agent_restart_file_name => {
+        :default => 'oneapm_restart.txt',
+        :public => true,
+        :type => String,
+        :description => 'Defines name of the agent restart file.'
+      },
+      :agent_restart_file_path => {
+        :default => 'tmp/',
+        :public => true,
+        :type => String,
+        :description => 'Defines a path to the agent restart file, excluding the filename.'
       }
     }.freeze
   end

data/lib/one_apm/frameworks/rails.rb

@@ -50,9 +50,17 @@ module OneApm
           end
         end
 
+        def agent_hooks_installed
+          @@agent_hooks_installed ||= false
+        end
+        
+        def browser_monitoring_installed
+          @@browser_monitoring_installed ||= false
+        end
+
         def install_agent_hooks(config)
-          return if @agent_hooks_installed
-          @agent_hooks_installed = true
+          return if agent_hooks_installed
+          @@agent_hooks_installed = true
           return if config.nil? || !config.respond_to?(:middleware)
           begin
             require 'one_apm/rack/middleware_hooks'
@@ -65,8 +73,8 @@ module OneApm
         end
 
         def install_browser_monitoring(config)
-          return if @browser_monitoring_installed
-          @browser_monitoring_installed = true
+          return if browser_monitoring_installed
+          @@browser_monitoring_installed = true
           return if config.nil? || !config.respond_to?(:middleware) || !Manager.config[:'browser_monitoring.auto_instrument']
           begin
             require 'one_apm/rack/browser_monitoring'

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

@@ -82,7 +82,7 @@ LibraryDetection.defer do
       def filter command
         need_filtered = OneApm::Manager.config[:'redis.ignore_commands'].map(&:to_s).include?(command.to_s)
         if need_filtered
-          OneApm::Manager.logger.debug "filter command: #{command}"
+          OneApm::Manager.logger.debug "Redis filter command: #{command}"
           nil
         else
           command

data/lib/one_apm/manager.rb

@@ -74,9 +74,9 @@ module OneApm
     def restart
       shutdown
       agent.harvest_samplers.clear
-      agent.agent_variable_set(:@connect_state, :pending)
-      agent.agent_variable_set(:@worker_thread, nil)
-      agent.harvester.agent_variable_set(:@starting_pid, nil)
+      agent.instance_variable_set(:@connect_state, :pending)
+      agent.instance_variable_set(:@worker_thread, nil)
+      agent.harvester.instance_variable_set(:@starting_pid, nil)
       OneApm::Probe.init({:agent_enabled => true, :sync_startup => true})
     end
 

data/lib/one_apm/version.rb

@@ -5,9 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
+    TAG   = 'rc2'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3.rc2
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -243,6 +243,8 @@ files:
 - lib/one_apm/agent/agent/container_data_manager.rb
 - lib/one_apm/agent/agent/forkable_dispatcher_functions.rb
 - lib/one_apm/agent/agent/helpers.rb
+- lib/one_apm/agent/agent/restart.rb
+- lib/one_apm/agent/agent/restart_monitor.rb
 - lib/one_apm/agent/agent/start.rb
 - lib/one_apm/agent/agent/start_worker_thread.rb
 - lib/one_apm/agent/busy_calculator.rb
@@ -270,6 +272,7 @@ files:
 - lib/one_apm/collector/collector/server_methods.rb
 - lib/one_apm/collector/collector_service.rb
 - lib/one_apm/collector/commands/agent_command.rb
+- lib/one_apm/collector/commands/restart_agent.rb
 - lib/one_apm/collector/commands/thread_profiler_session.rb
 - lib/one_apm/collector/commands/xray_session.rb
 - lib/one_apm/collector/commands/xray_session_collection.rb