atatus 1.0.2 → 1.5.0

data/lib/atatus/central_config.rb

@@ -1,3 +1,20 @@
+# 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
 
 require 'atatus/central_config/cache_control'
@@ -23,21 +40,29 @@ module Atatus
     def initialize(config)
       @config = config
       @modified_options = {}
-      @service_info = {
-        'service.name': config.service_name,
-        'service.environment': config.environment
-      }.to_json
+      # @http = Transport::Connection::Http.new(config)
+      @etag = 1
     end
 
     attr_reader :config
     attr_reader :scheduled_task, :promise # for specs
 
     def start
+      return
       return unless config.central_config?
 
+      debug 'Starting CentralConfig'
+
       fetch_and_apply_config
     end
 
+    def stop
+      return
+      debug 'Stopping CentralConfig'
+
+      @scheduled_task&.cancel
+    end
+
     def fetch_and_apply_config
       @promise =
         Concurrent::Promise
@@ -46,11 +71,6 @@ module Atatus
         .rescue(&method(:handle_error))
     end
 
-    def stop
-      @scheduled_task&.cancel
-    end
-
-    # rubocop:disable Metrics/MethodLength
     def fetch_config
       resp = perform_request
 
@@ -65,7 +85,6 @@ module Atatus
         raise ServerError, resp
       end
     end
-    # rubocop:enable Metrics/MethodLength
 
     def assign(update)
       # For each updated option, store the original value,
@@ -81,20 +100,35 @@ module Atatus
         update[key] = @modified_options.delete(key)
       end
 
-      config.assign(update)
+      @config.replace_options(update)
+    end
+
+    def handle_forking!
+      stop
+      start
     end
 
     private
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def handle_success(resp)
+      if (etag = resp.headers['Etag'])
+        @etag = etag
+      end
+
       if resp.status == 304
         info 'Received 304 Not Modified'
       else
-        update = JSON.parse(resp.body.to_s)
-        assign(update)
+        if resp.body && !resp.body.empty?
+          update = JSON.parse(resp.body.to_s)
+          assign(update)
+        end
 
-        info 'Updated config from Kibana'
+        if update && update.any?
+          info 'Updated config from Kibana'
+          debug 'Modified: %s', update.inspect
+          debug 'Modified original options: %s', @modified_options.inspect
+        end
       end
 
       schedule_next_fetch(resp)
@@ -104,31 +138,42 @@ module Atatus
       error 'Failed to apply remote config, %s', e.inspect
       debug { e.backtrace.join('\n') }
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     def handle_error(error)
-      error(
+      # For tests, WebMock failures don't have real responses
+      response = error.response if error.respond_to?(:response)
+
+      debug(
         'Failed fetching config: %s, trying again in %d seconds',
-        error.response.body, DEFAULT_MAX_AGE
+        response&.body, DEFAULT_MAX_AGE
       )
 
       assign({})
 
-      schedule_next_fetch(error.response)
+      schedule_next_fetch(response)
     end
 
     def perform_request
-      Http.post(
-        config.server_url + '/agent/v1/config/',
-        body: @service_info,
-        headers: { etag: 1, content_type: 'application/json' }
-      )
+      # @http.get(server_url, headers: headers)
+    end
+
+    def server_url
+      @server_url ||=
+        config.server_url +
+        '/config/v1/agents' \
+        "?service.name=#{config.service_name}"
+    end
+
+    def headers
+      { 'Etag': @etag }
     end
 
-    def schedule_next_fetch(resp)
+    def schedule_next_fetch(resp = nil)
+      headers = resp&.headers
       seconds =
-        if (cache_header = resp.headers['Cache-Control'])
-          CacheControl.new(cache_header).max_age
+        if headers && headers['Cache-Control']
+          CacheControl.new(headers['Cache-Control']).max_age
         else
           DEFAULT_MAX_AGE
         end

data/lib/atatus/central_config/cache_control.rb

@@ -1,3 +1,20 @@
+# 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
@@ -26,7 +43,7 @@ module Atatus
       def parse!(value)
         value.split(',').each do |token|
           k, v = token.split('=').map(&:strip)
-          instance_variable_set(:"@#{k.gsub('-', '_')}", v ? v.to_i : true)
+          instance_variable_set(:"@#{k.tr('-', '_')}", v ? v.to_i : true)
         end
       end
     end

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,19 +1,24 @@
 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)
+
 module Atatus
   module Collector
     class Txn < Layer
-      def initialize(type, kind, duration)
+      def initialize(type, kind, duration, background: false)
         super(type, kind, duration)
         @spans = {}
+        @background = background
       end
 
-      attr_reader :spans
+      attr_reader :spans, :background
     end
 
     class Base
@@ -26,6 +31,7 @@ module Atatus
 
         @txns_lock = Mutex.new
         @txns_agg = {}
+        @txn_hist_agg = {}
         @traces_agg = []
         @error_metrics_agg = {}
         @error_requests_agg = []
@@ -36,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
@@ -66,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
 
@@ -81,7 +92,7 @@ module Atatus
 
       def add_metrics(metricset)
         ensure_worker_running
-        
+
         metric_added = false
         metric = {}
 
@@ -96,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
 
@@ -117,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
@@ -132,32 +147,54 @@ module Atatus
       def add_txn(txn)
         ensure_worker_running
 
-        if 
-          txn.name.nil? || 
-          txn.id.nil? || 
+        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
+          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(@config.framework_name, "Ruby", txn.duration)
+            @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
           else
             @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? || 
+              if
+                span.name.nil? ||
+                span.type.nil? ||
+                span.subtype.nil? ||
+                span.timestamp.nil? ||
                 span.duration.nil?
               then
                 next
@@ -165,23 +202,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)
@@ -196,12 +265,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)
@@ -266,9 +335,10 @@ 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
+        txn_hist_data = nil
         traces_data = nil
         error_metrics_data = nil
         error_requests_data = nil
@@ -279,6 +349,9 @@ module Atatus
           txns_data = @txns_agg
           @txns_agg = {}
 
+          txn_hist_data = @txn_hist_agg
+          @txn_hist_agg = {}
+
           traces_data = @traces_agg
           @traces_agg = []
 
@@ -293,7 +366,7 @@ module Atatus
           errors_data = @errors_aggs
           @errors_aggs = []
         end
-        
+
         @metrics_lock.synchronize do
           metrics_data = @metrics_agg
           @metrics_agg = []
@@ -301,7 +374,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?
 
@@ -311,4 +391,4 @@ module Atatus
       end
     end
   end
-end
+end