atatus 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5404a3f0f7c5ebac24d42dc0e52a3e039627e985d8e5fcf9473c485c33154cd2
-  data.tar.gz: ec420ee8f2ff19f32bb3bf49c0d5ddddb106fbfec4add1c2c98a8103b455e08c
+  metadata.gz: acfc54c3597def60fca53e99bf249711197735e0507b9bcade319f10182cbc26
+  data.tar.gz: efb49084366463b5ed40d3b4c57609ada57e745f28f8ac5949456e242167ede1
 SHA512:
-  metadata.gz: 5a595c22ae3e30caf7db053d5bc354e9c1ab11824bbc8ea9d8846aca1ad29a1ffea8fce445a76b86c0ae715a18c9f85cb4910a8a51f8461cf3b83fd653e0228e
-  data.tar.gz: 87afe8b5bba6161baeffc5520f49ab924e0cd4c468d5f758b0f84a62e17b992403e9322a30ea17bf6a214b3829616373a23f950ef284b1eb9454bb49c07d436d
+  metadata.gz: e6e2af0647be02da224d11dd9a45650c0c6cae63e10dbfaf81fd2d757fe8aa3414ab82ffad9eb880fc73f3340c145a175374be77a41f646febd621bf50502dca
+  data.tar.gz: 170206df98d5e3b5ccf68271f9dfdb58042ce45b13129321105aac2cf4fa8a04095807e0adc4ed75589bd09b556284ea41ac5a2030565584d96640da58aac03c

data/CHANGELOG.md

@@ -4,8 +4,13 @@ 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.0.1 (Wed, 13 Nov 2019)
 
-## 1.0.0 (Tue, 29 October 2019)
+- Fixed Instrumenting classes only when there are defined.
+- Handled worker thread while exiting.
+
+
+## 1.0.0 (Tue, 29 Oct 2019)
 
 - General availability release of the Ruby agent.
 

data/lib/atatus/agent.rb

@@ -130,6 +130,7 @@ module Atatus
       central_config.stop
       metrics.stop
       instrumenter.stop
+      collector.stop
       # transport.stop
 
       self

data/lib/atatus/collector/base.rb

@@ -109,11 +109,24 @@ module Atatus
       end
 
       def start
-        debug '%s: Starting Collector', pid_str
+        debug '%s: Starting collector', pid_str
 
         ensure_worker_running
       end
 
+      def stop
+        return unless @running
+        @running = false
+        if worker_active?
+          debug '%s: Waiting for collector worker to exit', pid_str
+          @worker.run
+          @worker.join(10)
+        end
+      rescue => e
+        error format('Failed during collector stop: [%s] %s', e.class, e.message)
+        error "Backtrace:\n" + e.backtrace.join("\n")
+      end
+
       def add_error(error)
         ensure_worker_running
 
@@ -241,7 +254,7 @@ module Atatus
         return if worker_active?
         @running = true
         @worker = Thread.new() do
-          debug '%s: Starting Collector Worker', pid_str
+          debug '%s: Starting collector worker', pid_str
 
           while @running
             start_time = Time.now
@@ -249,13 +262,6 @@ module Atatus
             collect start_time
           end
         end
-
-        at_exit do
-          debug '%s: Waiting for Collector Worker to exit', pid_str
-          @running = false
-          @worker.run
-          @worker.join(10)
-        end
       end
 
       def worker_active?

data/lib/atatus/rails.rb

@@ -37,7 +37,7 @@ module Atatus
       Atatus.running?
     rescue StandardError => e
       config.logger.error format('Failed to start: %s', e.message)
-      config.logger.debug "Backtrace:\n" + e.backtrace.join("\n")
+      config.logger.error "Backtrace:\n" + e.backtrace.join("\n")
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     # rubocop:enable Metrics/CyclomaticComplexity

data/lib/atatus/spies/elasticsearch.rb

@@ -10,16 +10,21 @@ module Atatus
 
       # rubocop:disable Metrics/MethodLength
       def install
-        ::Elasticsearch::Transport::Client.class_eval do
-          alias perform_request_without_apm perform_request
+        if defined?(::Elasticsearch) &&
+            defined?(::Elasticsearch::Transport) &&
+            defined?(::Elasticsearch::Transport::Client)
 
-          def perform_request(method, path, *args, &block)
-            name = format(NAME_FORMAT, method, path)
-            statement = args[0].is_a?(String) ? args[0] : args[0].to_json
-            context = Span::Context.new(db: { statement: statement })
+          ::Elasticsearch::Transport::Client.class_eval do
+            alias perform_request_without_apm perform_request
 
-            Atatus.with_span name, TYPE, context: context do
-              perform_request_without_apm(method, path, *args, &block)
+            def perform_request(method, path, *args, &block)
+              name = format(NAME_FORMAT, method, path)
+              statement = args[0].is_a?(String) ? args[0] : args[0].to_json
+              context = Span::Context.new(db: { statement: statement })
+
+              Atatus.with_span name, TYPE, context: context do
+                perform_request_without_apm(method, path, *args, &block)
+              end
             end
           end
         end

data/lib/atatus/spies/faraday.rb

@@ -20,40 +20,43 @@ module Atatus
       # rubocop:disable Metrics/BlockLength, Metrics/PerceivedComplexity
       # rubocop:disable Metrics/CyclomaticComplexity
       def install
-        ::Faraday::Connection.class_eval do
-          alias run_request_without_apm run_request
+        if defined?(::Faraday) && defined?(::Faraday::Connection)
 
-          def run_request(method, url, body, headers, &block)
-            unless (transaction = Atatus.current_transaction)
-              return run_request_without_apm(method, url, body, headers, &block)
-            end
+          ::Faraday::Connection.class_eval do
+            alias run_request_without_apm run_request
+
+            def run_request(method, url, body, headers, &block)
+              unless (transaction = Atatus.current_transaction)
+                return run_request_without_apm(method, url, body, headers, &block)
+              end
 
-            host = if url_prefix.is_a?(URI) && url_prefix.host
-                     url_prefix.host
-                   elsif url.nil?
-                     tmp_request = build_request(method) do |req|
-                       yield(req) if block_given?
+              host = if url_prefix.is_a?(URI) && url_prefix.host
+                       url_prefix.host
+                     elsif url.nil?
+                       tmp_request = build_request(method) do |req|
+                         yield(req) if block_given?
+                       end
+                       URI(tmp_request.path).host
+                     else
+                       URI(url).host
                      end
-                     URI(tmp_request.path).host
-                   else
-                     URI(url).host
-                   end
 
-            name = "#{method.upcase} #{host}"
+              name = "#{method.upcase} #{host}"
 
-            Atatus.with_span(
-              name,
-              TYPE,
-              subtype: SUBTYPE,
-              action: method.to_s
-            ) do |span|
-              Atatus::Spies::FaradaySpy.without_net_http do
-                trace_context = span&.trace_context || transaction.trace_context
+              Atatus.with_span(
+                name,
+                TYPE,
+                subtype: SUBTYPE,
+                action: method.to_s
+              ) do |span|
+                Atatus::Spies::FaradaySpy.without_net_http do
+                  trace_context = span&.trace_context || transaction.trace_context
 
-                run_request_without_apm(method, url, body, headers) do |req|
-                  req['Atatus-Apm-Traceparent'] = trace_context.to_header
+                  run_request_without_apm(method, url, body, headers) do |req|
+                    req['Atatus-Apm-Traceparent'] = trace_context.to_header
 
-                  yield req if block_given?
+                    yield req if block_given?
+                  end
                 end
               end
             end

data/lib/atatus/spies/http.rb

@@ -10,28 +10,31 @@ module Atatus
 
       # rubocop:disable Metrics/MethodLength
       def install
-        ::HTTP::Client.class_eval do
-          alias perform_without_apm perform
+        if defined?(::HTTP) && defined?(::HTTP::Client)
 
-          def perform(req, options)
-            unless (transaction = Atatus.current_transaction)
-              return perform_without_apm(req, options)
-            end
+          ::HTTP::Client.class_eval do
+            alias perform_without_apm perform
+
+            def perform(req, options)
+              unless (transaction = Atatus.current_transaction)
+                return perform_without_apm(req, options)
+              end
 
-            method = req.verb.to_s.upcase
-            host = req.uri.host
+              method = req.verb.to_s.upcase
+              host = req.uri.host
 
-            name = "#{method} #{host}"
+              name = "#{method} #{host}"
 
-            Atatus.with_span(
-              name,
-              TYPE,
-              subtype: SUBTYPE,
-              action: method
-            ) do |span|
-              trace_context = span&.trace_context || transaction.trace_context
-              req['Atatus-Apm-Traceparent'] = trace_context.to_header
-              perform_without_apm(req, options)
+              Atatus.with_span(
+                name,
+                TYPE,
+                subtype: SUBTYPE,
+                action: method
+              ) do |span|
+                trace_context = span&.trace_context || transaction.trace_context
+                req['Atatus-Apm-Traceparent'] = trace_context.to_header
+                perform_without_apm(req, options)
+              end
             end
           end
         end

data/lib/atatus/spies/json.rb

@@ -8,11 +8,14 @@ module Atatus
     # @api private
     class JSONSpy
       def install
-        ::JSON.class_eval do
-          include SpanHelpers
-          span_class_method :parse, 'JSON#parse', 'json.parse'
-          span_class_method :parse!, 'JSON#parse!', 'json.parse'
-          span_class_method :generate, 'JSON#generate', 'json.generate'
+        if defined?(::JSON)
+
+          ::JSON.class_eval do
+            include SpanHelpers
+            span_class_method :parse, 'JSON#parse', 'json.parse'
+            span_class_method :parse!, 'JSON#parse!', 'json.parse'
+            span_class_method :generate, 'JSON#generate', 'json.generate'
+          end
         end
       end
     end

data/lib/atatus/spies/net_http.rb

@@ -31,33 +31,35 @@ module Atatus
       end
 
       def install
-        Net::HTTP.class_eval do
-          alias request_without_apm request
+        if defined?(::Net) && defined?(::Net::HTTP)
+          ::Net::HTTP.class_eval do
+            alias request_without_apm request
 
-          def request(req, body = nil, &block)
-            unless (transaction = Atatus.current_transaction)
-              return request_without_apm(req, body, &block)
-            end
-            if Atatus::Spies::NetHTTPSpy.disabled?
-              return request_without_apm(req, body, &block)
-            end
+            def request(req, body = nil, &block)
+              unless (transaction = Atatus.current_transaction)
+                return request_without_apm(req, body, &block)
+              end
+              if Atatus::Spies::NetHTTPSpy.disabled?
+                return request_without_apm(req, body, &block)
+              end
 
-            host, = req['host'] && req['host'].split(':')
-            method = req.method
+              host, = req['host'] && req['host'].split(':')
+              method = req.method
 
-            host ||= address
+              host ||= address
 
-            name = "#{method} #{host}"
+              name = "#{method} #{host}"
 
-            Atatus.with_span(
-              name,
-              TYPE,
-              subtype: SUBTYPE,
-              action: method.to_s
-            ) do |span|
-              trace_context = span&.trace_context || transaction.trace_context
-              req['Atatus-Apm-Traceparent'] = trace_context.to_header
-              request_without_apm(req, body, &block)
+              Atatus.with_span(
+                name,
+                TYPE,
+                subtype: SUBTYPE,
+                action: method.to_s
+              ) do |span|
+                trace_context = span&.trace_context || transaction.trace_context
+                req['Atatus-Apm-Traceparent'] = trace_context.to_header
+                request_without_apm(req, body, &block)
+              end
             end
           end
         end

data/lib/atatus/spies/redis.rb

@@ -6,16 +6,18 @@ module Atatus
     # @api private
     class RedisSpy
       def install
-        ::Redis::Client.class_eval do
-          alias call_without_apm call
+        if defined?(::Redis) && defined?(::Redis::Client)
+          ::Redis::Client.class_eval do
+            alias call_without_apm call
 
-          def call(command, &block)
-            name = command[0].upcase
+            def call(command, &block)
+              name = command[0].upcase
 
-            return call_without_apm(command, &block) if command[0] == :auth
+              return call_without_apm(command, &block) if command[0] == :auth
 
-            Atatus.with_span(name.to_s, 'db.redis') do
-              call_without_apm(command, &block)
+              Atatus.with_span(name.to_s, 'db.redis') do
+                call_without_apm(command, &block)
+              end
             end
           end
         end

data/lib/atatus/spies/sequel.rb

@@ -23,19 +23,21 @@ module Atatus
       def install
         require 'sequel/database/logging'
 
-        ::Sequel::Database.class_eval do
-          alias log_connection_yield_without_apm log_connection_yield
+        if defined?(::Sequel) && defined?(::Sequel::Database)
+          ::Sequel::Database.class_eval do
+            alias log_connection_yield_without_apm log_connection_yield
 
-          def log_connection_yield(sql, *args, &block)
-            unless Atatus.current_transaction
-              return log_connection_yield_without_apm(sql, *args, &block)
-            end
+            def log_connection_yield(sql, *args, &block)
+              unless Atatus.current_transaction
+                return log_connection_yield_without_apm(sql, *args, &block)
+              end
 
-            summarizer = Atatus::Spies::SequelSpy.summarizer
-            name = summarizer.summarize sql
-            context = Atatus::Spies::SequelSpy.build_context(sql, opts)
+              summarizer = Atatus::Spies::SequelSpy.summarizer
+              name = summarizer.summarize sql
+              context = Atatus::Spies::SequelSpy.build_context(sql, opts)
 
-            Atatus.with_span(name, TYPE, context: context, &block)
+              Atatus.with_span(name, TYPE, context: context, &block)
+            end
           end
         end
       end

data/lib/atatus/spies/sinatra.rb

@@ -7,27 +7,33 @@ module Atatus
     class SinatraSpy
       # rubocop:disable Metrics/MethodLength
       def install
-        ::Sinatra::Base.class_eval do
-          alias dispatch_without_apm! dispatch!
-          alias compile_template_without_apm compile_template
+        if defined?(::Sinatra) && 
+            defined?(::Sinatra::Base) &&
+            ::Sinatra::Base.private_method_defined?(:dispatch!) && 
+            ::Sinatra::Base.private_method_defined?(:compile_template)
 
-          def dispatch!(*args, &block)
-            dispatch_without_apm!(*args, &block).tap do
-              next unless (transaction = Atatus.current_transaction)
-              next unless (route = env['sinatra.route'])
+          ::Sinatra::Base.class_eval do
+            alias dispatch_without_apm! dispatch!
+            alias compile_template_without_apm compile_template
 
-              transaction.name = route
-            end
-          end
+            def dispatch!(*args, &block)
+              dispatch_without_apm!(*args, &block).tap do
+                next unless (transaction = Atatus.current_transaction)
+                next unless (route = env['sinatra.route'])
 
-          def compile_template(engine, data, opts, *args, &block)
-            opts[:__atatus_template_name] =
-              case data
-              when Symbol then data.to_s
-              else format('Inline %s', engine)
+                transaction.name = route
               end
+            end
 
-            compile_template_without_apm(engine, data, opts, *args, &block)
+            def compile_template(engine, data, opts, *args, &block)
+              opts[:__atatus_template_name] =
+                case data
+                when Symbol then data.to_s
+                else format('Inline %s', engine)
+                end
+
+              compile_template_without_apm(engine, data, opts, *args, &block)
+            end
           end
         end
       end

data/lib/atatus/spies/tilt.rb

@@ -8,14 +8,16 @@ module Atatus
       TYPE = 'template.tilt'
 
       def install
-        ::Tilt::Template.class_eval do
-          alias render_without_apm render
+        if defined?(::Tilt) && defined?(::Tilt::Template) 
+          ::Tilt::Template.class_eval do
+            alias render_without_apm render
 
-          def render(*args, &block)
-            name = options[:__atatus_template_name] || 'Unknown template'
+            def render(*args, &block)
+              name = options[:__atatus_template_name] || 'Unknown template'
 
-            Atatus.with_span name, TYPE do
-              render_without_apm(*args, &block)
+              Atatus.with_span name, TYPE do
+                render_without_apm(*args, &block)
+              end
             end
           end
         end

data/lib/atatus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atatus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Atatus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby