oneapm_rpm 1.3.0 → 1.3.1.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmM5MzBlNWY2MWNmZTA3MjlmYjYxY2U2Y2VlODk5NWU2NWJkODA4MQ==
+    MDFiNGM3MmU4Nzc4YWI3NGI4ZmRkZWE0ZWE1MTZlZDcwZDY4Yjg3Zg==
   data.tar.gz: !binary |-
-    ZmQyNGNkZDA0MGRkMWE0ODYwY2YxNzFhNjBhZjg5OWY1OGE2YWY3MA==
+    N2Y1YjMwNWRkNjQ2MDJhMWMxM2VmZWY0ZmE3NTQ2NjBkMGM3YzgzZg==
 SHA512:
   metadata.gz: !binary |-
-    ZDk2ZmVhNjhkYTY1ZDllODk4NmIwNzNiN2Y2YWZkMjUzNDA2NWU3YTViYTJj
-    YTQxMzkxMGZiOTc2YjE5YjY0OWQ5MzJiZWIxOTNhY2VmY2UyYWY3NzViMTQ4
-    OTZmZGQ1OTQ2ZmYzYjk0NjY2MTNjMzBhOGY4NmI5YTA0YWQxYzI=
+    NjliZjM4NTc4ODg5N2YyOGIzZThmOGQyNjM3OGI0OTExOTFhM2IwYzJlOWM2
+    ODY1Y2FlNzkzZWQzYWI3N2U0ZDMwMzQ2MzA4ZTAzMjNjMTEzNWM3YjJmZjA2
+    OGQwNzlkM2JhOTI5NGU0YjZkZmViYjk1ZTEzYjliZWEzMTBiM2Q=
   data.tar.gz: !binary |-
-    MDM3MjBjOGI4ZWRjMzViZmVlNzZlOWVlOWFhYTg3MzY1MmZhYTliM2I5Nzdm
-    ZGQ5YmRiOTAwOWNhMzA0OGJkOWE2NjBmNGNlNGIzNjhlOTkzZDNkOWVjYmQx
-    YWQ3YjRjN2RiZjBmZmFjMjhjOTg4YzYwMmJhZjdiNTQxZjFhNTc=
+    NzYxOWQ5ODVjZjgyOTdhOWE3OWIwMDEyZTYzMjIyNDE1YWYzYzk4ZGRkNDYy
+    N2Y1M2ZjOTNlZWI4OGRhOGM4ZDUzZDUxYTcwMzVmMzg1MGMxODNmOTg5MWQw
+    YjczZjVhMzA5ZmQ4M2QxYmM1ZTY2ZGU4ODdhODUxNTNhYzJkODg=

data/lib/one_apm/configuration/default_source.rb

@@ -872,6 +872,13 @@ module OneApm
         :notified     => false,
         :description  => 'Enable or disable insert js agent as text'
       },
+      :'browser_monitoring.position' => {
+        :default      => '',
+        :public       => true,
+        :type         => String,
+        :notified     => true,
+        :description  => 'position of page which is inerted JavaScript agent.'
+      },
       :js_agent_loader => {
         :default      => '',
         :public       => false,

data/lib/one_apm/inst/http_clients/thrift.rb

@@ -0,0 +1,98 @@
+# encoding: utf-8
+
+module OneApm
+  module Agent
+    module  Instrumentation
+      module ThriftHelper
+
+        def operator result_klass
+          namespaces = result_klass.to_s.split('::')
+          operator_name = 'unknown'
+          if namespaces.last =~ /_result/
+            operator_name = namespaces.last.sub('_result', '').downcase
+          end
+          operator_name
+        end
+
+        def thost
+         @thost ||= @iprot.instance_variable_get("@trans") \
+          .instance_variable_get("@transport") \
+          .instance_variable_get("@host") rescue nil
+        end
+
+        def metrics operator_name
+          metrics = if thost.nil?
+                      ["External/Thrift/#{operator_name}"]
+                    else
+                      ["External/#{thost}/Thrift/#{operator_name}", "External/#{thost}/all"]
+                    end
+          metrics << "External/all"
+          if OneApm::Transaction.recording_web_transaction?
+            metrics << "External/allWeb"
+          else
+            metrics << "External/allOther"
+          end
+          metrics
+        end
+
+        def started_time op
+          _op_ = operations.delete(op)
+          (_op_ && _op_[:started_time]) or Time.now.to_f
+        end
+
+        def operations
+          @operations ||= {}
+        end
+      end
+    end
+  end
+end
+
+LibraryDetection.defer do
+  named :thrift
+
+  depends_on do
+    defined?(::Thrift) && defined?(::Thrift::Client)
+  end
+
+  executes do
+    OneApm::Manager.logger.info 'Installing Thrift instrumentation'
+  end
+
+  executes do
+    ::Thrift::Client.module_eval do 
+      include OneApm::Agent::Instrumentation::ThriftHelper
+
+      def send_message_with_oneapm(name, args_class, args = {})
+        operations[name] = {:started_time => Time.now.to_f}
+        send_message_without_oneapm(name, args_class, args)
+      end
+      alias :send_message_without_oneapm :send_message
+      alias :send_message :send_message_with_oneapm
+
+      def send_oneway_message_with_oneapm(name, args_class, args = {})
+        op_started = Time.now.to_f
+        base, *other_metrics = metrics(name)
+        result = send_oneway_message_without_oneapm(name, args_class, args)
+        duration = Time.now.to_f - op_started
+        OneApm::Manager.agent.stats_engine.tl_record_scoped_and_unscoped_metrics(base, other_metrics, duration)
+        result
+      end
+      alias :send_oneway_message_without_oneapm :send_oneway_message
+      alias :send_oneway_message :send_oneway_message_with_oneapm
+
+      def receive_message_with_oneapm(result_klass)
+        op = operator(result_klass)
+        op_started = started_time(op)
+        base, *other_metrics = metrics(op)
+        result = receive_message_without_oneapm(result_klass)
+        duration = Time.now.to_f - op_started
+        OneApm::Manager.agent.stats_engine.tl_record_scoped_and_unscoped_metrics(base, other_metrics, duration)
+        result
+      end
+
+      alias :receive_message_without_oneapm :receive_message
+      alias :receive_message :receive_message_with_oneapm
+    end
+  end
+end

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

@@ -64,13 +64,13 @@ module OneApm
           base, *other_metrics = mertircs(event)
 
           started_time = Time.now.to_f
-          frame = stack.push_frame(state, :mongo_tracer, started_time)
+          frame = stack.push_frame(state, :mongo_tracer, started_time - duration)
 
           builder = state.transaction_sample_builder
           format_sql = OneApm::Agent::Datastore::Mongo::CommandFormatter.format_sql(event, status)
           OneApm::Manager.agent.transaction_sampler.send(:notice_extra_data, builder, format_sql, duration, :sql)
 
-          stack.pop_frame(state, frame, base, started_time + duration)
+          stack.pop_frame(state, frame, base, started_time)
         end
 
         def one_apm_notice_statement(event, status, duration)

data/lib/one_apm/rack/browser_monitoring.rb

@@ -80,13 +80,35 @@ module OneApm::Rack
     end 
 
     def autoinstrument_source(response, headers, js_to_inject)
-      source = gather_source(response)
-      close_old_response(response)
-      return nil unless source
+      begin
+        source = gather_source(response)
+        close_old_response(response)
+        return nil unless source
+        inject_js(source, headers, js_to_inject)
+      rescue => e
+        OneApm::Manager.logger.debug "Skipping RUM instrumentation on exception.", e
+        nil
+      end
+    end
 
-      # Only scan the first 50k (roughly) then give up.
-      beginning_of_source = source[0..SCAN_LIMIT]
+    def inject_js source, headers, js_to_inject
+      position = OneApm::Manager.config[:'browser_monitoring.position']
+      insertion_index = (position.empty? || position.to_sym != :footer) ? header_index(source) : footer_index(source)
+      if insertion_index
+        source = source[0...insertion_index] \
+          << js_to_inject \
+          << source[insertion_index..-1]
+        if headers['Content-Length']
+          headers['Content-Length'] = calculate_content_length(source).to_s
+        end
+      else
+        OneApm::Manager.logger.debug "Skipping RUM instrumentation. Could not properly determine location to inject script."
+      end
+      source
+    end
 
+    def header_index source
+      beginning_of_source = source[0..SCAN_LIMIT]
       if body_start = find_body_start(beginning_of_source)
         meta_tag_positions = [
           find_x_ua_compatible_position(beginning_of_source),
@@ -98,28 +120,24 @@ module OneApm::Rack
         else
           insertion_index = find_end_of_head_open(beginning_of_source) || body_start
         end
-
-        if insertion_index
-          source = source[0...insertion_index] <<
-            js_to_inject <<
-            source[insertion_index..-1]
-        else
-          OneApm::Manager.logger.debug "Skipping RUM instrumentation. Could not properly determine location to inject script."
-        end
+        insertion_index
       else
         msg = "Skipping RUM instrumentation. Unable to find <body> tag in first #{SCAN_LIMIT} bytes of document."
         OneApm::Manager.logger.log_once(:warn, :rum_insertion_failure, msg)
         OneApm::Manager.logger.debug(msg)
+        nil
       end
+    end
 
-      if headers['Content-Length']
-        headers['Content-Length'] = calculate_content_length(source).to_s
+    def footer_index source
+      if body_end = find_body_end(source)
+        body_end
+      else
+        msg = "Skipping RUM instrumentation. Unable to find </body> tag from document."
+        OneApm::Manager.logger.log_once(:warn, :rum_insertion_failure, msg)
+        OneApm::Manager.logger.debug(msg)
+        nil
       end
-
-      source
-    rescue => e
-      OneApm::Manager.logger.debug "Skipping RUM instrumentation on exception.", e
-      nil
     end
 
     def gather_source(response)
@@ -140,6 +158,10 @@ module OneApm::Rack
       beginning_of_source.index("<body")
     end
 
+    def find_body_end source
+      source.rindex("</body>")
+    end
+
     def find_x_ua_compatible_position(beginning_of_source)
       match = X_UA_COMPATIBLE_RE.match(beginning_of_source)
       match.end(0) if match

data/lib/one_apm/version.rb

@@ -5,11 +5,11 @@ module OneApm
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 0
+    TINY  = 1
+    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.0
+  version: 1.3.1.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -337,6 +337,7 @@ files:
 - lib/one_apm/inst/http_clients/excon/middleware.rb
 - lib/one_apm/inst/http_clients/httpclient.rb
 - lib/one_apm/inst/http_clients/net.rb
+- lib/one_apm/inst/http_clients/thrift.rb
 - lib/one_apm/inst/http_clients/typhoeus.rb
 - lib/one_apm/inst/nosql/memcache.rb
 - lib/one_apm/inst/nosql/mongo.rb