atatus 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f1224097b7365777c25187cfc37e91183820049468b600c440a267e56eedab3
-  data.tar.gz: bfa687f00c9fc260b2b1c2530f98221feb145097ea950327dd50ed28d3c93f49
+  metadata.gz: fdb76c9559c230c2e772a5878d82486da076104089c39302722fccca8f0c22db
+  data.tar.gz: 20233ccdea5269e3b3eb6c7c348091a161f875fbd1946554bdd314ee09f55ba2
 SHA512:
-  metadata.gz: c534a65922f5a3b4a82965af2eeeabd2b1f6d634cad3857054a2c4ae517a7fcda79bd6d9664874c1bd411078d7e0adfc27eba1c4c523d24e5195299b42fefb81
-  data.tar.gz: '078b28a6a86fa7d96c726e14f8cd8a8892efad31d839b843d58c6fd1c7229b7d8df36a21eaaea550ba2dcdd14431165ee317d31d0bb0bf34539f25f320b7d200'
+  metadata.gz: c0dfd9f4d6ecddad2036b1b289ec864ea0edbc5f0949bfd76639b741e5a6be6ca2da9840347b10950635a235df37c20c9464505675e022b10d5c9341dc2807c1
+  data.tar.gz: 38d6f642f6f413e8c0ed989ba28d70bb9ce9643525fa28156ce8853e3781c1b3d3e9329d06d9ed0d8b7096a7d6799ad8817701012007a443f9a44a47ecf16136

data/CHANGELOG.md

@@ -5,6 +5,12 @@ 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.6.0 (Fri, 24 Dec 2021)
+
+- Added support for set custom data.
+- Fixed the span timing issue.
+
+
 ## 1.5.0 (Thu, 27 May 2021)
 
 - Fixed issue in status code conversion.

data/lib/atatus/collector/base.rb

@@ -7,7 +7,7 @@ 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
@@ -204,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
@@ -222,6 +213,37 @@ 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
+              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
@@ -283,11 +305,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

data/lib/atatus/collector/builder.rb

@@ -237,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?
@@ -249,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
@@ -347,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
@@ -384,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

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',

data/lib/atatus/error_builder.rb

@@ -86,6 +86,10 @@ module Atatus
 
       Util.reverse_merge!(error.context.labels, transaction.context.labels)
       Util.reverse_merge!(error.context.custom, transaction.context.custom)
+
+      return unless transaction.context.user
+
+      error.context.user = transaction.context.user
     end
   end
 end

data/lib/atatus/version.rb

@@ -19,5 +19,5 @@
 
 module Atatus
   AGENT_NAME = 'Ruby'
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/lib/atatus.rb

@@ -352,6 +352,14 @@ module Atatus
       end
     end
 
+    # Provide further context for the current transaction
+    #
+    # @param custom [Hash] A hash with custom information. Can be nested.
+    # @return [Hash] The current custom context
+    def set_custom_data(custom)
+      agent&.set_custom_context(custom)
+    end
+
     # Provide further context for the current transaction
     #
     # @param custom [Hash] A hash with custom information. Can be nested.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atatus
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Atatus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby