atatus 1.3.0 → 1.6.1

data/lib/atatus/child_durations.rb

@@ -0,0 +1,64 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module Atatus
+  # @api private
+  module ChildDurations
+    # @api private
+    module Methods
+      def child_durations
+        @child_durations ||= Durations.new
+      end
+
+      def child_started
+        child_durations.start
+      end
+
+      def child_stopped
+        child_durations.stop
+      end
+    end
+
+    # @api private
+    class Durations
+      def initialize
+        @nesting_level = 0
+        @start = nil
+        @duration = 0
+        @mutex = Mutex.new
+      end
+
+      attr_reader :duration
+
+      def start
+        @mutex.synchronize do
+          @nesting_level += 1
+          @start = Util.micros if @nesting_level == 1
+        end
+      end
+
+      def stop
+        @mutex.synchronize do
+          @nesting_level -= 1
+          @duration = (Util.micros - @start) if @nesting_level == 0
+        end
+      end
+    end
+  end
+end

data/lib/atatus/collector/base.rb

@@ -1,11 +1,13 @@
 require 'json'
 require 'atatus'
 require 'atatus/config'
+require 'atatus/child_durations'
 require 'atatus/transaction'
+require 'atatus/collector/hist'
 require 'atatus/collector/layer'
 require 'atatus/collector/transport'
 
-SpanTiming = Struct.new(:start, :end)
+SpanTiming = Struct.new(:name, :type, :subtype, :start, :end, :duration, :id, :transaction_id)
 
 module Atatus
   module Collector
@@ -29,6 +31,7 @@ module Atatus
 
         @txns_lock = Mutex.new
         @txns_agg = {}
+        @txn_hist_agg = {}
         @traces_agg = []
         @error_metrics_agg = {}
         @error_requests_agg = []
@@ -39,7 +42,7 @@ module Atatus
         @metrics_lock = Mutex.new
         @metrics_agg = []
 
-        @transport = Atatus::BaseTransport.new(config)        
+        @transport = Atatus::BaseTransport.new(config)
         @collect_counter = 0
         @running = false
       end
@@ -69,6 +72,11 @@ module Atatus
         error "Backtrace:\n" + e.backtrace.join("\n")
       end
 
+      def handle_forking!
+        stop
+        start
+      end
+
       def add_error(error)
         ensure_worker_running
 
@@ -84,7 +92,7 @@ module Atatus
 
       def add_metrics(metricset)
         ensure_worker_running
-        
+
         metric_added = false
         metric = {}
 
@@ -99,13 +107,17 @@ module Atatus
           metric_added = true
         end
 
-        if %i[ruby.gc.count ruby.threads ruby.heaps.slots.live ruby.heap.slots.free ruby.heap.allocations.total].all? {|s| metricset.samples.key? s}
+        if %i[ruby.gc.count ruby.threads ruby.heap.slots.live ruby.heap.slots.free ruby.heap.allocations.total].all? {|s| metricset.samples.key? s}
         then
           metric[:'ruby.gc.count'] = metricset.samples[:'ruby.gc.count']
           metric[:'ruby.threads'] = metricset.samples[:'ruby.threads']
           metric[:'ruby.heap.slots.live'] = metricset.samples[:'ruby.heap.slots.live']
           metric[:'ruby.heap.slots.free'] = metricset.samples[:'ruby.heap.slots.free']
           metric[:'ruby.heap.allocations.total'] = metricset.samples[:'ruby.heap.allocations.total']
+          if %i[ruby.gc.time].all? {|s| metricset.samples.key? s}
+          then
+            metric[:'ruby.gc.time'] = metricset.samples[:'ruby.gc.time']
+          end
           metric_added = true
         end
 
@@ -120,10 +132,10 @@ module Atatus
         ensure_worker_running
 
         if
-          span.transaction_id.nil? ||  
-          span.name.nil? || 
-          span.type.nil? || 
-          span.subtype.nil? || 
+          span.transaction_id.nil? ||
+          span.name.nil? ||
+          span.type.nil? ||
+          span.subtype.nil? ||
           span.duration.nil?
         then
           return
@@ -135,10 +147,10 @@ module Atatus
       def add_txn(txn)
         ensure_worker_running
 
-        if 
-          txn.name.nil? || 
-          txn.id.nil? || 
-          txn.timestamp.nil? || 
+        if
+          txn.name.nil? ||
+          txn.id.nil? ||
+          txn.timestamp.nil? ||
           txn.duration.nil?
         then
           return
@@ -148,14 +160,15 @@ module Atatus
         return if txn.duration <= 0
 
         @txns_lock.synchronize do
-          if !@txns_agg.key?(txn.name)
-            txn_type = @config.framework_name || "Ruby"
-            background = false
-            if !txn.type.nil?
-              if txn.type == "Sidekiq"
-                background = true
-              end
+          txn_type = @config.framework_name || "Ruby"
+          background = false
+          if !txn.type.nil?
+            if txn.type == "Sidekiq"
+              background = true
             end
+          end
+
+          if !@txns_agg.key?(txn.name)
             @txns_agg[txn.name] = Txn.new(txn_type, "Ruby", txn.duration, background: background)
             @txns_agg[txn.name].id = txn.id
             @txns_agg[txn.name].pid = txn.id
@@ -163,17 +176,25 @@ module Atatus
             @txns_agg[txn.name].aggregate! txn.duration
           end
 
+          if background == false and txn.duration <= 150*1000*1000.0
+            if !@txn_hist_agg.key?(txn.name)
+              @txn_hist_agg[txn.name] = TxnHist.new(txn_type, "Ruby", Util.ms(txn.duration))
+            else
+              @txn_hist_agg[txn.name].aggregate! Util.ms(txn.duration)
+            end
+          end
+
           spans_present = false
           ruby_time = 0
           spans_tuple = []
           if @spans.key?(txn.id)
             spans_present = true
             @spans[txn.id].each do |span|
-              if 
-                span.name.nil? || 
-                span.type.nil? || 
-                span.subtype.nil? || 
-                span.timestamp.nil? || 
+              if
+                span.name.nil? ||
+                span.type.nil? ||
+                span.subtype.nil? ||
+                span.timestamp.nil? ||
                 span.duration.nil?
               then
                 next
@@ -183,16 +204,7 @@ module Atatus
 
               if span.timestamp >= txn.timestamp
                 start = Util.ms(span.timestamp - txn.timestamp)
-                spans_tuple.push(SpanTiming.new(start, start + Util.ms(span.duration)))
-                if !@txns_agg[txn.name].spans.key?(span.name)
-                  kind = Layer.span_kind(span.type)
-                  type = Layer.span_type(span.subtype)
-                  @txns_agg[txn.name].spans[span.name] = Layer.new(type, kind, span.duration)
-                  @txns_agg[txn.name].spans[span.name].id = span.id
-                  @txns_agg[txn.name].spans[span.name].pid = span.transaction_id
-                else
-                  @txns_agg[txn.name].spans[span.name].aggregate! span.duration
-                end
+                spans_tuple.push(SpanTiming.new(span.name, span.type, span.subtype, start, start + Util.ms(span.duration), span.duration, span.id, span.transaction_id))
               end
             end
           end
@@ -201,6 +213,40 @@ module Atatus
             ruby_time = Util.ms(txn.duration)
           else
             spans_tuple.sort! {| a, b | a[:start] <=> b[:start] }
+            j = 0
+            while j < spans_tuple.length
+              if spans_tuple[j].subtype == 'controller' || spans_tuple[j].subtype == 'view' || spans_tuple[j].subtype == 'tilt'
+                k = j+1
+                while k < spans_tuple.length
+                  if spans_tuple[k].start >= spans_tuple[j].end
+                    break
+                  else
+                    if spans_tuple[k].end <= spans_tuple[j].end
+                      spans_tuple[j].duration -= Util.us(spans_tuple[k].end - spans_tuple[k].start)
+                    else
+                      spans_tuple[j].duration -= Util.us(spans_tuple[j].end - spans_tuple[k].start)
+                    end
+                  end
+                  k += 1
+                end
+                if spans_tuple[j].duration <= 0
+                  spans_tuple[j].duration = 1
+                end
+              end
+
+              if !@txns_agg[txn.name].spans.key?(spans_tuple[j].name)
+                kind = Layer.span_kind(spans_tuple[j].type)
+                type = Layer.span_type(spans_tuple[j].subtype)
+                @txns_agg[txn.name].spans[spans_tuple[j].name] = Layer.new(type, kind, spans_tuple[j].duration)
+                @txns_agg[txn.name].spans[spans_tuple[j].name].id = spans_tuple[j].id
+                @txns_agg[txn.name].spans[spans_tuple[j].name].pid = spans_tuple[j].transaction_id
+              else
+                @txns_agg[txn.name].spans[spans_tuple[j].name].aggregate! spans_tuple[j].duration
+              end
+
+              j += 1
+            end
+
             ruby_time = spans_tuple[0].start
             span_end = spans_tuple[0].end
             j = 0
@@ -244,12 +290,12 @@ module Atatus
             @spans.delete(txn.id)
           end
 
-          if 
-            !txn.context.nil? && 
-            !txn.context.response.nil? && 
+          if
+            !txn.context.nil? &&
+            !txn.context.response.nil? &&
             !txn.context.response.status_code.nil?
           then
-            status_code = txn.context.response.status_code
+            status_code = txn.context.response.status_code.to_i
 
             if status_code >= 400 && status_code != 404
               if !@error_metrics_agg.key?(txn.name)
@@ -262,11 +308,13 @@ module Atatus
                 end
               end
 
+              trace_id = ""
+              trace_id = txn.trace_id if !txn.trace_id.nil?
               if @error_requests_agg.length < 20
-                @error_requests_agg.push({'name' => txn.name, 'context' => txn.context})
+                @error_requests_agg.push({'name' => txn.name, 'txn_id' => txn.id, 'trace_id' => trace_id, 'context' => txn.context})
               else
                 i = rand(20)
-                @error_requests_agg[i] = {'name' => txn.name, 'context' => txn.context}
+                @error_requests_agg[i] = {'name' => txn.name, 'txn_id' => txn.id, 'trace_id' => trace_id, 'context' => txn.context}
               end
             end
           end
@@ -317,6 +365,7 @@ module Atatus
         debug '%s: data collector', pid_str
 
         txns_data = nil
+        txn_hist_data = nil
         traces_data = nil
         error_metrics_data = nil
         error_requests_data = nil
@@ -327,6 +376,9 @@ module Atatus
           txns_data = @txns_agg
           @txns_agg = {}
 
+          txn_hist_data = @txn_hist_agg
+          @txn_hist_agg = {}
+
           traces_data = @traces_agg
           @traces_agg = []
 
@@ -341,7 +393,7 @@ module Atatus
           errors_data = @errors_aggs
           @errors_aggs = []
         end
-        
+
         @metrics_lock.synchronize do
           metrics_data = @metrics_agg
           @metrics_agg = []
@@ -349,7 +401,14 @@ module Atatus
 
         @transport.txns(start_time, end_time, txns_data) unless txns_data.empty?
 
-        @transport.traces(start_time, end_time, traces_data) unless traces_data.empty?
+        @transport.txn_hist(start_time, end_time, txn_hist_data) unless txn_hist_data.empty?
+
+        unless traces_data.empty?
+          traces_data.each do |trace|
+            individual_trace_data = [trace]
+            @transport.traces(start_time, end_time, individual_trace_data)
+          end
+        end
 
         @transport.error_metrics(start_time, end_time, error_metrics_data, error_requests_data) unless error_metrics_data.empty?
 
@@ -359,4 +418,4 @@ module Atatus
       end
     end
   end
-end
+end

data/lib/atatus/collector/builder.rb

@@ -3,8 +3,7 @@ require 'atatus/metadata'
 require 'yaml'
 module Atatus
   class Builder
-    AGENT_NAME = 'Ruby'
-
+    
     def initialize(config)
       @config = config
       @metadata = Metadata::SystemInfo.new(config)
@@ -53,6 +52,14 @@ module Atatus
       payload
     end
 
+    def txn_hist(start_time, end_time, data)
+      payload = common()
+      payload[:startTime] = start_time
+      payload[:endTime] = end_time
+      payload[:transactions] = build_txn_hist_obj(data)
+      payload
+    end
+
     def traces(start_time, end_time, data)
       payload = common()
       payload[:startTime] = start_time
@@ -149,6 +156,20 @@ module Atatus
       m
     end
 
+    def build_hist_metric(name, value)
+      return unless name
+      return unless value
+
+      m = {
+          name: name,
+          type: value.type,
+          kind: value.kind,
+          histogram: value.hist,
+        }
+
+      m
+    end
+
     def build_request(context)
       request = {}
       return request unless context
@@ -174,7 +195,7 @@ module Atatus
 
       if !context.response.nil?
         if !context.response.status_code.nil?
-          request[:statusCode] = context.response.status_code
+          request[:statusCode] = context.response.status_code.to_i
         end
       end
 
@@ -195,6 +216,17 @@ module Atatus
       txns
     end
 
+    def build_txn_hist_obj(data)
+      txn_hist = []
+      data.each do |t, v|
+        hist = build_hist_metric(t, v)
+        if hist
+          txn_hist << hist
+        end
+      end
+      txn_hist
+    end
+
     def build_traces_obj(data)
       traces = []
       data.each do |txn|
@@ -205,11 +237,17 @@ module Atatus
         then
           next
         end
+        txn_id = ""
+        txn_id = txn.id if !txn.id.nil?
+        trace_id = ""
+        trace_id = txn.trace_id if !txn.trace_id.nil?
 
         trace = {}
         trace[:name] = txn.name
         trace[:type] = @config.framework_name || AGENT_NAME
         trace[:kind] = AGENT_NAME
+        trace[:txnId] = txn_id
+        trace[:traceId] = trace_id
         trace[:start] = txn.timestamp
         trace[:duration] = Util.ms(txn.duration)
         if !txn.context.nil?
@@ -217,6 +255,28 @@ module Atatus
         end
         trace[:entries] = []
         trace[:funcs] = []
+
+        if
+          !txn.context.nil? &&
+          defined?(txn.context.custom) &&
+          !txn.context.custom.nil? &&
+          !txn.context.custom.empty?
+        then
+          trace[:customData] = txn.context.custom
+        end
+
+        if
+          !txn.context.nil? &&
+          defined?(txn.context.user) &&
+          !txn.context.user.nil? &&
+          !txn.context.user.empty?
+        then
+          trace[:user] = {}
+          trace[:user][:id] = txn.context.user.id
+          trace[:user][:email] = txn.context.user.email
+          trace[:user][:username] = txn.context.user.username
+        end
+
         i = 0
 
         if
@@ -239,11 +299,23 @@ module Atatus
             if
               !span.context.nil? &&
               !span.context.db.nil? &&
+              defined?(span.context.db.statement) &&
               !span.context.db.statement.nil?
             then
               entry[:dt] = {}
               entry[:dt][:query] = span.context.db.statement
             end
+            if
+              !span.context.nil? &&
+              !span.context.http.nil? &&
+              defined?(span.context.http.url) &&
+              !span.context.http.url.nil?
+            then
+              entry[:dt] = {}
+              entry[:dt][:url] = span.context.http.url
+              entry[:dt][:method] = span.context.http.method if defined?(span.context.http.method) && !span.context.http.method.nil?
+              entry[:dt][:status_code] = span.context.http.status_code.to_s if defined?(span.context.http.status_code) && !span.context.http.status_code.nil?
+            end
             trace[:entries] << entry
             func_index = trace[:funcs].index(span.name)
             if func_index.nil?
@@ -303,11 +375,39 @@ module Atatus
         then
           next
         end
+        txn_id = ""
+        txn_id = v['txn_id'] if v.key?('txn_id')
+        trace_id = ""
+        trace_id = v['trace_id'] if v.key?('trace_id')
         error_request = {}
         error_request[:name] = v['name']
         error_request[:type] = @config.framework_name || AGENT_NAME
         error_request[:kind] = AGENT_NAME
+        error_request[:txnId] = txn_id
+        error_request[:traceId] = trace_id
         error_request[:request] = build_request(v['context'])
+
+        if
+          !v['context'].nil? &&
+          defined?(v['context'].custom) &&
+          !v['context'].custom.nil? &&
+          !v['context'].custom.empty?
+        then
+          error_request[:customData] = v['context'].custom
+        end
+
+        if
+          !v['context'].nil? &&
+          defined?(v['context'].user) &&
+          !v['context'].user.nil? &&
+          !v['context'].user.empty?
+        then
+          error_request[:user] = {}
+          error_request[:user][:id] = v['context'].user.id
+          error_request[:user][:email] = v['context'].user.email
+          error_request[:user][:username] = v['context'].user.username
+        end
+
         error_requests << error_request
       end
       error_requests
@@ -340,9 +440,39 @@ module Atatus
           error[:transaction] = v.transaction[:name]
         end
 
+        txn_id = ""
+        txn_id = v.transaction_id if !v.transaction_id.nil?
+        trace_id = ""
+        trace_id = v.trace_id if !v.trace_id.nil?
+
+        error[:txnId] = txn_id
+        error[:traceId] = trace_id
+
         if !v.context.nil?
           error[:request] = build_request(v.context)
         end
+
+        if
+          !v.context.nil? &&
+          defined?(v.context.custom) &&
+          !v.context.custom.nil? &&
+          !v.context.custom.empty?
+        then
+          error[:customData] = v.context.custom
+        end
+
+        if
+          !v.context.nil? &&
+          defined?(v.context.user) &&
+          !v.context.user.nil? &&
+          !v.context.user.empty?
+        then
+          error[:user] = {}
+          error[:user][:id] = v.context.user.id
+          error[:user][:email] = v.context.user.email
+          error[:user][:username] = v.context.user.username
+        end
+
         error[:exceptions] = []
         exception = {}
         exception[:class] = v.exception.type
@@ -365,7 +495,7 @@ module Atatus
             frame = {}
             frame[:f] = f.filename
             frame[:m] = f.function
-            frame[:ln] = f.lineno
+            frame[:ln] = f.lineno.to_i
             if f.library_frame == false
               frame[:inp] = true
             end

data/lib/atatus/collector/hist.rb

@@ -0,0 +1,54 @@
+
+module Atatus
+  module Collector
+    class TxnHist
+      def initialize(type, kind, duration)
+        @type = type
+        @kind = kind
+        @hist = {}
+        @hist[find_bin duration] = 1
+      end
+
+      attr_reader :type, :kind, :hist
+
+      def aggregate!(duration)
+        hbin = find_bin duration
+        if !@hist.key?(hbin)
+          @hist[hbin] = 1
+        else
+          @hist[hbin] += 1
+        end
+      end
+
+      private
+      def find_bin(duration)
+        seconds = 1000
+        hbin = 0
+
+        if duration < 0
+          hbin = 0
+        elsif duration < 2*seconds
+          hbin = round_bin(duration, 10)
+        elsif duration < 10*seconds
+          hbin = round_bin(duration, 25)
+        elsif duration < 20*seconds
+          hbin = round_bin(duration, 50)
+        elsif duration < 50*seconds
+          hbin = round_bin(duration, 100)
+        elsif duration < 80*seconds
+          hbin = round_bin(duration, 200)
+        elsif duration < 100*seconds
+          hbin = round_bin(duration, 250)
+        else
+          hbin = round_bin(duration, 1000)
+        end
+
+        hbin
+      end
+
+      def round_bin(duration, unit)
+        ((duration / unit.to_f).floor) * unit
+      end
+    end
+  end
+end

data/lib/atatus/collector/layer.rb

@@ -51,6 +51,7 @@ module Atatus
         'sqlite'=> 'SQLite',
         'controller' => 'Controller',
         'view' => 'View',
+        'tilt' => 'Tilt',
         'http' => 'External Requests',
         'http2' => 'External Requests',
         'http_rb' => 'External Requests',