atatus 1.4.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 651694b5c78acd1f1582c30f1b28715b6a653c2b125a75613a19b7ae86361d9b
-  data.tar.gz: 4a8e5ee631f32b09942bb6ae53a72531c4e7ffe2677194ee7f19f81dfd4c9eeb
+  metadata.gz: 48a2777c09d7af196314fb322c9a55feadb46f50d90ffd88976ff978eb5039a2
+  data.tar.gz: 59f1f63ebd4ad84f23359cc2c96ccb62e0c0eabceaa6b48bf63c711c3383bf64
 SHA512:
-  metadata.gz: 0400c2f1f8bdd57366d49d5a05f8d4dc49bc804e5dc263cfe9771043a021a47c08d7544af1adb9408a2c517c7839d20e6e7bb48329038e684c35a61bbf0db210
-  data.tar.gz: 76eb02d1bf4cebf184ff8df44f71d553f64fe9e9dfb75aeb4c3e214a97a3dbc6efc7797a34321f019a0fc15be06800ef575efae6dc580aa1061037aeb1c13f4d
+  metadata.gz: 1a705d56af3228c31ce400a16eae3d961fe2bbcae949db3effc4828682563bd4ce3070adb14613cb096caa48d71e8ccce2969dc21f4b0c910c73ca99b28bf566
+  data.tar.gz: 30461593c406cf6f7b8f2e08c9bef4aa64b9f60f0f4c2b3f0bff9de1cff8a26f5cf25e07507b263e8638a37345916f15d479eb11bcb3e58f69a7f34d79d51d70

data/CHANGELOG.md

@@ -4,6 +4,27 @@ 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.2 (Mon, 31 Jan 2022)
+
+- Fixed config environment.
+- Supported ignore failure patterns, ignore exceptions and ignore transactions.
+
+
+## 1.6.1 (Wed, 29 Dec 2021)
+
+- Fixed a specific case where span duration goes less than 0.
+
+
+## 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.
+
 
 ## 1.4.0 (Tue, 15 Sept 2020)
 

data/LICENSE

@@ -1,4 +1,4 @@
-All components of this product are Copyright (c) 2020 Atatus. All rights reserved.
+All components of this product are Copyright (c) 2022 Atatus. All rights reserved.
 
 Except as otherwise expressly provided in this Agreement,
 End User shall not (and shall not permit any third party to):

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
@@ -42,6 +42,7 @@ module Atatus
         @metrics_lock = Mutex.new
         @metrics_agg = []
 
+        @hostinfo_response = {}
         @transport = Atatus::BaseTransport.new(config)
         @collect_counter = 0
         @running = false
@@ -79,13 +80,38 @@ module Atatus
 
       def add_error(error)
         ensure_worker_running
-
-        @errors_lock.synchronize do
-          if @errors_aggs.length < 20
-            @errors_aggs.push(error)
-          else
-            i = rand(20)
-            @errors_aggs[i] = error
+        ignore_error = false
+        if
+          !error.exception.nil?  &&
+          !error.exception.type.nil? &&
+          !error.exception.message.nil?
+        then
+          if @hostinfo_response.key?("ignoreExceptionPatterns")
+            @hostinfo_response['ignoreExceptionPatterns'].each do |k, v|
+              if error.exception.type.match(k)
+                exception_values = v
+                if exception_values.length == 0
+                  ignore_error = true
+                else
+                  exception_values.each do |value|
+                    if error.exception.message.include?(value)
+                      ignore_error = true
+                    end
+                  end
+                end
+                break
+              end
+            end
+          end
+        end
+        if ignore_error == false
+          @errors_lock.synchronize do
+            if @errors_aggs.length < 20
+              @errors_aggs.push(error)
+            else
+              i = rand(20)
+              @errors_aggs[i] = error
+            end
           end
         end
       end
@@ -156,6 +182,19 @@ module Atatus
           return
         end
 
+        ignore_txn = false
+        if @hostinfo_response.key?("ignoreTxnNamePatterns")
+          @hostinfo_response['ignoreTxnNamePatterns'].each do |k|
+            if txn.name.match(k)
+              ignore_txn = true
+              break
+            end
+          end
+        end
+        if ignore_txn == true
+          return
+        end
+
         return if txn.name.empty?
         return if txn.duration <= 0
 
@@ -204,16 +243,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 +252,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
@@ -270,24 +334,45 @@ module Atatus
             !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
+            ignore_status_code = false
             if status_code >= 400 && status_code != 404
-              if !@error_metrics_agg.key?(txn.name)
-                @error_metrics_agg[txn.name] = {status_code => 1}
-              else
-                if !@error_metrics_agg[txn.name].key?(status_code)
-                  @error_metrics_agg[txn.name][status_code] = 1
-                else
-                  @error_metrics_agg[txn.name][status_code] += 1
+              if @hostinfo_response.key?("ignoreHTTPFailurePatterns")
+                @hostinfo_response['ignoreHTTPFailurePatterns'].each do |k, v|
+                  if txn.name.match(k)
+                    status_code_array_s = v
+                    if status_code_array_s.length == 0
+                      ignore_status_code = true
+                    else
+                      status_code_array_s.each do |code|
+                        if code == txn.context.response.status_code.to_s
+                          ignore_status_code = true
+                        end
+                      end
+                    end
+                    break
+                  end
                 end
               end
+              if ignore_status_code == false
+                if !@error_metrics_agg.key?(txn.name)
+                  @error_metrics_agg[txn.name] = {status_code => 1}
+                else
+                  if !@error_metrics_agg[txn.name].key?(status_code)
+                    @error_metrics_agg[txn.name][status_code] = 1
+                  else
+                    @error_metrics_agg[txn.name][status_code] += 1
+                  end
+                end
 
-              if @error_requests_agg.length < 20
-                @error_requests_agg.push({'name' => txn.name, 'context' => txn.context})
-              else
-                i = rand(20)
-                @error_requests_agg[i] = {'name' => txn.name, 'context' => txn.context}
+                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, 'txn_id' => txn.id, 'trace_id' => trace_id, 'context' => txn.context})
+                else
+                  i = rand(20)
+                  @error_requests_agg[i] = {'name' => txn.name, 'txn_id' => txn.id, 'trace_id' => trace_id, 'context' => txn.context}
+                end
               end
             end
           end
@@ -329,7 +414,7 @@ module Atatus
         end
 
         if @collect_counter % 30 == 0
-          @transport.hostinfo(start_time)
+          @hostinfo_response = @transport.hostinfo(start_time)
           @collect_counter = 0
         end
         @collect_counter += 1

data/lib/atatus/collector/builder.rb

@@ -29,7 +29,8 @@ module Atatus
           version: VERSION
         },
         hostname: @metadata.hostname,
-        hostId: @metadata.hwinfo.hostid
+        hostId: @metadata.hwinfo.hostid,
+        releaseStage: @config.environment
       }
       if !@container_id.nil?
         common[:containerId] = @container_id
@@ -195,7 +196,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
 
@@ -237,11 +238,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 +256,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
@@ -286,7 +315,7 @@ module Atatus
               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 if defined?(span.context.http.status_code) && !span.context.http.status_code.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)
@@ -347,11 +376,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 +441,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
@@ -409,7 +496,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/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/collector/transport.rb

@@ -30,11 +30,13 @@ module Atatus
 
       @blocked = false
       @capture_percentiles = false
+      @hostinfo_response = {}
     end
 
     def hostinfo(start_time)
       payload = @builder.hostinfo(start_time)
       post(HOSTINFO_ENDPOINT, payload)
+      @hostinfo_response
     end
 
     def txns(start_time, end_time, data)
@@ -109,7 +111,25 @@ module Atatus
           if resp
             if resp.key?("capturePercentiles")
               @capture_percentiles = resp["capturePercentiles"]
+              @hostinfo_response['capturePercentiles'] = @capture_percentiles
             end
+
+            if resp.key?("extRequestPatterns")
+              @hostinfo_response['extRequestPatterns'] = resp["extRequestPatterns"]
+            end
+
+            if resp.key?("ignoreTxnNamePatterns")
+              @hostinfo_response['ignoreTxnNamePatterns'] = resp["ignoreTxnNamePatterns"]
+            end
+
+            if resp.key?("ignoreHTTPFailurePatterns")
+              @hostinfo_response['ignoreHTTPFailurePatterns'] = resp["ignoreHTTPFailurePatterns"]
+            end
+
+            if resp.key?("ignoreExceptionPatterns")
+              @hostinfo_response['ignoreExceptionPatterns'] = resp["ignoreExceptionPatterns"]
+            end
+
           end
         else
           true

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.4.0'
+  VERSION = '1.6.2'
 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.4.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Atatus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby