tingyun_rpm 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50bb695bb83ad9675c4a47086f7f2a5e326207a9
-  data.tar.gz: 112c143fc64d673606db5703acf36f3c622beaf2
+  metadata.gz: 1312053248f2f8ee7864297cbd3b53e7c72f8c24
+  data.tar.gz: 209f00934dcbd9b67152afbf30bba4a9daa87f1e
 SHA512:
-  metadata.gz: ffd6c131b719fd67ce6738b7c100966bff3fc11b71af209288497461d913601e8f0f7c21f12361564263226eec68c1b72f29dfed0be94bbe0ad054eaf1389ed9
-  data.tar.gz: bcc3e5c521ce1207d6c9b6d37ba4fd3f7d11dd0f3d7efefea03553724db8d075aad32dc4f307a2343e8a44acbc995630cdb9a456c2144414131ac481ad5e2ac7
+  metadata.gz: f030da33af531d464405b2f5842d4914273640b22af31cfb796c2b69027cb9c719f263c3fb7645d9ada5198716d469083529ad2ef5cc520784ac4cb50573a836
+  data.tar.gz: c13ba652fdf33e0cbbe29fabcef3f2cdb348e8c76ab47bfbaa1f904c3e47aea587f90a8137794cef801b6ce5da5323a1167fd26f8dde8eb5e025f66d88cfd314

data/lib/ting_yun/agent.rb

@@ -63,10 +63,14 @@ module TingYun
     # This method is safe to use from any thread.
     #
     # @api public
-    def record_metric(metric_name, value) #THREAD_LOCAL_ACCESS
+    def record_metric(metric_name, value, is_scoped=false ) #THREAD_LOCAL_ACCESS
       return unless agent
       stats = TingYun::Metrics::Stats.create_from_hash(value) if value.is_a?(Hash)
-      agent.stats_engine.tl_record_unscoped_metrics(metric_name, stats || value)
+      if is_scoped
+        agent.stats_engine.tl_record_scoped_metrics(metric_name, stats || value)
+      else
+        agent.stats_engine.tl_record_unscoped_metrics(metric_name, stats || value)
+      end
     end
 
     # Manual agent configuration and startup/shutdown
@@ -185,5 +189,16 @@ module TingYun
       agent.shutdown if agent
     end
 
+    # if you wanna call the method, you must make sure current_transaction is not nil at first
+    # if current_transaction
+    #    add_custom_params(:key1,:value1)
+    #    add_custom_params(:key2,:value2)
+    # end
+    # public api
+    def add_custom_params(key, value)
+      txn = TingYun::Agent::TransactionState.tl_get.current_transaction
+      txn.attributes.add_custom_params(key, value) if txn
+    end
+
   end
 end

data/lib/ting_yun/agent/collector/stats_engine/metric_stats.rb

@@ -66,6 +66,24 @@ module TingYun
             end
           end
 
+          def tl_record_scoped_metrics(metric_names, value=nil, aux=nil, &blk)
+            state = TingYun::Agent::TransactionState.tl_get
+            record_scoped_metrics(state, metric_names, value, aux, &blk)
+          end
+
+          def record_scoped_metrics(state, metric_names, value=nil, aux=nil,  &blk)
+            txn = state.current_transaction
+
+            if txn
+              txn.metrics.record_scoped(metric_names, value, aux, &blk)
+            else
+              specs = coerce_to_metric_spec_array(metric_names, nil)
+              with_stats_lock do
+                @stats_hash.record(specs, value, aux, &blk)
+              end
+            end
+          end
+
           # Like tl_record_unscoped_metrics, but records a scoped metric as well.
           #
           # This is an internal method, subject to change at any time. Client apps

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

@@ -62,15 +62,23 @@ module TingYun
           if request
             cross_app = response_is_cross_app?(response)
 
-            metrics = metrics_for(request, response, cross_app)
+            metrics = metrics_for(request)
             node_name = metrics.pop
-            scoped_metric = metrics.pop
-
-            ::TingYun::Agent.instance.stats_engine.record_scoped_and_unscoped_metrics(state, scoped_metric, metrics, duration)
+            tx_data = TingYun::Support::Serialize::JSONWrapper.load(get_ty_data_header(response).gsub("'",'"')) || {}
+            # net_block_duration = tx_data["time"]? duration - tx_data["time"]["duration"]- tx_data["time"]["qu"] : duration
+            # net_block_duration = duration if net_block_duration < 0
+            ::TingYun::Agent.instance.stats_engine.record_scoped_and_unscoped_metrics(state, node_name, metrics, duration)
+            if cross_app
+              _duration =  tx_data["time"]["duration"] + tx_data["time"]["qu"] + 0.1
+              metrics_cross_app = metrics_for_cross_app(request, response)
+              txn = state.current_transaction
+              txn.metrics.record_scoped(metrics_cross_app.pop, duration, _duration)
+              txn.metrics.record_unscoped(metrics_cross_app, _duration)
+            end
 
             if node
               node.name = node_name
-              add_transaction_trace_info(request, response, cross_app)
+              add_transaction_trace_info(request, response, cross_app, tx_data)
             end
           end
         rescue => err
@@ -84,52 +92,35 @@ module TingYun
       end
 
 
-      def add_transaction_trace_info(request, response, cross_app)
+      def add_transaction_trace_info(request, response, cross_app, tx_data)
         state = TingYun::Agent::TransactionState.tl_get
         ::TingYun::Agent::Collector::TransactionSampler.add_node_info(:uri => TingYun::Agent::HTTPClients::URIUtil.filter_uri(request.uri))
         if cross_app
-          ::TingYun::Agent::Collector::TransactionSampler.tl_builder.set_txId_and_txData(state.client_transaction_id || state.request_guid,
-                                                                                         TingYun::Support::Serialize::JSONWrapper.load(get_ty_data_header(response).gsub("'",'"')))
+          ::TingYun::Agent::Collector::TransactionSampler.tl_builder.set_txId_and_txData(state.client_transaction_id || state.request_guid, tx_data)
         end
       end
 
 
-      def metrics_for(request, response, cross_app)
+      def metrics_for_cross_app(request, response)
+        my_data =  TingYun::Support::Serialize::JSONWrapper.load get_ty_data_header(response).gsub("'",'"')
+        metrics = ["ExternalTransaction/NULL/#{my_data["id"]}",
+                   "ExternalTransaction/http/#{my_data["id"]}"]
+        metrics << "ExternalTransaction/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{my_data["id"]}%2F#{my_data["action"].to_s.gsub(/\/\z/,'')}"
+      end
 
+      def metrics_for(request)
         metrics = [ "External/NULL/ALL" ]
-
         if TingYun::Agent::Transaction.recording_web_transaction?
           metrics << "External/NULL/AllWeb"
         else
           metrics << "External/NULL/AllBackground"
         end
-
-        if cross_app
-          begin
-            metrics.concat metrics_for_cross_app_response( request, response )
-          rescue => err
-            # Fall back to regular metrics if there's a problem with x-process metrics
-            TingYun::Agent.logger.debug "%p while fetching x-process metrics: %s" %
-                                            [ err.class, err.message ]
-            metrics.concat metrics_for_regular_request( request )
-          end
-        else
-          metrics.concat metrics_for_regular_request( request )
-        end
-
-        return metrics
-      end
-
-
-      def metrics_for_regular_request( request )
-        metrics = []
-        metrics << "External/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
         metrics << "External/#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
-
         return metrics
       end
 
 
+
       def cross_app_enabled?
         TingYun::Agent.config[:tingyunIdSecret] && TingYun::Agent.config[:tingyunIdSecret].size > 0 &&
             TingYun::Agent.config[:'nbs.action_tracer.enabled'] &&
@@ -148,28 +139,18 @@ module TingYun
       def response_is_cross_app?( response )
         return false unless response
         return false unless cross_app_enabled?
-        return false unless get_ty_data_header(response)
+        return false if get_ty_data_header(response).empty?
 
         return true
       end
 
-      # Return the set of metric objects appropriate for the given cross app
-      # +response+.
-      def metrics_for_cross_app_response(request, response )
-        my_data =  TingYun::Support::Serialize::JSONWrapper.load get_ty_data_header(response).gsub("'",'"')
-        uri = "#{request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{request.from}"
-        metrics = []
-        metrics << "cross_app;#{my_data["id"]};#{my_data["action"]};#{uri}"
-        metrics << "External/#{my_data["action"]}:#{uri}"
 
-        return metrics
-      end
 
       def get_ty_data_header(response)
         if defined?(::HTTP) && defined?(::HTTP::Message) && response.class == ::HTTP::Message
-          response.header[TY_DATA_HEADER].first rescue nil
+          response.header[TY_DATA_HEADER].first.to_s rescue ""
         else
-          response[TY_DATA_HEADER] rescue nil
+          response[TY_DATA_HEADER].to_s rescue ""
         end
       end
     end

data/lib/ting_yun/agent/transaction.rb

@@ -75,6 +75,7 @@ module TingYun
 
         @has_children = false
         @category = category
+        @is_mq = options[:mq] || false
 
         @guid = client_transaction_id || generate_guid
         @frame_stack = []
@@ -97,6 +98,9 @@ module TingYun
         @request_attributes && @request_attributes.port
       end
 
+      def frozen_name=(name)
+        @frozen_name = name
+      end
 
       def start(state)
         return if !state.execution_traced?
@@ -117,7 +121,7 @@ module TingYun
 
         freeze_name_and_execute
 
-        if @has_children
+        if @has_children or @is_mq
           name = Transaction.nested_transaction_name(outermost_frame.name)
           trace_options = TRACE_OPTIONS_SCOPED
         else
@@ -141,7 +145,7 @@ module TingYun
             trace_options,
             end_time.to_f)
 
-        commit(state, end_time, name) unless ignore(best_name)
+        commit(state, end_time, name)
       end
 
 

data/lib/ting_yun/agent/transaction/class_method.rb

@@ -130,6 +130,11 @@ module TingYun
           txn.name_last_frame(node_name || name)
           txn.set_default_transaction_name(name, category)
         end
+
+        def set_frozen_transaction_name!(name) #THREAD_LOCAL_ACCESS
+          txn  = tl_current
+          txn.frozen_name = name
+        end
       end
     end
   end

data/lib/ting_yun/agent/transaction/transaction_metrics.rb

@@ -6,6 +6,7 @@ module TingYun
     class TransactionMetrics
       DEFAULT_PROC = Proc.new { |hash, name| hash[name] = TingYun::Metrics::Stats.new }
 
+
       def initialize
         @unscoped = Hash.new(&DEFAULT_PROC)
         @scoped   = Hash.new(&DEFAULT_PROC)

data/lib/ting_yun/agent/transaction/transaction_state.rb

@@ -27,6 +27,7 @@ module TingYun
 
 
 
+
       def self.tl_get
         tl_state_for(Thread.current)
       end
@@ -160,12 +161,12 @@ module TingYun
       # end
       # public api
       def add_custom_params(key, value)
-        current_transaction.attributes.add_custom_params(key, value)
+        current_transaction.attributes.add_custom_params(key, value) if current_transaction
       end
 
       # same to add_custom_params
       def merge_request_parameters(hash)
-        current_transaction.attributes.merge_request_parameters(hash)
+        current_transaction.attributes.merge_request_parameters(hash) if current_transaction
       end
 
       def add_current_node_params(hash)

data/lib/ting_yun/instrumentation/bunny.rb

@@ -88,27 +88,25 @@ TingYun::Support::LibraryDetection.defer do
             end
 
             state.save_referring_transaction_info(tingyun_id_secret.split(';')) if cross_app_enabled?(tingyun_id_secret)
-            TingYun::Agent::Transaction.start(state,:message, { :transaction_name => transaction_name})
+
             summary_metrics = TingYun::Agent::Datastore::MetricHelper.metrics_for_message('RabbitMQ', "#{@channel.connection.host}:#{@channel.connection.port}", 'Consume')
-            TingYun::Agent::Transaction.wrap(state, "Message RabbitMQ/#{metric_name}" , :RabbitMq, {}, summary_metrics)  do
-              TingYun::Agent.record_metric("MessageRabbitMQ/#{metric_name}%2FByte",args[2].bytesize) if args[2]
+
+            TingYun::Agent::Transaction.wrap(state, "Message RabbitMQ/#{metric_name}" , :RabbitMq, {:mq=> true}, summary_metrics)  do
+              TingYun::Agent::Transaction.set_frozen_transaction_name!(transaction_name)
+              TingYun::Agent.record_metric("Message RabbitMQ/#{metric_name}%2FByte",args[2].bytesize) if args[2]
               TingYun::Agent.record_metric("Message RabbitMQ/#{metric_name}%2FWait", TingYun::Helper.time_to_millis(Time.now)-state.externel_time.to_i) rescue 0
-              if state.current_transaction
-                state.add_custom_params("message.byte",args[2].bytesize)
-                state.add_custom_params("message.wait",TingYun::Helper.time_to_millis(Time.now)-state.externel_time.to_i)
-                state.add_custom_params("message.routingkey",queue_name)
-                state.current_transaction.attributes.add_agent_attribute(:tx_id, state.client_transaction_id)
-                headers.delete("TingyunID")
-                state.merge_request_parameters(headers)
-              end
+              state.add_custom_params("message.byte",args[2].bytesize)
+              state.add_custom_params("message.wait",TingYun::Helper.time_to_millis(Time.now)-state.externel_time.to_i)
+              state.add_custom_params("message.routingkey",queue_name)
+              state.current_transaction.attributes.add_agent_attribute(:tx_id, state.client_transaction_id)
+              headers.delete("TingyunID")
+              state.merge_request_parameters(headers)
               call_without_tingyun(*args)
+              state.current_transaction.attributes.add_agent_attribute(:entryTrace, build_payload(state)) if state.same_account? && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
             end
-            state.current_transaction.attributes.add_agent_attribute(:entryTrace, build_payload(state)) if state.same_account? && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
           rescue => e
             TingYun::Agent.logger.error("Failed to Bunny call_with_tingyun : ", e)
             call_without_tingyun(*args)
-          ensure
-            TingYun::Agent::Transaction.stop(state, Time.now, summary_metrics)
           end
 
         end

data/lib/ting_yun/instrumentation/http_client.rb

@@ -41,7 +41,7 @@ TingYun::Support::LibraryDetection.defer do
             args[1] = (::Module.private_method_defined? :to_resource_url) ? to_resource_url(args[1]) : urify(args[1])
             proxy = no_proxy?(args[1]) ? nil : @proxy
             tingyun_request = TingYun::Http::HttpClientRequest.new(proxy, *args, &block)
-            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{tingyun_request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/http_client%2Fhttp")
+            ::TingYun::Instrumentation::Support::ExternalError.handle_error(e, "External/#{tingyun_request.uri.to_s.gsub(/\/\z/,'').gsub('/','%2F')}/#{tingyun_request.from}")
             raise e
           end
         end

data/lib/ting_yun/instrumentation/sidekiq.rb

@@ -25,6 +25,7 @@ TingYun::Support::LibraryDetection.defer do
                        self.class.default_trace_args(msg)
                      end
         perform_action_with_tingyun_trace(trace_args) do
+          TingYun::Agent.add_custom_params(:job_arguments, msg['args'])
           yield
         end
       end

data/lib/ting_yun/instrumentation/support/javascript_instrumentor.rb

@@ -11,27 +11,18 @@ module TingYun
         module_function
 
         def browser_timing_header #THREAD_LOCAL_ACCESS
-          return '' unless rum_enable? # unsupport insert script
-
           state = TingYun::Agent::TransactionState.tl_get
           return '' unless insert_js?(state)
-
-          bt_config = browser_timing_config(state)
-
+          bt_config = TingYun::Support::Serialize::JSONWrapper.dump(browser_timing_config(state))
           return '' if bt_config.empty?
-
-          if TingYun::Agent.config[:'nbs.rum.mix_enabled']
-            html_safe_if_needed("<script>(function(w){(w._ty_rum || (w._ty_rum = {})).agent = #{bt_config};})(window);</script>")
-          else
-            html_safe_if_needed("<script>#{browser_instrument("ty_rum.agent=#{bt_config}")}</script>")
-          end
+          html_safe_if_needed("<script>#{browser_instrument("ty_rum.agent=#{bt_config}")}</script>")
         rescue => e
           ::TingYun::Agent.logger.debug "Failure during RUM browser_timing_header construction", e
           ''
         end
 
         def rum_enable?
-           TingYun::Agent.config[:'nbs.rum.enabled']
+          TingYun::Agent.config[:'nbs.rum.enabled']
         end
 
         def insert_js?(state)
@@ -59,8 +50,8 @@ module TingYun
               :q => timings.queue_time_in_millis,
               :tid => state.trace_id
           }
-          TingYun::Support::Serialize::JSONWrapper.dump(data)
-        end
+          data
+      end
 
         def html_safe_if_needed(string)
           string = string.html_safe if string.respond_to?(:html_safe)

data/lib/ting_yun/instrumentation/support/queue_time.rb

@@ -8,6 +8,7 @@ module TingYun
         unless defined?(REQUEST_START_HEADER)
           REQUEST_START_HEADER = 'HTTP_X_REQUEST_START'.freeze
           QUEUE_START_HEADER = 'HTTP_X_QUEUE_START'.freeze
+          X_QUEUE_START           = 'X-QUEUE-START'.freeze
           MIDDLEWARE_START_HEADER = 'HTTP_X_MIDDLEWARE_START'.freeze
           ALL_QUEUE_METRIC = 'WebFrontend/QueueTime'.freeze
           # any timestamps before this are thrown out and the parser
@@ -17,6 +18,7 @@ module TingYun
           CANDIDATE_HEADERS = [
               REQUEST_START_HEADER,
               QUEUE_START_HEADER,
+              X_QUEUE_START,
               MIDDLEWARE_START_HEADER
           ].freeze
 

data/lib/ting_yun/instrumentation/support/thrift_helper.rb

@@ -43,11 +43,10 @@ module TingYun
       end
 
       def metrics operate
-        state = TingYun::Agent::TransactionState.tl_get
         metrics = if tingyun_host.nil?
-                    ["External/thrift:%2F%2F#{operate}/#{operate}"]
+                    ["External/thrift:%2F%2F#{operate}/thrift"]
                   else
-                    ["External/thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{operate}"]
+                    ["External/thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/thrift"]
                   end
         metrics << "External/NULL/ALL"
 
@@ -56,18 +55,16 @@ module TingYun
         else
           metrics << "External/NULL/AllBackground"
         end
-
-
-        my_data = state.thrift_return_data
-
-
-        if my_data && TingYun::Agent.config[:'nbs.transaction_tracer.thrift'] && TingYun::Agent.config[:'nbs.transaction_tracer.enabled']
-          uri = "thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{operate}"
-          metrics << "cross_app;#{my_data["id"]};#{my_data["action"]};#{uri}"
-        end
         return metrics
+      end
 
+      def metrics_for_cross_app(operate,my_data)
+        metrics = ["ExternalTransaction/NULL/#{my_data["id"]}",
+                   "ExternalTransaction/thrift/#{my_data["id"]}",
+                   "ExternalTransaction/thrift:%2F%2F#{tingyun_host}:#{tingyun_port}%2F#{operate}/#{my_data["id"]}%2F#{my_data["action"].to_s.gsub(/\/\z/,'')}"]
+        return metrics
       end
+
     end
   end
 end

data/lib/ting_yun/instrumentation/thrift.rb

@@ -28,11 +28,13 @@ TingYun::Support::LibraryDetection.defer do
             if data.include?("TingyunTxData")
               my_data = TingYun::Support::Serialize::JSONWrapper.load data.gsub("'",'"')
               TingYun::Agent::TransactionState.process_thrift_data(my_data["TingyunTxData"])
+
             end
           end
         end
       end
 
+
       alias :skip_without_tingyun :skip
       alias :skip  :skip_with_tingyun
     end
@@ -123,10 +125,18 @@ TingYun::Support::LibraryDetection.defer do
           t1 = Time.now.to_f
           node_name, *other_metrics = metrics(operate)
           duration = TingYun::Helper.time_to_millis(t1 - t0)
-
+          my_data = state.thrift_return_data || {}
+          # net_block_duration = my_data["time"]? duration - my_data["time"]["duration"]- my_data["time"]["qu"] : duration
+          # net_block_duration = duration if net_block_duration < 0
           TingYun::Agent.instance.stats_engine.tl_record_scoped_and_unscoped_metrics(
-              other_metrics.pop, other_metrics, duration
+              node_name, other_metrics, duration
           )
+
+          if my_data["time"]
+            metrics_cross_app = metrics_for_cross_app(operate, my_data)
+            _duration =  my_data["time"]["duration"] + my_data["time"]["qu"] + 0.1
+            ::TingYun::Agent.instance.stats_engine.record_scoped_and_unscoped_metrics(state, metrics_cross_app.pop, metrics_cross_app, duration, _duration)
+          end
           if node
             node.name = node_name
             ::TingYun::Agent::Collector::TransactionSampler.add_node_info(:uri => "thrift:#{tingyun_host}:#{tingyun_port}/#{operate}")

data/lib/ting_yun/metrics/metric_spec.rb

@@ -8,7 +8,7 @@
 module TingYun
   module Metrics
     class MetricSpec
-      attr_accessor :name, :scope, :calleeId, :calleeName, :full_name
+      attr_accessor :name, :scope, :full_name
 
       # the maximum length of a metric name or metric scope
       MAX_LENGTH = 255
@@ -85,8 +85,6 @@ module TingYun
 
       def to_hash
         hash =  { 'name' => name }
-        hash['calleeId'] = calleeId if calleeId
-        hash['calleeName'] = calleeName if calleeName
         unless scope.empty?
           hash['parent'] = scope
         end

data/lib/ting_yun/metrics/stats.rb

@@ -119,11 +119,11 @@ module TingYun
       def record_data_point(value, exclusive_time = value)
         @call_count += 1
         @total_call_time += value
-        @min_call_time = value if value < @min_call_time || @call_count == 1
-        @max_call_time = value if value > @max_call_time
+        @min_call_time = exclusive_time if exclusive_time < @min_call_time || @call_count == 1
+        @max_call_time = exclusive_time if exclusive_time > @max_call_time
         @total_exclusive_time += exclusive_time
 
-        @sum_of_squares += (value * value)
+        @sum_of_squares += (exclusive_time * exclusive_time)
         self
       end
 

data/lib/ting_yun/middleware/browser_monitoring.rb

@@ -1,11 +1,13 @@
 # encoding: utf-8
 require 'ting_yun/middleware/agent_middleware'
 require 'ting_yun/instrumentation/support/javascript_instrumentor'
-
+require 'ting_yun/support/coerce'
 
 module TingYun
   class BrowserMonitoring < AgentMiddleware
 
+    include TingYun::Support::Coerce
+
     CONTENT_TYPE        = 'Content-Type'.freeze
     TEXT_HTML           = 'text/html'.freeze
     CONTENT_DISPOSITION = 'Content-Disposition'.freeze
@@ -26,15 +28,28 @@ module TingYun
     def traced_call(env)
       result = @app.call(env)   # [status, headers, response]
 
-      js_to_inject = TingYun::Instrumentation::Support::JavascriptInstrument.browser_timing_header
-
-      if (js_to_inject != '') && should_instrument?(env, result[0], result[1])
-        response_string = auto_instrument_source(result[2], js_to_inject)
-
-        env[ALREADY_INSTRUMENTED_KEY] = true
-        if response_string
-          response = Rack::Response.new(response_string, result[0], result[1])
-          response.finish
+      if should_instrument?(env, result[0], result[1])
+        if rum_enable? # unsupport insert script
+          if TingYun::Agent.config[:'nbs.rum.mix_enabled']
+            result[1]["Set-Cookie"] = "TINGYUN_DATA=#{manufacture_cookie}"
+            env[ALREADY_INSTRUMENTED_KEY] = true
+            result
+          else
+            js_to_inject = TingYun::Instrumentation::Support::JavascriptInstrument.browser_timing_header
+            if (js_to_inject != '')
+              response_string = auto_instrument_source(result[2], js_to_inject)
+
+              env[ALREADY_INSTRUMENTED_KEY] = true
+              if response_string
+                response = Rack::Response.new(response_string, result[0], result[1])
+                response.finish
+              else
+                result
+              end
+            else
+              result
+            end
+          end
         else
           result
         end
@@ -65,6 +80,29 @@ module TingYun
       headers[CONTENT_DISPOSITION] && headers[CONTENT_DISPOSITION].include?(ATTACHMENT)
     end
 
+    def rum_enable?
+      TingYun::Agent.config[:'nbs.rum.enabled']
+    end
+
+    def manufacture_cookie
+      state = TingYun::Agent::TransactionState.tl_get
+      timings = state.timings
+      "%7B%22id%22%3A%22#{TingYun::Support::Coerce.url_encode(TingYun::Agent.config[:tingyunIdSecret].to_s)}%22%2C%22n%22%3A%22#{TingYun::Support::Coerce.url_encode(state.transaction_name.to_s)}%22%2C%22tid%22%3A%22#{state.trace_id}%22%2C%22q%22%3A#{timings.queue_time_in_millis}%2C%22a%22%3A#{timings.app_time_in_millis}%7D"
+    end
+    def browser_timing_config(state)
+      timings = state.timings
+
+      data = {
+          :id => TingYun::Agent.config[:tingyunIdSecret],
+          :n => state.transaction_name ,
+          :a => timings.app_time_in_millis,
+          :q => timings.queue_time_in_millis,
+          :tid => state.trace_id
+      }
+      data
+    end
+
+
     def auto_instrument_source(response, js_to_inject)
       source = gather_source(response)
       close_old_response(response)

data/lib/ting_yun/support/coerce.rb

@@ -45,6 +45,11 @@ module TingYun
         ""
       end
 
+      def url_encode(s)
+        s.to_s.b.gsub(/[^a-zA-Z0-9_\-.]/n) { |m|
+          sprintf("%%%02X", m.unpack("C")[0])
+        }
+      end
       # Convert a hash into a format acceptable to be included with Transaction
       # event data.
       #

data/lib/ting_yun/ting_yun_service/upload_service.rb

@@ -68,22 +68,11 @@ module TingYun
               adpex_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
             elsif metric_spec.name.start_with?('Errors') && metric_spec.scope.empty?
               errors_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
-            elsif metric_spec.name.start_with?('cross_app')
-              external =  metric_spec.name.split(';')
-              if metric_spec.scope.empty?
-                metric_spec.name = "ExternalTransaction/NULL/#{external[1]}"
-                general_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
-              else
-                metric_spec.name = "External/#{external[3]}"
-                metric_spec.calleeId = external[1]
-                metric_spec.calleeName = external[2]
-                components_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
-              end
             else
               if metric_spec.scope.empty?
-                general_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)
+                general_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id)  unless metric_spec.name.start_with?("View","Middleware","Nested","Rack")
               else
-                components_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id) unless metric_spec.name.start_with?('External/NULL')
+                components_array << TingYun::Metrics::MetricData.new(metric_spec, stats, metric_id) unless metric_spec.name.start_with?("Nested")
               end
             end
 

data/lib/ting_yun/version.rb

@@ -6,7 +6,10 @@ module TingYun
 
     MAJOR = 1
 
-    MINOR = 3
+    MINOR = 4
+
+
+
 
     TINY = 1
 
@@ -14,6 +17,7 @@ module TingYun
 
 
 
+
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake