atatus 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ebfb72781685c274fbd7f4516df59c2ba5dc6533bc887dfbad3a3b6b93e08f6
-  data.tar.gz: 756f210e8bb7136aa87806fbdb3dcf1e1a9bd5986e8717322b26fba4148a9613
+  metadata.gz: 19bb396dacbaf9a052b4b3d35b31dac1e696a8f511147b1aaadc54a43bceccbc
+  data.tar.gz: e39e3ee409263c6705f19d22b643297d6447fbf761957d6d528104bfe571e608
 SHA512:
-  metadata.gz: 0a309c3b2ad681d3dc7a0a95b655e80ef0184a8b6522bf3f724b1266f65a0904e963043e21518711e3582d10757a7ab0c8c8550fd4df53d0a68442496291a352
-  data.tar.gz: 65c1dd53f5b6115b27edded97df2240af6e2d6217517fb59641792a60d185b6916a1bf442cb5fa277ece9711bca96a6a56acec0948edc7d6282ece771140c64e
+  metadata.gz: a1215f5b881147e211257ff53eb61c2f2a6a9acde21cc1a2b4a4b5ac80d77b5b1661c70ef7997f426537732578439106b05c806dec366b3a472dff34a9d4cab9
+  data.tar.gz: 1368782a8b6e6f58a729853cbc0f4e26acc68713a19da41f4be3db66ea1dbb6b47e4faf03b3fd5a73962a27b74683963fb145ba7dfb157e5488085e0601962ec

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 1.1.0 (Thu, 5 Dec 2019)
+
+- Added HTTP context for External Requests in traces.
+- Added layer duration for Ruby code.
+- Fixed time calculations in database calls where min, average calculation was incorrect.
+- Removed stacktrace frame for libraries.
+
+
 ## 1.0.2 (Thu, 21 Nov 2019)
 
 - Changed Linux memory size to bytes.

data/lib/atatus/collector/base.rb

@@ -5,6 +5,8 @@ require 'atatus/transaction'
 require 'atatus/collector/layer'
 require 'atatus/collector/transport'
 
+SpanTiming = Struct.new(:start, :end)
+
 module Atatus
   module Collector
     class Txn < Layer
@@ -135,12 +137,14 @@ module Atatus
         if 
           txn.name.nil? || 
           txn.id.nil? || 
+          txn.timestamp.nil? || 
           txn.duration.nil?
         then
           return
         end
 
         return if txn.name.empty?
+        return if txn.duration <= 0
 
         @txns_lock.synchronize do
           if !@txns_agg.key?(txn.name)
@@ -152,12 +156,16 @@ module Atatus
           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? || 
                 span.duration.nil?
               then
                 next
@@ -165,23 +173,55 @@ module Atatus
 
               next if span.name.empty?
 
-              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
+              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
+              end
+            end
+          end
+
+          if spans_tuple.length == 0
+            ruby_time = Util.ms(txn.duration)
+          else
+            spans_tuple.sort! {| a, b | a[:start] <=> b[:start] }
+            ruby_time = spans_tuple[0].start
+            span_end = spans_tuple[0].end
+            j = 0
+            while j < spans_tuple.length
+              if spans_tuple[j].start > span_end
+                ruby_time += spans_tuple[j].start - span_end
+                span_end = spans_tuple[j].end
               else
-                @txns_agg[txn.name].spans[span.name].aggregate! span.duration
+                if spans_tuple[j].end > span_end
+                  span_end = spans_tuple[j].end
+                end
               end
-              spans_present = true              
+              j += 1
+            end
+            if Util.ms(txn.duration) > span_end
+              ruby_time += Util.ms(txn.duration) - span_end
             end
           end
 
-          if spans_present
+          if ruby_time > 0
+            ruby_time = Util.us(ruby_time)
+            @txns_agg[txn.name].spans["Ruby"] = Layer.new("Ruby", "Ruby", ruby_time)
+          end
+
+          if spans_present == true || ruby_time > 0
             if Util.ms(txn.duration) >= @config.trace_threshold
               trace_txn = txn
-              trace_txn.spans = @spans[txn.id]
+              trace_txn.spans = @spans[txn.id] if spans_present
+              trace_txn.ruby_time = ruby_time if ruby_time > 0
 
               if @traces_agg.length < 5
                 @traces_agg.push(trace_txn)
@@ -266,7 +306,7 @@ module Atatus
         @collect_counter += 1
 
         end_time = (Time.now.to_f * 1000).to_i
-        debug '%s: Collecting transactions', pid_str
+        debug '%s: data collector', pid_str
 
         txns_data = nil
         traces_data = nil

data/lib/atatus/collector/builder.rb

@@ -139,7 +139,7 @@ module Atatus
         name: name,
         type: value.type,
         kind: value.kind,
-        durations: [value.count, Util.ms(value.min), Util.ms(value.max), Util.ms(value.total)]
+        durations: [value.count, Util.ms(value.total), Util.ms(value.min), Util.ms(value.max)]
       }
     end
 
@@ -249,6 +249,27 @@ module Atatus
           end
         end
 
+        if
+          !txn.ruby_time.nil?
+        then
+          entry = {}
+          entry[:lv] = 1
+          entry[:so] = 0
+          entry[:du] = Util.ms(txn.ruby_time)
+          entry[:ly] = {}
+          entry[:ly][:name] = AGENT_NAME
+          entry[:ly][:type] = AGENT_NAME
+          entry[:ly][:kind] = AGENT_NAME
+          trace[:entries] << entry
+          func_index = trace[:funcs].index(AGENT_NAME)
+          if func_index.nil?
+            trace[:funcs] << AGENT_NAME
+            func_index = i
+            i = i + 1
+          end
+          entry[:i] = func_index
+        end
+
         traces << trace
       end
       traces
@@ -341,30 +362,30 @@ module Atatus
             frame[:ln] = f.lineno
             if f.library_frame == false
               frame[:inp] = true
-              if !f.context_line.nil?
-                frame[:code] = []
-
-                if !f.pre_context.nil?
-                  psize = f.pre_context.size
-                  lineno = 0
-                  if f.lineno - psize >= 0
-                    lineno = f.lineno - psize
-                  end
-                  f.pre_context.each do |c|
-                    frame[:code].push([lineno.to_s, c])
-                    lineno += 1
-                  end
+            end
+            if !f.context_line.nil?
+              frame[:code] = []
+
+              if f.library_frame == false && !f.pre_context.nil?
+                psize = f.pre_context.size
+                lineno = 0
+                if f.lineno - psize >= 0
+                  lineno = f.lineno - psize
                 end
+                f.pre_context.each do |c|
+                  frame[:code].push([lineno.to_s, c])
+                  lineno += 1
+                end
+              end
 
-                frame[:code].push([f.lineno.to_s, f.context_line])
+              frame[:code].push([f.lineno.to_s, f.context_line])
 
-                if !f.post_context.nil?
-                  psize = f.post_context.size
-                  lineno = f.lineno + 1
-                  f.post_context.each do |c|
-                    frame[:code].push([lineno.to_s, c])
-                    lineno += 1
-                  end
+              if f.library_frame == false && !f.post_context.nil?
+                psize = f.post_context.size
+                lineno = f.lineno + 1
+                f.post_context.each do |c|
+                  frame[:code].push([lineno.to_s, c])
+                  lineno += 1
                 end
               end
             end

data/lib/atatus/collector/transport.rb

@@ -104,7 +104,11 @@ module Atatus
           end
         end
 
-        error format('Atatus transport status 400, failed with content: %s', response.message)
+        if !resp
+          error format('Atatus transport status 400, failed with parsed content: %s', resp)
+        else
+          error format('Atatus transport status 400, failed with content: %s', response.body)
+        end
       else
       end
     end

data/lib/atatus/config.rb

@@ -70,7 +70,7 @@ module Atatus
     option :service_version,                   type: :string
     option :source_lines_error_app_frames,     type: :int,    default: 5
     option :source_lines_error_library_frames, type: :int,    default: 0
-    option :source_lines_span_app_frames,      type: :int,    default: 5
+    option :source_lines_span_app_frames,      type: :int,    default: 0
     option :source_lines_span_library_frames,  type: :int,    default: 0
     option :span_frames_min_duration,          type: :float,  default: '5ms',   converter: Duration.new(default_unit: 'ms')
     option :stack_trace_limit,                 type: :int,    default: 999_999

data/lib/atatus/span.rb

@@ -75,7 +75,7 @@ module Atatus
     def done(clock_end: Util.monotonic_micros)
       stop clock_end
 
-      build_stacktrace! if should_build_stacktrace?
+      # build_stacktrace! if should_build_stacktrace?
       self.original_backtrace = nil # release original
 
       self

data/lib/atatus/stacktrace_builder.rb

@@ -38,7 +38,7 @@ module Atatus
 
       frame = Stacktrace::Frame.new
       frame.abs_path = abs_path
-      frame.filename = strip_load_path(abs_path)
+      frame.filename = strip_load_path(config, abs_path)
       frame.function = function
       frame.lineno = lineno.to_i
       frame.library_frame = library_frame?(config, abs_path)
@@ -84,14 +84,18 @@ module Atatus
     end
     # rubocop:enable Metrics/CyclomaticComplexity
 
-    def strip_load_path(path)
+    def strip_load_path(config, path)
       return nil if path.nil?
 
-      prefix =
-        $LOAD_PATH
-        .map(&:to_s)
-        .select { |s| path.start_with?(s) }
-        .max_by(&:length)
+      if path.start_with?(config.__root_path)
+        prefix = config.__root_path
+      else
+        prefix =
+          $LOAD_PATH
+          .map(&:to_s)
+          .select { |s| path.start_with?(s) }
+          .max_by(&:length)
+      end
 
       prefix ? path[prefix.chomp(File::SEPARATOR).length + 1..-1] : path
     end

data/lib/atatus/transaction.rb

@@ -39,7 +39,7 @@ module Atatus
     end
     # rubocop:enable Metrics/ParameterLists
 
-    attr_accessor :name, :type, :result, :spans
+    attr_accessor :name, :type, :result, :spans, :ruby_time
 
     attr_reader :context, :duration, :started_spans, :dropped_spans,
       :timestamp, :trace_context, :notifications

data/lib/atatus/util.rb

@@ -8,6 +8,10 @@ module Atatus
       micros.to_f / 1_000
     end
 
+    def self.us(ms)
+      ms * 1_000
+    end
+
     def self.micros(target = Time.now)
       utc = target.utc
       utc.to_i * 1_000_000 + utc.usec

data/lib/atatus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Atatus
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atatus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Atatus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby