oneapm_rpm 1.3.7 → 1.4.0

data/lib/one_apm/collector/collector_service.rb

@@ -19,7 +19,7 @@ module OneApm
       OA_PROTOCOL_VERSION = 1
 
       attr_accessor :request_timeout, :agent_id
-      attr_reader :collector,:marshaller, :metric_id_cache
+      attr_reader :collector, :marshaller, :metric_id_cache
 
       def initialize(license_key = nil, collector = nil)
         @license_key = license_key || OneApm::Manager.config[:license_key]
@@ -67,13 +67,11 @@ module OneApm
         timeslice_end   = stats_hash.harvested_at || Time.now
 
         metric_data_array = build_metric_data_array(stats_hash)
-
         result = invoke_remote(
           :metric_data,
           [@agent_id, timeslice_start.to_f, timeslice_end.to_f, metric_data_array],
           :item_count => metric_data_array.size
         )
-
         fill_metric_id_cache(result)
         result
       end
@@ -107,7 +105,7 @@ module OneApm
       end
 
       def analytic_event_data(data)
-        invoke_remote(:analytic_event_data, [@agent_id, data], :item_count => data.size)
+        invoke_remote(:analytic_event_data, data, :item_count => data.size)
       end
 
       def custom_event_data(data)
@@ -118,6 +116,10 @@ module OneApm
         invoke_remote(:utilization_data, data)
       end
 
+      def fetch_config
+        invoke_remote(:get_external_rule,[],{},:hash_value=>0)
+      end
+
     end
   end
 end

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

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require 'monitor'
+require 'one_apm/transaction/event_analytic_sample'
+require 'one_apm/transaction/event_analytic_data'
 
 class OneApm::Collector::TransactionEventAggregator
   include OneApm::Coerce, MonitorMixin
@@ -69,6 +71,7 @@ class OneApm::Collector::TransactionEventAggregator
     old_samples, sample_count, request_count, synthetics_dropped = reset!
     record_sampling_rate(request_count, sample_count) if @enabled
     record_dropped_synthetics(synthetics_dropped)
+    # return old_samples.map(&:to_collector_array) if old_samples.respond_to?(:to_collector_array)
     old_samples
   end
 
@@ -76,7 +79,13 @@ class OneApm::Collector::TransactionEventAggregator
   # transmission to the collector. (Synchronized)
   def merge!(old_samples)
     self.synchronize do
-      old_samples.each { |s| append_event(s) }
+      old_samples.each do |s|
+        if s.respond_to?(:spec_name)
+          append_event(s)
+        else
+          @samples.append_event(s)
+        end
+      end
     end
   end
 
@@ -130,94 +139,62 @@ class OneApm::Collector::TransactionEventAggregator
   # Event handler for the :transaction_finished event.
   def on_transaction_finished(payload)
     return unless @enabled
-
     main_event = create_main_event(payload)
     custom_params = create_custom_parameters(payload)
-
-    self.synchronize { append_event([main_event, custom_params]) }
+    sub_events = create_sub_events(main_event, payload)
+    self.synchronize do 
+       [main_event].concat(sub_events).each do |event|
+          append_event(event) 
+        end
+     end
     notify_full if !@notified_full && @samples.full?
   end
 
-  def append_event(event)
-    main_event, _ = event
-
-    if main_event.include?(OA_SYNTHETICS_RESOURCE_ID_KEY)
-      # Try adding to synthetics buffer. If anything is rejected, give it a
-      # shot in the main transaction events (where it may get sampled)
-      result, rejected = @synthetics_samples.append_with_reject(event)
 
-      if rejected
-        @samples.append(rejected)
-      end
-    else
-      @samples.append(event)
+  # Event handler for the :transaction_finished event.
+  def on_cross_app_transaction_finished(payload)
+    return unless @enabled
+    main_event = create_main_event(payload)
+    self.synchronize do
+      append_event(main_event)
     end
+    notify_full if !@notified_full && @samples.full?
   end
 
-  def self.map_metric(metric_name, to_add={})
-    to_add.values.each(&:freeze)
-
-    mappings = OA_OVERVIEW_SPECS.fetch(metric_name, {})
-    mappings.merge!(to_add)
-
-    OA_OVERVIEW_SPECS[metric_name] = mappings
+  def append_event(event)
+    same_spec_for_sample = @samples.select{|sample| sample.spec_name == event.spec_name}.first
+    return @samples.append(event) if same_spec_for_sample.nil?
+    same_spec_for_sample.event_analytic_data.concat event.event_analytic_data
   end
 
-  OA_OVERVIEW_SPECS = {}
-
-  # All Transactions
-  # Don't need to use the transaction-type specific metrics since this is
-  # scoped to just one transaction, so Datastore/all has what we want.
-  map_metric('Datastore/all',         :total_call_time => "databaseDuration")
-  map_metric('Datastore/all',         :call_count      => "databaseCallCount")
-  map_metric('GC/Transaction/all',    :total_call_time => "gcCumulative")
-
-  # Web Metrics
-  map_metric('WebFrontend/QueueTime', :total_call_time => "queueDuration")
-  map_metric('Memcache/allWeb',       :total_call_time => "memcacheDuration")
-
-  map_metric('External/allWeb',       :total_call_time => "externalDuration")
-  map_metric('External/allWeb',       :call_count      => "externalCallCount")
-
-  # Background Metrics
-  map_metric('Memcache/allOther',     :total_call_time => "memcacheDuration")
-
-  map_metric('External/allOther',     :total_call_time => "externalDuration")
-  map_metric('External/allOther',     :call_count      => "externalCallCount")
-
-  def append_metrics(txn_metrics, sample)
-    if txn_metrics
-      OA_OVERVIEW_SPECS.each do |(name, extracted_values)|
-        if txn_metrics.has_key?(name)
-          stat = txn_metrics[name]
-          extracted_values.each do |value_name, key_name|
-            sample[key_name] = stat.send(value_name)
-          end
-        end
-      end
+  # see http://wiki.oneapm.me/display/SAAS/Ai-+Entrance
+  def create_main_event(payload)
+    OneApm::EventAnalyticSample.new(payload)
+  end
+
+  def create_sub_events main_event, payload
+     payload = payload.dup
+     payload[:scope] = payload[:name]
+     payload[:referring_transaction_guid] = main_event.guid
+     payload[:request_url] = ''
+
+     sub_event_samples = []
+     return sub_event_samples unless payload[:metrics]
+     payload[:metrics].each_scoped do |metric_name, status|
+      next if metric_name =~ /^Nested|View|External/
+      payload[:name] = metric_name
+      payload[:guid] = OneApm::Helper.generate_guid
+      payload[:call_count] = status.call_count
+      payload[:duration] = status.total_call_time
+      sample = OneApm::EventAnalyticSample.new(payload)
+      sub_event_samples << sample
     end
+    sub_event_samples
   end
 
-  def create_main_event(payload)
-    sample = {
-      OA_TIMESTAMP_KEY => float(payload[:start_timestamp]),
-      OA_NAME_KEY      => string(payload[:name]),
-      OA_DURATION_KEY  => float(payload[:duration]),
-      OA_TYPE_KEY      => OA_SAMPLE_TYPE,
-    }
-    append_metrics(payload[:metrics], sample)
-    optionally_append(OA_GUID_KEY,                       :guid, sample, payload)
-    optionally_append(OA_REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
-    optionally_append(OA_CAT_TRIP_ID_KEY,                :cat_trip_id, sample, payload)
-    optionally_append(OA_CAT_PATH_HASH_KEY,              :cat_path_hash, sample, payload)
-    optionally_append(OA_CAT_REFERRING_PATH_HASH_KEY,    :cat_referring_path_hash, sample, payload)
-    optionally_append(OA_APDEX_PERF_ZONE_KEY,            :apdex_perf_zone, sample, payload)
-    optionally_append(OA_SYNTHETICS_RESOURCE_ID_KEY,     :synthetics_resource_id, sample, payload)
-    optionally_append(OA_SYNTHETICS_JOB_ID_KEY,          :synthetics_job_id, sample, payload)
-    optionally_append(OA_SYNTHETICS_MONITOR_ID_KEY,      :synthetics_monitor_id, sample, payload)
-    append_http_response_code(sample, payload)
-    append_cat_alternate_path_hashes(sample, payload)
-    sample
+  def error_times(txn_metrics)
+    return txn_metrics[OA_ERROR_ALL_KEY].call_count if txn_metrics.has_key?(OA_ERROR_ALL_KEY) rescue 0
+    return 0
   end
 
   def append_http_response_code(sample, payload)

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

@@ -6,6 +6,7 @@ require 'one_apm/transaction/sample_buffer/slowest_sample_buffer'
 require 'one_apm/transaction/sample_buffer/synthetics_sample_buffer'
 require 'one_apm/transaction/sample_buffer/xray_sample_buffer'
 require 'one_apm/transaction/sample_buffer/developer_mode_sample_buffer'
+require 'one_apm/transaction/sample_buffer/cross_sample_buffer'
 
 module OneApm
   module Collector
@@ -28,13 +29,15 @@ module OneApm
         def on_finishing_transaction(*args); end
       end
 
-      attr_reader :last_sample, :xray_sample_buffer, :dev_mode_sample_buffer
+      attr_reader :last_sample, :xray_sample_buffer, :dev_mode_sample_buffer, :cross_sample_buffer
 
-      def initialize
+      def initialize(events = OneApm::Manager.agent.events)
         @xray_sample_buffer = OneApm::Transaction::XraySampleBuffer.new
         @dev_mode_sample_buffer = OneApm::Transaction::DeveloperModeSampleBuffer.new
+        @cross_sample_buffer = OneApm::Transaction::CrossSampleBuffer.new(events)
 
         @sample_buffers = []
+        @sample_buffers << @cross_sample_buffer
         @sample_buffers << @xray_sample_buffer
         @sample_buffers << @dev_mode_sample_buffer
         @sample_buffers << OneApm::Transaction::SlowestSampleBuffer.new
@@ -127,6 +130,7 @@ module OneApm
         last_sample = last_builder.sample
         last_sample.guid = txn.guid
         last_sample.set_custom_param(:gc_time, gc_time) if gc_time
+        last_sample.force_persist = txn.apdex_bucket(time - txn.apdex_start) != :apdex_s
 
         if state.is_cross_app?
           last_sample.set_custom_param(:'bw.trip_id', txn.cat_trip_id(state))

data/lib/one_apm/configuration.rb

@@ -266,10 +266,14 @@ module OneApm
         end
       end
 
-      def app_names
-        case OneApm::Manager.config[:app_name]
-        when Array then OneApm::Manager.config[:app_name]
-        when String then OneApm::Manager.config[:app_name].split(';')
+      def app_name
+        OneApm::Manager.config[:app_name]
+      end
+
+      def tier_names
+        case OneApm::Manager.config[:tier_name]
+        when Array then OneApm::Manager.config[:tier_name]
+        when String then OneApm::Manager.config[:tier_name].split(';')
         else []
         end
       end

data/lib/one_apm/configuration/default_source.rb

@@ -235,7 +235,7 @@ module OneApm
         :public       => true,
         :type         => String,
         :notified     => true,
-        :description  => 'Semicolon-delimited list of Naming your application.'
+        :description  => 'Naming your application.'
       },
       :monitor_mode => {
         :default      => value_of(:enabled),
@@ -379,7 +379,7 @@ module OneApm
         :description  => 'Defines a comma-delimited list of exceptions from which the agent will not strip messages when strip_exception_messages is enabled (such as \'ImportantException, PreserveMessageException\').'
       },
       :host => {
-        :default      => 'tpm.oneapm.com',
+        :default      => 'app.collector.oneapm.com',
         :public       => false,
         :type         => String,
         :notified     => false,
@@ -463,6 +463,13 @@ module OneApm
         :notified     => false,
         :description  => 'Number of seconds between connections to the OneApm data collection service for sending transaction event data.'
       },
+      :update_rule_period => {
+          :default      => 60,
+          :public       => false,
+          :type         => Fixnum,
+          :notified     => false,
+          :description  => 'Number of seconds fetch btm config from the OneApm service.'
+      },
       :keep_retrying => {
         :default      => true,
         :public       => false,
@@ -758,7 +765,7 @@ module OneApm
         :default      => true,
         :public       => true,
         :type         => Boolean,
-        :notified     => false,
+        :notified     => true,
         :description  => 'Enable or disable recording of traced errors and error count metrics.'
       },
       :'error_collector.capture_attributes' => {
@@ -1224,6 +1231,20 @@ module OneApm
         :type         => Boolean,
         :notified     => false,
         :description  => 'Enable or Disable custom notified angent config data to OneAPM server.'
+      },
+      :tier_name => {
+        :default      => 'Tier Name',
+        :public       => true,
+        :type         => String,
+        :notified     => true,
+        :description  => 'Semicolon-delimited list of Tier Names.'
+      },
+      :cross_sampler_count => {
+        :default      => 5,
+        :public       => true,
+        :type         => Fixnum,
+        :notified     => true,
+        :description  => 'Cross Application traces limit per minute.'
       }
     }.freeze
   end

data/lib/one_apm/configuration/server_source.rb

@@ -15,7 +15,7 @@ module OneApm
           end
         end
 
-        if hash['browser_monitoring'] && hash['browser_monitoring']['transform']
+        if !hash['browser_monitoring'].nil? && hash['browser_monitoring'].has_key?('transform')
           hash['browser_monitoring']['auto_instrument'] = hash['browser_monitoring']['transform']
         end
 

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

@@ -24,7 +24,8 @@ LibraryDetection.defer do
                     :_oa_header_str,
                     :_oa_original_on_header,
                     :_oa_original_on_complete,
-                    :_oa_serial
+                    :_oa_serial,
+                    :_oa_http_params
 
       # We have to hook these three methods separately, as they don't use
       # Curl::Easy#http
@@ -37,6 +38,7 @@ LibraryDetection.defer do
 
       def http_post_with_oneapm(*args, &blk)
         self._oa_http_verb = :POST
+        self._oa_http_params = args.first
         http_post_without_oneapm(*args, &blk)
       end
       alias_method :http_post_without_oneapm, :http_post
@@ -44,6 +46,7 @@ LibraryDetection.defer do
 
       def http_put_with_oneapm(*args, &blk)
         self._oa_http_verb = :PUT
+        self._oa_http_params = args.first
         http_put_without_oneapm(*args, &blk)
       end
       alias_method :http_put_without_oneapm, :http_put

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

@@ -5,6 +5,21 @@ module OneApm
     module  Instrumentation
       module ThriftHelper
 
+        attr_accessor :segment
+
+        def rpc_request
+          @rpc_request || {}
+        end
+
+        def rpc_request=(rpc_request)
+          @rpc_request = rpc_request
+        end
+
+        def rpc_reset!
+          @rpc_request = nil
+          @segment = nil
+        end
+
         def operator result_klass
           namespaces = result_klass.to_s.split('::')
           operator_name = 'unknown'
@@ -24,14 +39,10 @@ module OneApm
           metrics = if thost.nil?
                       ["External/Thrift/#{operator_name}"]
                     else
-                      ["External/#{thost}/Thrift/#{operator_name}", "External/#{thost}/all"]
+                      #changed from */host/Thrift to */Thrift/host
+                      ["External/Thrift/#{thost}/#{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
 
@@ -60,39 +71,65 @@ LibraryDetection.defer do
   end
 
   executes do
+    require 'one_apm/agent/cross_app/cross_app_tracing_message'
+
     ::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}
+        state   = OneApm::TransactionState.tl_get
+        t0      = Time.now
+        self.segment = OneApm::Agent::CrossAppTracingMessage.start_trace(state, t0, rpc_request)
+        operations[name] = { :started_time => t0 }
         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
+        begin
+          state   = OneApm::TransactionState.tl_get
+          t0      = Time.now
+          segment = OneApm::Agent::CrossAppTracingMessage.start_trace(state, t0, rpc_request)
+          result  = send_oneway_message_without_oneapm(name, args_class, args)
+          OneApm::Agent::CrossAppTracingMessage.finish_trace(state, t0, segment, rpc_request, metrics(name))
+          result
+         rescue => e
+          OneApm::Manager.logger.error "Thrift receive_message error: #{e}"
+        ensure
+          rpc_reset!
+          result
+        end
       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
+        begin
+          op = operator(result_klass)
+          op_started = started_time(op)
+          result = receive_message_without_oneapm(result_klass)
+
+          state = OneApm::TransactionState.tl_get
+          
+          OneApm::Agent::CrossAppTracingMessage.finish_trace(state, op_started, segment, rpc_request, metrics(op))
+          result
+        rescue => e
+          OneApm::Manager.logger.error "Thrift receive_message error: #{e}"
+        ensure
+          rpc_reset!
+          result
+        end
       end
 
       alias :receive_message_without_oneapm :receive_message
       alias :receive_message :receive_message_with_oneapm
     end
   end
+  executes do
+    require 'one_apm/support/http_clients/thrift_tracer'
+    [::Thrift::BinaryProtocol, ::Thrift::CompactProtocol, ::Thrift::JsonProtocol].each do |protocol_classs|
+      protocol_classs.send :include, OneApm::Support::HTTPClients::ThriftTracer
+    end
+  end
 end