oneapm_rpm 1.3.2 → 1.3.3.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODM4ODhjN2Q1ODM2MjQ5ZWE1MDMyZDFmOTYwN2Q2ZTMzMTNjZDU5MQ==
+    YWIwMWVlY2Q3YmQ5M2JlOWJkOWUxMzNhMDYyNTVlNmI2MDJjZDNkOA==
   data.tar.gz: !binary |-
-    ZDc4OWNmMDdhMWM0MTI2Y2MzMTZjOTY2ODFhZDI4OWE2NGZhYmUzZA==
+    YzgyMWZmMDAzYzU2Y2RiZmFlMTk1MmY5ZjgyZGUzZjRmYzNmOGE1Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZDY0YTYyNDMzMGVkMTJhMDc3NDI5ODgyZWZlM2M4ZjE1ZTc3OTdjMWE4OTc3
-    MWI5OGViZmRiYzdmNzZmNWY1YmY4NDYwZTg5MDM2MTE1ZTljNmQzMGZmOTJi
-    NzcwZmVmNzNlMDkzMWIwYzc0MzA1Mzk5Y2U1MDhlOWIwZDI4MTc=
+    YzUzODczNzQ2ZWZkZTUzNWMwNjVhMmJlNGRjYWY0YzAwZTU1N2E5ZWUyMzE2
+    MWUxNTgzYjc0MmVjZjA3YjRlMjAwMmE1M2YwNjcxOTFkMWNjYzQyMGZjNTMy
+    ZWI4M2FhNWRlOTQzYTRmNTMyNjM1NzQwNGZkOTUzYzk4ZmE3MjA=
   data.tar.gz: !binary |-
-    NzYyOTZhNmNhZjU2YWU1MDZjYmIyNGJkZmVjZGQ2MmVhMmQ3MTI1NGQ0MDAx
-    MDYzMWMzNjNjMmY2YWY3MTY5OGU4OGFjMzQ2MTlkZjEwMDE5MjYwNjA5OTRj
-    ZjQ3NGJmMWVjYzMwNTU0OWIzMGNiODM0Njk0MjhmYzhkODUwNzA=
+    ZTFlZTI5YjA3YzUwNDM4NjdmZmZhNDYyYTAzYjhhNjEyYzdjYzY4NGE1YTc3
+    YTIzZjg0YzRiMjU0YzlmN2FlZTdiODUxYjQ4YTY4YWZhOTI3Y2ZkYmVhMDVh
+    YTA0Y2Y3YWZmYzExZGE5NzM1MWRjNWUyZDU0OGYwMzY3N2MzZGE=

data/lib/one_apm/configuration/default_source.rb

@@ -69,8 +69,11 @@ module OneApm
               :rails3
             when 4
               :rails4
+            when 5
+              :rails5
             else
               OneApm::Manager.logger.error "Detected unsupported Rails version #{Rails::VERSION::STRING}"
+              :rails
             end
           when defined?(::Sinatra) && defined?(::Sinatra::Base) then :sinatra
           when defined?(::OneApm::IA) then :external

data/lib/one_apm/frameworks/rails5.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+require 'one_apm/frameworks/rails4'
+
+module OneApm
+  class Probe
+    module Frameworks
+      class Rails5 < OneApm::Probe::Frameworks::Rails4; end
+    end
+  end
+end

data/lib/one_apm/inst/background_job/active_job.rb

@@ -73,7 +73,12 @@ module OneApm
         end
 
         def self.adapter
-          clean_adapter_name(::ActiveJob::Base.queue_adapter.name)
+          name = if ::ActiveJob::Base.queue_adapter.respond_to?(:name) 
+            ::ActiveJob::Base.queue_adapter.name
+          else
+            ::ActiveJob::Base.queue_adapter.to_s
+          end
+          clean_adapter_name(name)
         end
 
         ADAPTER_REGEX = /ActiveJob::QueueAdapters::(.*)Adapter/

data/lib/one_apm/inst/orm/active_record_4.rb

@@ -18,7 +18,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    OneApm::Manager.logger.info 'Installing ActiveRecord 4 instrumentation'
+    OneApm::Manager.logger.info "Installing ActiveRecord #{::ActiveRecord::VERSION::MAJOR} instrumentation"
   end
 
   executes do

data/lib/one_apm/inst/rails4/action_controller.rb

@@ -6,7 +6,7 @@ LibraryDetection.defer do
   @name = :rails4_controller
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 4
   end
 
   depends_on do
@@ -14,7 +14,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    OneApm::Manager.logger.info 'Installing Rails 4 Controller instrumentation'
+    OneApm::Manager.logger.info "Installing Rails #{::Rails::VERSION::MAJOR} Controller instrumentation"
   end
 
   executes do

data/lib/one_apm/inst/rails4/action_view.rb

@@ -5,7 +5,7 @@ LibraryDetection.defer do
   @name = :rails4_view
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 4
   end
 
   depends_on do
@@ -14,7 +14,7 @@ LibraryDetection.defer do
   end
 
   executes do
-    OneApm::Manager.logger.info 'Installing Rails 4 view instrumentation'
+    OneApm::Manager.logger.info "Installing Rails #{::Rails::VERSION::MAJOR} view instrumentation"
   end
 
   executes do

data/lib/one_apm/inst/rails4/errors.rb

@@ -23,15 +23,15 @@ LibraryDetection.defer do
   @name = :rails4_error
 
   depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 4
   end
 
   depends_on do
-    defined?(ActionController) && defined?(ActionController::Base)
+    defined?(::ActionController) && defined?(::ActionController::Base)
   end
 
   executes do
-    OneApm::Manager.logger.info 'Installing Rails 4 Error instrumentation'
+    OneApm::Manager.logger.info "Installing Rails #{::Rails::VERSION::MAJOR} Error instrumentation"
   end
 
   executes do

data/lib/one_apm/rack/middleware_tracing.rb

@@ -57,13 +57,13 @@ module OneApm::Rack
       state = OneApm::TransactionState.tl_get
       begin
         options = build_transaction_options(env, first_middleware)
+
         current_transaction = OneApm::Transaction.start(state, category, options)
+        current_transaction.ignore_frames << options[:transaction_name] if respond_to?(:middleware_ignore?) && middleware_ignore?
 
         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/transaction.rb

@@ -98,7 +98,7 @@ module OneApm
         trace_options = TRACE_OPTIONS_UNSCOPED
       end
 
-      trace_options = TRACE_IGNORE_OPTIONS if !ignore_frames.empty? && ignore_frames.include?(outermost_frame.name)
+      trace_options = TRACE_IGNORE_OPTIONS if ignore_frame?(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
@@ -219,6 +219,7 @@ module OneApm
     end
 
     def merge_metrics
+      return if ignore_frame?(best_name)
       agent.stats_engine.merge_transaction_metrics!(@metrics, best_name)
     end
 
@@ -297,5 +298,10 @@ module OneApm
       end
     end
 
+    def ignore_frame? tx_name
+      return false if ignore_frames.empty? 
+      ignore_frames.any?{|iframe| tx_name.to_s.match(/#{iframe}/)}
+    end
+
   end
 end

data/lib/one_apm/transaction/class_methods.rb

@@ -35,9 +35,6 @@ module OneApm
         end
 
         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)
@@ -51,6 +48,9 @@ module OneApm
             summary_metrics = Transaction::EMPTY_SUMMARY_METRICS
           end
 
+          options = Transaction::NESTED_TRACE_STOP_OPTIONS
+          options = Transaction::TRACE_IGNORE_OPTIONS  if txn.ignore_frame?(nested_name)
+
           OneApm::Support::MethodTracer::Helpers.trace_execution_scoped_footer(
             state,
             nested_frame.start_time.to_f,

data/lib/one_apm/version.rb

@@ -5,10 +5,11 @@ module OneApm
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
+    TAG   = 'rc1'
 
 
-    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.3.2
+  version: 1.3.3.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -310,6 +310,7 @@ files:
 - lib/one_apm/frameworks/rails.rb
 - lib/one_apm/frameworks/rails3.rb
 - lib/one_apm/frameworks/rails4.rb
+- lib/one_apm/frameworks/rails5.rb
 - lib/one_apm/frameworks/ruby.rb
 - lib/one_apm/frameworks/sinatra.rb
 - lib/one_apm/inst/3rd/active_merchant.rb