oneapm_rpm 1.3.7 → 1.4.0

data/lib/one_apm/support/rename_rules_engine/rename/header.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+module OneApm
+  module Support
+    class RenameRulesEngine
+      module Rename
+        class Header < Base
+
+          def segment(request)
+            return '' if !state
+            request[value].nil?? request[value.to_sym] : request[value]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/one_apm/support/rename_rules_engine/rename/parameter.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module OneApm
+  module Support
+    class RenameRulesEngine
+      module Rename
+        class Parameter < Base
+
+          def segment(request)
+            return '' if !state
+            parameters = request.params
+            parameters[value].try(&:first)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/one_apm/support/rename_rules_engine/rename/segment.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+module OneApm
+  module Support
+    class RenameRulesEngine
+      module Rename
+        class Segment < Base
+
+          OA_RENAME_SEM_FIRST_MARK             = 'first_'.freeze
+          OA_RENAME_SEM_LAST_MARK              = 'last_'.freeze
+          OA_RENAME_SEM_VALUE_SEPARATOR        = ','.freeze
+          OA_RENAME_SEM_REGEX                  = /\d+,*/
+          OA_RENAME_SEPARATOR                  = '/'.freeze
+
+          def segment(request)
+            return '' if !state || value.nil?
+            separated_path = request.uri.path.split(OA_RENAME_SEPARATOR)
+            separated_path.delete('')
+            if value.start_with?(OA_RENAME_SEM_FIRST_MARK)
+
+              to = (value.gsub(OA_RENAME_SEM_FIRST_MARK,'').to_i - 1)
+              separated_path[0..to].join(OA_RENAME_SEPARATOR)
+
+            elsif value.start_with?(OA_RENAME_SEM_LAST_MARK)
+              from = (value.gsub(OA_RENAME_SEM_LAST_MARK,'').to_i)
+              from = separated_path.size if from > separated_path.size
+              from = -from
+              separated_path[from..-1].join(OA_RENAME_SEPARATOR)
+
+            elsif OA_RENAME_SEM_REGEX.match(value)
+
+              value_at = value.split(OA_RENAME_SEM_VALUE_SEPARATOR)
+              value_at.map{|at| separated_path.at(at.to_i-1)}.join(OA_RENAME_SEPARATOR)
+
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/one_apm/transaction.rb

@@ -39,6 +39,7 @@ module OneApm
 
     attr_reader :database_metric_name,
                 :guid,
+                :frozen_name,
                 :metrics,
                 :gc_start_snapshot,
                 :category,
@@ -64,7 +65,7 @@ module OneApm
       @request = options[:request]
       @exceptions = {}
       @metrics = TransactionMetrics.new
-      @guid = generate_guid
+      @guid = OneApm::Helper.generate_guid
       @cat_path_hashes = nil
 
       @ignore_this_transaction = false
@@ -147,17 +148,25 @@ module OneApm
         :start_timestamp  => start_time.to_f,
         :duration         => duration,
         :metrics          => @metrics,
-        :custom_params    => custom_parameters
+        :custom_params    => custom_parameters,
+        :guid             => guid,
+        :request_url      => reqest_url
       }
+
       append_cat_info(state, duration, payload)
       append_apdex_perf_zone(duration, payload)
       append_synthetics_to(state, payload)
       append_referring_transaction_guid_to(state, payload)
       append_http_response_code(payload)
+      append_metric_ids_to(payload)
 
       agent.events.notify(:transaction_finished, payload)
     end
 
+    def reqest_url
+      request.url rescue ''
+    end
+
     # Call this to ensure that the current transaction is not saved
     def abort_transaction!(state)
       transaction_sampler.ignore_transaction(state)

data/lib/one_apm/transaction/class_methods.rb

@@ -111,13 +111,13 @@ module OneApm
       # Make a safe attempt to get the URI, without the host and query string.
       def uri_from_request(req)
         approximate_uri = case
-                          when req.respond_to?(:fullpath   ) then req.fullpath
-                          when req.respond_to?(:path       ) then req.path
+                         # when req.respond_to?(:fullpath   ) then req.fullpath
+                         # when req.respond_to?(:path       ) then req.path
                           when req.respond_to?(:request_uri) then req.request_uri
                           when req.respond_to?(:uri        ) then req.uri
                           when req.respond_to?(:url        ) then req.url
                           end
-        return approximate_uri[%r{^(https?://.*?)?(/[^?]*)}, 2] || '/' if approximate_uri
+        return approximate_uri[%r{^(https?://.*?)?(/[^?]*)}, 1] + approximate_uri[%r{^(https?://.*?)?(/[^?]*)}, 2] || '/' if approximate_uri
       end
 
       # Make a safe attempt to get the referer from a request object, generally successful when

data/lib/one_apm/transaction/event_analytic_data.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+module OneApm
+  class EventAnalyticData
+    include OneApm::Coerce
+    OA_ERROR_ALL_KEY = 'Errors/all'.freeze
+
+    attr_reader :start_time, :guid, :refer_guid, :trip_guid,  :call_count, :duration
+    attr_reader :errors, :apdex, :request_url, :bytes_sent, :bytes_rec, :has_trace,  :exec_time, :call_type
+
+    def initialize(payload = {})
+       @start_time  = payload[:start_timestamp].to_f * 1000
+       @guid        = payload[:guid]
+       @refer_guid  = payload[:referring_transaction_guid]
+       @trip_guid   = payload[:cat_trip_id] || @refer_guid || @guid
+       @call_count  = payload[:call_count] || 1
+       @duration    = payload[:duration]
+       @errors      = error_times(payload[:metrics])
+       @apdex       = payload[:apdex_perf_zone]
+       @request_url = payload[:request_url]
+       @bytes_sent  = 0
+       @bytes_rec   = 0
+       @has_trace   = apdex != Transaction::OA_APDEX_S ? 1 : 0
+       @exec_time   = payload[:duration]
+       @call_type   = 0  # 0: syn , 1: asyn
+    end
+
+    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 to_collector_array(encoder = nil)
+      [
+        start_time, 
+        guid,       
+        refer_guid, 
+        trip_guid,  
+        call_count, 
+        duration,   
+        errors,     
+        apdex,      
+        request_url,
+        bytes_sent, 
+        bytes_rec,  
+        has_trace,  
+        exec_time,  
+        call_type
+      ]
+    end
+  end
+end

data/lib/one_apm/transaction/event_analytic_sample.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+module OneApm
+  class EventAnalyticSample
+    include OneApm::Coerce
+
+    attr_accessor :event_analytic_data, :guid
+    attr_reader :metric_id, :name, :scope
+
+    def initialize(payload = {})
+       @name        = payload[:name]
+       @scope       = payload[:scope] || ''
+       @metric_id   = metrir_id_from(payload[:metric_ids] || {})
+       @guid        = payload[:guid]
+       @event_analytic_data = [ OneApm::EventAnalyticData.new(payload) ]
+    end
+
+    def spec_name
+      return [metric_id] if metric_id 
+      [-1, name, scope]
+    end
+
+    def metrir_id_from(metric_ids)
+      metric_spec = OneApm::MetricSpec.new(name, scope)
+      metric_ids[metric_spec]
+    end
+
+    def to_collector_array(encoder = nil)
+      [
+        spec_name,
+        event_analytic_data.map(&:to_collector_array)
+      ]
+    end
+  end
+end

data/lib/one_apm/transaction/instance_helpers.rb

@@ -68,7 +68,7 @@ module OneApm
       HEX_DIGITS = (0..15).map{|i| i.to_s(16)}
       GUID_LENGTH = 16
 
-      # generate a random 64 bit uuid
+      # generate a random 16 length uuid
       def generate_guid
         guid = ''
         GUID_LENGTH.times do |a|

data/lib/one_apm/transaction/sample_buffer/cross_sample_buffer.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+require 'one_apm/transaction/sample_buffer/transaction_sample_buffer'
+
+module OneApm
+  class Transaction
+    class CrossSampleBuffer < TransactionSampleBuffer
+
+      def initialize(events)
+        @counter = 0
+        @samples = []
+        @events = events
+      end
+
+      def capacity
+        Manager.config[:cross_sampler_count]
+      end
+
+      def reset_counter!
+        @counter = 0
+      end
+
+      def full?
+        @counter >= capacity
+      end
+
+      def allow_sample?(sample)
+        sample.params[:custom_params][:'bw.trip_id'] rescue false
+      end
+
+      private
+
+      # If a buffer needs to modify an added sample, override this method.
+      # Bounds checking, allowing samples and truncation belongs elsewhere.
+      def add_sample(sample)
+        if full?
+          OneApm::Manager.logger.debug "Cross sample buffer is full, counter: #{@counter} "
+        else
+          @counter += 1
+          OneApm::Manager.logger.debug "Cross sample buffer add sample, counter: #{@counter} "
+          @events.notify(:cross_sample_buffer_added, sample)
+        end
+      end
+
+    end
+  end
+end

data/lib/one_apm/transaction/segment.rb

@@ -46,7 +46,8 @@ module OneApm
           OneApm::Helper.time_to_millis(@exit_timestamp),
           string(@metric_name),
           (@params || {}) ] +
-          [ (@called_segments ? @called_segments.map{|s| s.to_array} : []) ]
+          [ (@called_segments ? @called_segments.map{|s| s.to_array} : []) ] #+
+          # [ '', '' ]
       end
 
       def path_string

data/lib/one_apm/transaction/transaction_finish_append.rb

@@ -58,6 +58,10 @@ module OneApm
         payload[:synthetics_monitor_id]  = synthetics_monitor_id
       end
 
+      def append_metric_ids_to(payload)
+        payload[:metric_ids] = agent.service.metric_id_cache if agent.service
+      end
+
       def include_guid?(state, duration)
         state.is_cross_app? || is_synthetics_request?
       end

data/lib/one_apm/transaction/transaction_name.rb

@@ -18,7 +18,7 @@ module OneApm
 
       def filter name
         encoded_name = Helper.correctly_encoded(name)
-        encoded_name ? encoded_name.gsub("Controller", "WebTransaction") : nil
+        encoded_name ? encoded_name.gsub("Controller", "WebTransaction/Uri") : nil
       end
 
       def make_transaction_name(name, category = nil)

data/lib/one_apm/transaction/transaction_sample.rb

@@ -10,7 +10,6 @@ require 'one_apm/transaction/composite_segment'
 module OneApm
   # the number of segments that need to exist before we roll them up
   # into one segment with multiple executions
-  COLLAPSE_SEGMENTS_THRESHOLD = 2
 
   class TransactionSample
     include TransactionAnalysis
@@ -59,15 +58,16 @@ module OneApm
     include OneApm::Coerce
 
     def to_array
-      [ float(@start_time),
+      [ OneApm::Helper.time_to_millis(@start_time),
         @params[:request_params],
         @params[:custom_params],
-        @root_segment.to_array ]
+        @root_segment.to_array]
     end
 
     def to_collector_array(encoder)
+      # trace_tree = OneApm::Helper.obfuscator.obfuscate(OneApm::JSONWrapper.dump([self.to_array]))
       trace_tree = encoder.encode(self.to_array)
-      [ Helper.time_to_millis(@start_time),
+      trace_array = [ Helper.time_to_millis(@start_time),
         Helper.time_to_millis(duration),
         string(transaction_name),
         string(@params[:uri]),
@@ -75,9 +75,14 @@ module OneApm
         string(@guid),
         nil,
         forced?,
-        int_or_nil(xray_session_id),
-        string(synthetics_resource_id)
-      ]
+        trip_guid
+      ] 
+     return trace_array unless int_or_nil(xray_session_id)
+     trace_array + [ int_or_nil(xray_session_id) ]
+    end
+
+    def trip_guid
+      string(params[:custom_params][:'bw.trip_id'] || @guid) rescue string(@guid)
     end
 
     def path_string

data/lib/one_apm/version.rb

@@ -4,8 +4,8 @@ module OneApm
   module VERSION
 
     MAJOR = 1
-    MINOR = 3
-    TINY  = 7
+    MINOR = 4
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

data/lib/sequel/extensions/oneapm_instrumentation.rb

@@ -29,16 +29,18 @@ module Sequel
       return rval
     end
 
+    def generate_metrics(operation, config = {})
+      @product ||= database_info(config)
+      metric_for(@product, operation).compact
+    end
+
     # Record metrics for the specified +sql+ and +args+ using the specified
     # +duration+.
     def record_metrics(sql, args, duration)
-      primary_metric = primary_metric_for(sql, args)
-      engine         = OneApm::Manager.agent.stats_engine
-
-      metrics = rollup_metrics_for(primary_metric)
-      metrics << remote_service_metric(*self.opts.values_at(:adapter, :host)) if self.opts.key?(:adapter)
-
-      engine.tl_record_scoped_and_unscoped_metrics(primary_metric, metrics, duration)
+      operation = operator_metric_for(sql, args)
+      engine = OneApm::Manager.agent.stats_engine
+      base, *other_metrics = generate_metrics(operation, self.opts)
+      engine.tl_record_scoped_and_unscoped_metrics(base, other_metrics, duration)
     end
 
     THREAD_SAFE_CONNECTION_POOL_CLASSES = [
@@ -48,7 +50,8 @@ module Sequel
     # Record the given +sql+ within a new frame, using the given +start+ and
     # +finish+ times.
     def notice_sql(state, sql, args, start, finish)
-      metric   = primary_metric_for(sql, args)
+      operation = operator_metric_for(sql, args)
+      base, *other_metrics = generate_metrics(operation, self.opts)
       agent    = OneApm::Manager.agent
       duration = finish - start
       stack    = state.traced_method_stack
@@ -64,7 +67,7 @@ module Sequel
           end
         end
         agent.transaction_sampler.notice_sql(sql, self.opts, duration, state, &explainer)
-        agent.sql_sampler.notice_sql(sql, metric, self.opts, duration, state, &explainer)
+        agent.sql_sampler.notice_sql(sql, base, self.opts, duration, state, &explainer)
       ensure
         stack.pop_frame(state, frame, metric, finish)
       end
@@ -76,6 +79,10 @@ module Sequel
       return metric_for_sql(OneApm::Helper.correctly_encoded(sql))
     end
 
+    def operator_metric_for(sql, _)
+      return operator_for_sql(OneApm::Helper.correctly_encoded(sql))
+    end
+
   end # module OneApmInstrumentation
 
   OneApm::Manager.logger.debug "Registering the :oneapm_instrumentation extension."

data/lib/sequel/plugins/oneapm_instrumentation.rb

@@ -12,8 +12,9 @@ module Sequel
         def make_tracer_method( opname, options )
           body = Proc.new do |*args, &block|
             classname = self.is_a?( Class ) ? self.name : self.class.name
-            metric = "Database/%s/%s" % [ classname, opname ]
-            trace_execution_scoped( metric, options ) do
+            op_name = OneApm::Agent::Instrumentation::ActiveRecordHelper.rename_for(opname)
+            metrics = OneApm::Agent::Instrumentation::ActiveRecordHelper.metric_for(classname, op_name).compact
+            trace_execution_scoped( metrics, options ) do
               super( *args, &block )
             end
           end

data/oneapm_rpm.gemspec

@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '= 0.10.0'
   s.add_development_dependency 'mocha', '~> 0.13.0'
   s.add_development_dependency 'rails', '~> 3.2'
-  s.add_development_dependency 'pry', '~> 0.9.12'
+  s.add_development_dependency 'pry', '~> 0.10.3'
+
   s.add_development_dependency 'hometown', '~> 0.2.5'
 
   if RUBY_VERSION >= '1.9.3'