oneapm_rpm 1.2.0 → 1.2.1.rc

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 9637faf70e8254363cc5ef872cff5be2107b0e18
-  data.tar.gz: ce1569b659d17bb3cb59b050f5c764ad30a8b4ce
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjYzNmI4ZDk2MWZkMTkzOTlmODYzNmYxMGFmMzU4MDI5NjJkMDhjMA==
+  data.tar.gz: !binary |-
+    YzQ0MGYyZjI2MGYxNzQ4ODQwYjdiZjNkYWE0ZjZiYjE0YmYwMzhhZQ==
 SHA512:
-  metadata.gz: a082645eea917ba25880dabec86c54b7576b42d9b04c7479eada3af10cc4c0853154dc54376eb01eee36b0aa9732287ff1428d7e64244d70e82de5d258069305
-  data.tar.gz: 7bd556b3e93f61b72485b36d6bd4a56489662738fc42b4878da3884814d7e26ad65f0f8ae71d429b5d603cdcb1be6b1543ea3d4ff23a5d01a1ff843b3eebee5c
+  metadata.gz: !binary |-
+    YTg3NmM1MWVhODgzODY0MWNkMzA5MDk0OTMzNzQ4YjY5YWViM2Y0ZmZiNGEy
+    ZGI3NTg1NDJkZDk4YTJkYmVkODZhZjQ2OGJlMzljNGFkNTVhNDQ2YjZhN2Q4
+    MDE0M2JhMmNhYWI5MTgwMzY0MzFiMjkxOGFiZTA0NDlmZDk2NjU=
+  data.tar.gz: !binary |-
+    YzYwZTk5OGNjNTMzZmI0ZWM0M2ZkNWQ1NzBjMjY2ZjdhYTI5NjNiMWIyODlh
+    NTgwYzZlZDA0ZGJlNjllNTc2Mzk1OTQ4NzlkODJmMWVmMzYxMWQ2Y2Q1ZTdm
+    YmMwN2E4MTI0Njk2Zjk0YzhhMWRmNzVlZWEwNGFjYzBmMDM3ZDY=

data/.gitignore

@@ -28,3 +28,7 @@ artifacts/
 test/performance/script/log/
 /doc/
 /test/reports/*
+.ruby-version
+.ruby-gemset
+**/database.yml
+test/multiverse/suites/active_record/config/database.yml

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Change Log
+
+## [1.2.0] - 2015-07-01
+
+### Added
+
+- developer mode

data/README.md

@@ -1,3 +1,3 @@
 # OneApm Ruby Agent
 
-OneApm is a performance management system, developed by OneApm, Inc (http://www.oneapm.com).
+OneApm is a performance management system, developed by OneApm, Inc (http://www.oneapm.com).

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

@@ -98,7 +98,7 @@ module OneApm
 
           OneApm::Manager.logger.debug "Server provided config: #{config_data.inspect}"
           server_config = OneApm::Configuration::ServerSource.new(config_data, OneApm::Manager.config)
-          OneApm::Manager.config.replace_or_add_config(server_config)
+          OneApm::Manager.config.update_config(server_config)
           log_connection!(config_data) if @service
 
           @transaction_rules = OneApm::Support::RulesEngine.create_transaction_rules(config_data)

data/lib/one_apm/agent/cross_app/cross_app_tracing.rb

@@ -108,9 +108,8 @@ module OneApm
             metrics = metrics_for(request, response)
             scoped_metric = metrics.pop
 
-            stats_engine.record_scoped_and_unscoped_metrics(
-              state, scoped_metric, metrics, duration)
-
+            stats_engine.record_scoped_and_unscoped_metrics(state, scoped_metric, metrics, duration, nil, &cross_app_run_time_block(response, duration))
+           
             # If we don't have segment, something failed during start_trace so
             # the current segment isn't the HTTP call it should have been.
             if segment
@@ -214,6 +213,7 @@ module OneApm
 
         if response && response_is_crossapp?( response )
           begin
+            metrics.delete_if{|m| m == "External/#{request.host}/all"}
             metrics.concat metrics_for_crossapp_response( request, response )
           rescue => err
             # Fall back to regular metrics if there's a problem with x-process metrics
@@ -331,6 +331,23 @@ module OneApm
         # This is here for when that inevitably comes back to haunt us.
       end
 
+      def cross_app_run_time_block response, res_time
+        run_time_block = nil
+        if response && response_is_crossapp?( response )
+          xp_id, txn_name, _q_time, run_time, _req_len, _ = extract_appdata( response )
+          run_time_block = Proc.new do |stats|  
+            stats.call_count           += 1
+            stats.total_call_time      += res_time
+            stats.total_exclusive_time += run_time   
+            stats.min_call_time        =  res_time
+            stats.max_call_time        =  res_time
+            stats.sum_of_squares       += res_time**2
+            stats
+          end
+        end
+        run_time_block
+      end
+
     end
   end
 end

data/lib/one_apm/agent/javascript_instrumentor.rb

@@ -101,7 +101,11 @@ module OneApm
       end
 
       def browser_timing_loader
-        html_safe_if_needed("\n<script type=\"text/javascript\" src=\"#{Manager.config[:js_agent_loader]}\"></script>")
+        if Manager.config[:'browser_monitoring.is_js_text']
+          html_safe_if_needed("\n<script type=\"text/javascript\">#{Manager.config[:js_agent_loader]}</script>")
+        else
+          html_safe_if_needed("\n<script type=\"text/javascript\" src=\"#{Manager.config[:js_agent_loader]}\"></script>")
+        end
       end
 
       def browser_timing_config(state)

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

@@ -30,15 +30,16 @@ module OneApm
         OneApm::Manager.config.register_callback(:'error_collector.enabled') do |config_enabled|
           OneApm::Manager.logger.debug "Errors will #{config_enabled ? '' : 'not '}be sent to the OneApm service."
         end
-        OneApm::Manager.config.register_callback(:'error_collector.ignore_errors') do |ignore_errors|
-          initialize_ignored_errors(ignore_errors)
+        OneApm::Manager.config.register_callback(:'error_collector.ignore_errors') do |client_config_errors, server_config_errors|
+          initialize_ignored_errors("#{client_config_errors},#{server_config_errors}")
         end
       end
 
       def initialize_ignored_errors(ignore_errors)
         @ignore.clear
         ignore_errors = ignore_errors.split(",") if ignore_errors.is_a? String
-        ignore_errors.each { |error| error.strip! }
+        ignore_errors.map(&:strip!)
+        ignore_errors.uniq!
         ignore(ignore_errors)
       end
 

data/lib/one_apm/configuration/default_source.rb

@@ -766,6 +766,12 @@ module OneApm
         :type => Boolean,
         :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
       },
+      :'browser_monitoring.is_js_text' => {
+        :default => false,
+        :public => true,
+        :type => Boolean,
+        :description => 'Enable or disable insert js agent as text'
+      },
       :js_agent_loader => {
         :default => '',
         :public => false,
@@ -1024,6 +1030,19 @@ module OneApm
         :public       => true,
         :type         => Boolean,
         :description  => 'enable standalone mode of event_machine'
+      },
+      :'redis.ignore_commands' => {
+        :default      => [],
+        :allow_nil    => true,
+        :public       => true,
+        :type         => Array,
+        :description  => 'A list of redis commands that will be ignore.'
+      },
+       :disable_rails_middleware => {
+        :default      => true,
+        :public       => true,
+        :type         => Boolean,
+        :description  => 'Defines whether the agent will wrap middlewares which are installed Rails.'
       }
     }.freeze
   end

data/lib/one_apm/configuration/server_source.rb

@@ -15,7 +15,7 @@ module OneApm
           end
         end
 
-        if hash['browser_monitoring']
+        if hash['browser_monitoring'] && hash['browser_monitoring']['transform']
           hash['browser_monitoring']['auto_instrument'] = hash['browser_monitoring']['transform']
         end
 
@@ -23,9 +23,13 @@ module OneApm
           self[:web_transactions_apdex] = hash.delete('web_transactions_apdex')
         end
 
+        if hash['error_collector'] 
+          hash['error_collector']['ignore_errors.direction'] = :append
+        end
+
         dotted_hash = OneApm::Support::DottedHash.new(hash).to_hash
         apply_feature_gates(dotted_hash, existing_config)
-
+        
         super(dotted_hash)
       end
 

data/lib/one_apm/configuration.rb

@@ -86,11 +86,24 @@ module OneApm
         log_config(:remove, source)
       end
 
-      def replace_or_add_config(source)
+      def replace_or_add_config source
+        configure(source) do 
+          invoke_callbacks(:add, source)
+          :add
+        end
+      end
+
+      def update_config source
+        configure(source) do 
+          _invoke_callbacks_(source)
+          :update
+        end
+      end
+
+      def configure source
         source.freeze
         was_finished = finished_configuring?
-
-        invoke_callbacks(:add, source)
+        operation = yield
         case source
         when HighSecuritySource then @high_security_source = source
         when EnvironmentSource  then @environment_source   = source
@@ -101,10 +114,8 @@ module OneApm
         else
           OneApm::Manager.logger.warn("Invalid config format; config will be ignored: #{source}")
         end
-
         reset_cache
-        log_config(:add, source)
-
+        log_config(operation, source)
         notify_finished_configuring if !was_finished && finished_configuring?
       end
 
@@ -165,22 +176,41 @@ module OneApm
         proc.call(@cache[key])
       end
 
-      def invoke_callbacks(direction, source)
+      def _invoke_callbacks_ source
+        return unless source
+        @directions = directions(source)
+        source.keys.each do |key|
+          _callbacks_(@directions[key], source, key) 
+        end
+      end
+
+      def invoke_callbacks direction, source
         return unless source
         source.keys.each do |key|
+         _callbacks_(direction, source, key)
+        end
+      end
 
-          if @cache[key] != source[key]
-            @callbacks[key].each do |proc|
-              if direction == :add
-                proc.call(source[key])
-              else
-                proc.call(@cache[key])
-              end
+      def _callbacks_ direction, source, key
+        if @cache[key] != source[key]
+          @callbacks[key].each do |proc|
+            case direction
+            when :add    then proc.call(source[key])
+            when :append then proc.call(@cache[key], source[key])
+            else proc.call(@cache[key])
             end
           end
         end
       end
 
+      def directions source
+        h = Hash.new{|h, k| h[k] = :add}
+        source.each do |key, value|
+          h[key] = source[:"#{key}.direction"].to_sym if source[:"#{key}.direction"]
+        end 
+        h
+      end
+
       def notify_finished_configuring
         OneApm::Manager.agent.events.notify(:finished_configuring)
       end

data/lib/one_apm/inst/framework/sinatra.rb

@@ -137,7 +137,7 @@ module OneApm
 
         def dispatch_with_oneapm
           request_params = get_request_params
-          filtered_params = OneApm::Support::ParameterFiltering::apply_filters(request.env, request_params || {})
+          filtered_params = OneApm::Support::ParameterFiltering.apply_filters(request.env, request_params || {})
 
           name = TransactionNamer.initial_transaction_name(request)
           perform_action_with_oneapm_trace(:category => :sinatra,

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

@@ -21,14 +21,14 @@ LibraryDetection.defer do
       # +raw_call_command+.
 
       call_method = ::Redis::Client.new.respond_to?(:call) ? :call : :raw_call_command
-
+    
       def call_with_oneapm_trace(*args, &blk)
         method_name = args[0].is_a?(Array) ? args[0][0] : args[0]
+        filtered_command = filter method_name
         callback = proc do |result, metric, elapsed|
           _send_to_one_apm(args, elapsed)
         end
-
-        OneApm::Agent::Datastore.wrap("Redis", method_name, nil, callback) do
+        OneApm::Agent::Datastore.wrap("Redis", filtered_command, nil, callback) do
           call_without_oneapm_trace(*args, &blk)
         end
       end
@@ -78,6 +78,16 @@ LibraryDetection.defer do
         end
         OneApm::Agent::Datastore.notice_statement(args.inspect, elapsed)
       end
+
+      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}"
+          nil
+        else
+          command
+        end
+      end
     end
   end
 end

data/lib/one_apm/rack/browser_monitoring.rb

@@ -51,7 +51,6 @@ module OneApm::Rack
 
     def is_streaming?(env)
       return false unless defined?(ActionController::Live)
-
       env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
     end
 

data/lib/one_apm/rack/middleware_base.rb

@@ -22,6 +22,11 @@ module OneApm
         prefix = OneApm::TransactionNamer.prefix_for_category(nil, @category)
         "#{prefix}#{self.class.name}/call"
       end
+
+      def middleware_ignore?
+        OneApm::Manager.config[:disable_rails_middleware]
+      end
+
     end
   end
 end

data/lib/one_apm/rack/middleware_tracing.rb

@@ -55,13 +55,15 @@ module OneApm::Rack
       first_middleware = note_transaction_started(env)
 
       state = OneApm::TransactionState.tl_get
-
       begin
-        OneApm::Transaction.start(state, category, build_transaction_options(env, first_middleware))
-        events.notify(:before_call, env) if first_middleware
+        options = build_transaction_options(env, first_middleware)
+        current_transaction = OneApm::Transaction.start(state, category, options)
 
+        events.notify(:before_call, env) if first_middleware
         result = (target == self) ? traced_call(env) : target.call(env)
 
+        current_transaction.ignore_frames << options[:transaction_name] if respond_to?(:middleware_ignore?) && middleware_ignore?
+
         capture_http_response_code(state, result)
         events.notify(:after_call, env, result) if first_middleware
 

data/lib/one_apm/support/method_tracer/helpers.rb

@@ -39,7 +39,10 @@ module OneApm
             stack = state.traced_method_stack
             create_metrics = options.has_key?(:metric) ? options[:metric] : true
             frame = stack.pop_frame(state, expected_frame, first_name, t1, create_metrics)
-            return unless create_metrics
+            unless create_metrics
+              OneApm::Manager.logger.log_once :debug, "Ignore trace frame: #{first_name}"
+              return 
+            end
 
             duration = t1 - t0
             exclusive = duration - frame.children_time

data/lib/one_apm/transaction/class_methods.rb

@@ -15,8 +15,7 @@ module OneApm
       def start(state, category, options)
         category ||= :controller
         txn = state.current_transaction
-
-        if txn
+        if txn  
           txn.create_nested_frame(state, category, options)
         else
           txn = start_new_transaction(state, category, options)
@@ -30,7 +29,6 @@ module OneApm
 
       def stop(state, end_time=Time.now)
         txn = state.current_transaction
-
         if txn.nil?
           OneApm::Manager.logger.error(Transaction::FAILED_TO_STOP_MESSAGE)
           return
@@ -38,6 +36,9 @@ module OneApm
 
         nested_frame = txn.frame_stack.pop
 
+        options = Transaction::NESTED_TRACE_STOP_OPTIONS
+        options = Transaction::TRACE_IGNORE_OPTIONS  if !txn.ignore_frames.empty? && txn.ignore_frames.include?(nested_frame.name)
+        
         if txn.frame_stack.empty?
           txn.stop(state, end_time, nested_frame)
           state.reset
@@ -56,7 +57,7 @@ module OneApm
             nested_name,
             summary_metrics,
             nested_frame,
-            Transaction::NESTED_TRACE_STOP_OPTIONS,
+            options,
             end_time.to_f)
         end
 

data/lib/one_apm/transaction/metric_constants.rb

@@ -33,7 +33,9 @@ module OneApm
 
     TRACE_OPTIONS_SCOPED         = {:metric => true, :scoped_metric => true}.freeze
     TRACE_OPTIONS_UNSCOPED       = {:metric => true, :scoped_metric => false}.freeze
-
+    
+    TRACE_IGNORE_OPTIONS         = {:metric => false}.freeze
+    
     UNKNOWN_METRIC = '(unknown)'.freeze
 
     FAILED_TO_STOP_MESSAGE = "Failed during Transaction.stop because there is no current transaction"

data/lib/one_apm/transaction.rb

@@ -34,7 +34,8 @@ module OneApm
                   :jruby_cpu_start,
                   :process_cpu_start,
                   :http_response_code,
-                  :request
+                  :request,
+                  :ignore_frames
 
     attr_reader :database_metric_name,
                 :guid,
@@ -69,6 +70,7 @@ module OneApm
       @ignore_this_transaction = false
       @ignore_apdex = false
       @ignore_enduser = false
+      @ignore_frames = options[:ignore_frames] || []
     end
 
     def start(state)
@@ -96,6 +98,8 @@ module OneApm
         trace_options = TRACE_OPTIONS_UNSCOPED
       end
 
+      trace_options = TRACE_IGNORE_OPTIONS if !ignore_frames.empty? && ignore_frames.include?(outermost_frame.name)
+        
       # These metrics are recorded here instead of in record_summary_metrics
       # in order to capture the exclusive time associated with the outer-most
       # TT node.
@@ -231,7 +235,6 @@ module OneApm
       if options[:filtered_params] && !options[:filtered_params].empty?
         @filtered_params = options[:filtered_params]
       end
-
       frame_stack.push OneApm::Support::MethodTracer::Helpers.trace_execution_scoped_header(state, Time.now.to_f)
       name_last_frame(options[:transaction_name])
 

data/lib/one_apm/version.rb

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

data/lib/oneapm_rpm.rb

@@ -13,4 +13,4 @@ elsif defined?(::Goliath) && defined?(::Goliath::Application)
   require 'initializers/goliath'
 else
   require 'initializers/other'
-end
+end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1.rc
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,14 +28,14 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -84,56 +84,56 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: hometown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
@@ -212,8 +212,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
+- .gitignore
+- .rubocop.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -490,12 +491,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
@@ -505,4 +506,3 @@ signing_key:
 specification_version: 4
 summary: OneApm Ruby Agent
 test_files: []
-has_rdoc: